| Message ID | 1425496288-14483-2-git-send-email-ard.biesheuvel@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 4 March 2015 at 20:11, Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote: > The adrp instruction is mostly used in combination with either > an add, a ldr or a str instruction with the low bits of the > referenced symbol in the 12-bit immediate of the followup > instruction. > > Introduce the macros adr_l, ldr_l and str_l that encapsulate > these common patterns. > > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > --- > arch/arm64/include/asm/assembler.h | 20 ++++++++++++++++++++ > 1 file changed, 20 insertions(+) > > diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h > index 750bac4e637e..14c30c58d101 100644 > --- a/arch/arm64/include/asm/assembler.h > +++ b/arch/arm64/include/asm/assembler.h > @@ -159,4 +159,24 @@ lr .req x30 // link register > orr \rd, \lbits, \hbits, lsl #32 > .endm > > + .macro adr_l, dst, sym, tmp= > + .ifb \tmp > + adrp \dst, \sym > + add \dst, \dst, :lo12:\sym > + .else > + adrp \tmp, \sym > + add \dst, \tmp, :lo12:\sym > + .endif > + .endm > + > + .macro ldr_l, dst, sym, tmp > + adrp \tmp, \sym > + ldr \dst, [\sym, :lo12:\sym] Whoops ^^^ > + .endm > + > + .macro str_l, src, sym, tmp > + adrp \tmp, \sym > + str \src, [\tmp, :lo12:\sym] > + .endm > + > #endif /* __ASM_ASSEMBLER_H */ > -- > 1.8.3.2 >
diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h index 750bac4e637e..14c30c58d101 100644 --- a/arch/arm64/include/asm/assembler.h +++ b/arch/arm64/include/asm/assembler.h @@ -159,4 +159,24 @@ lr .req x30 // link register orr \rd, \lbits, \hbits, lsl #32 .endm + .macro adr_l, dst, sym, tmp= + .ifb \tmp + adrp \dst, \sym + add \dst, \dst, :lo12:\sym + .else + adrp \tmp, \sym + add \dst, \tmp, :lo12:\sym + .endif + .endm + + .macro ldr_l, dst, sym, tmp + adrp \tmp, \sym + ldr \dst, [\sym, :lo12:\sym] + .endm + + .macro str_l, src, sym, tmp + adrp \tmp, \sym + str \src, [\tmp, :lo12:\sym] + .endm + #endif /* __ASM_ASSEMBLER_H */
The adrp instruction is mostly used in combination with either an add, a ldr or a str instruction with the low bits of the referenced symbol in the 12-bit immediate of the followup instruction. Introduce the macros adr_l, ldr_l and str_l that encapsulate these common patterns. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- arch/arm64/include/asm/assembler.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)