Message ID | 1466485631-3532-6-git-send-email-ynorov@caviumnetworks.com |
---|---|
State | New |
Headers | show |
Yury Norov <ynorov@caviumnetworks.com> writes: > diff --git a/sysdeps/aarch64/sysdep.h b/sysdeps/aarch64/sysdep.h > index 4cb028f..f2ea821 100644 > --- a/sysdeps/aarch64/sysdep.h > +++ b/sysdeps/aarch64/sysdep.h > @@ -23,10 +23,16 @@ > > #ifdef __LP64__ > #define AARCH64_R(NAME) R_AARCH64_ ## NAME > +#define PTR_REG(n) x##n > +#define PTR_LOG_SIZE 3 > #else > #define AARCH64_R(NAME) R_AARCH64_P32_ ## NAME > +#define PTR_REG(n) w##n > +#define PTR_LOG_SIZE 2 > #endif > > +#define PTR_SIZE (1<<PTR_LOG_SIZE) > + > #ifdef __ASSEMBLER__ > > /* Syntactic details of assembler. */ > @@ -87,16 +93,18 @@ > # define L(name) .L##name > #endif > > -/* Load or store to/from a pc-relative EXPR into/from R, using T. */ > -#define LDST_PCREL(OP, R, T, EXPR) \ > - adrp T, EXPR; \ > - OP R, [T, #:lo12:EXPR];\ > - > -/* Load or store to/from a got-relative EXPR into/from R, using T. */ > -#define LDST_GLOBAL(OP, R, T, EXPR) \ > - adrp T, :got:EXPR; \ > - ldr T, [T, #:got_lo12:EXPR];\ > - OP R, [T]; > +/* Load or store to/from a pc-relative EXPR into/from R, using T. > + Note R and T are register numbers and not register names. */ > +#define LDST_PCREL(OP, R, T, EXPR) \ > + adrp x##T, EXPR; \ > + OP PTR_REG (R), [x##T, #:lo12:EXPR]; \ > + > +/* Load or store to/from a got-relative EXPR into/from R, using T. > + Note R and T are register numbers and not register names. */ > +#define LDST_GLOBAL(OP, R, T, EXPR) \ > + adrp x##T, :got:EXPR; \ > + ldr PTR_REG (T), [x##T, #:got_lo12:EXPR]; \ > + OP x##R, [x##T]; I think this needs to be PTR_REG(x). Andreas.
On Tue, Jun 21, 2016 at 09:54:47AM +0200, Andreas Schwab wrote: > Yury Norov <ynorov@caviumnetworks.com> writes: > > > diff --git a/sysdeps/aarch64/sysdep.h b/sysdeps/aarch64/sysdep.h > > index 4cb028f..f2ea821 100644 > > --- a/sysdeps/aarch64/sysdep.h > > +++ b/sysdeps/aarch64/sysdep.h > > @@ -23,10 +23,16 @@ > > > > #ifdef __LP64__ > > #define AARCH64_R(NAME) R_AARCH64_ ## NAME > > +#define PTR_REG(n) x##n > > +#define PTR_LOG_SIZE 3 > > #else > > #define AARCH64_R(NAME) R_AARCH64_P32_ ## NAME > > +#define PTR_REG(n) w##n > > +#define PTR_LOG_SIZE 2 > > #endif > > > > +#define PTR_SIZE (1<<PTR_LOG_SIZE) > > + > > #ifdef __ASSEMBLER__ > > > > /* Syntactic details of assembler. */ > > @@ -87,16 +93,18 @@ > > # define L(name) .L##name > > #endif > > > > -/* Load or store to/from a pc-relative EXPR into/from R, using T. */ > > -#define LDST_PCREL(OP, R, T, EXPR) \ > > - adrp T, EXPR; \ > > - OP R, [T, #:lo12:EXPR];\ > > - > > -/* Load or store to/from a got-relative EXPR into/from R, using T. */ > > -#define LDST_GLOBAL(OP, R, T, EXPR) \ > > - adrp T, :got:EXPR; \ > > - ldr T, [T, #:got_lo12:EXPR];\ > > - OP R, [T]; > > +/* Load or store to/from a pc-relative EXPR into/from R, using T. > > + Note R and T are register numbers and not register names. */ > > +#define LDST_PCREL(OP, R, T, EXPR) \ > > + adrp x##T, EXPR; \ > > + OP PTR_REG (R), [x##T, #:lo12:EXPR]; \ > > + > > +/* Load or store to/from a got-relative EXPR into/from R, using T. > > + Note R and T are register numbers and not register names. */ > > +#define LDST_GLOBAL(OP, R, T, EXPR) \ > > + adrp x##T, :got:EXPR; \ > > + ldr PTR_REG (T), [x##T, #:got_lo12:EXPR]; \ > > + OP x##R, [x##T]; > > I think this needs to be PTR_REG(x). > > Andreas. Hi Andreas, Thanks a lot for review. I will handle your comments and send new version soon, maybe tomorrow.
Andreas Schwab <schwab@suse.de> writes: >> +/* Load or store to/from a got-relative EXPR into/from R, using T. >> + Note R and T are register numbers and not register names. */ >> +#define LDST_GLOBAL(OP, R, T, EXPR) \ >> + adrp x##T, :got:EXPR; \ >> + ldr PTR_REG (T), [x##T, #:got_lo12:EXPR]; \ >> + OP x##R, [x##T]; > > I think this needs to be PTR_REG(x). I mean PTR_REG(R), of course. Andreas.
diff --git a/sysdeps/aarch64/__longjmp.S b/sysdeps/aarch64/__longjmp.S index 65116be..58332be 100644 --- a/sysdeps/aarch64/__longjmp.S +++ b/sysdeps/aarch64/__longjmp.S @@ -53,7 +53,7 @@ ENTRY (__longjmp) ldp x27, x28, [x0, #JB_X27<<3] #ifdef PTR_DEMANGLE ldp x29, x4, [x0, #JB_X29<<3] - PTR_DEMANGLE (x30, x4, x3, x2) + PTR_DEMANGLE (30, 4, 3, 2) #else ldp x29, x30, [x0, #JB_X29<<3] #endif @@ -98,7 +98,7 @@ ENTRY (__longjmp) cfi_same_value(d15) #ifdef PTR_DEMANGLE ldr x4, [x0, #JB_SP<<3] - PTR_DEMANGLE (x5, x4, x3, x2) + PTR_DEMANGLE (5, 4, 3, 2) #else ldr x5, [x0, #JB_SP<<3] #endif diff --git a/sysdeps/aarch64/setjmp.S b/sysdeps/aarch64/setjmp.S index 22f4368..da83f19 100644 --- a/sysdeps/aarch64/setjmp.S +++ b/sysdeps/aarch64/setjmp.S @@ -42,7 +42,7 @@ ENTRY (__sigsetjmp) stp x27, x28, [x0, #JB_X27<<3] #ifdef PTR_MANGLE - PTR_MANGLE (x4, x30, x3, x2) + PTR_MANGLE (4, 30, 3, 2) stp x29, x4, [x0, #JB_X29<<3] #else stp x29, x30, [x0, #JB_X29<<3] @@ -57,7 +57,7 @@ ENTRY (__sigsetjmp) stp d14, d15, [x0, #JB_D14<<3] #ifdef PTR_MANGLE mov x4, sp - PTR_MANGLE (x5, x4, x3, x2) + PTR_MANGLE (5, 4, 3, 2) str x5, [x0, #JB_SP<<3] #else mov x2, sp diff --git a/sysdeps/aarch64/sysdep.h b/sysdeps/aarch64/sysdep.h index 4cb028f..f2ea821 100644 --- a/sysdeps/aarch64/sysdep.h +++ b/sysdeps/aarch64/sysdep.h @@ -23,10 +23,16 @@ #ifdef __LP64__ #define AARCH64_R(NAME) R_AARCH64_ ## NAME +#define PTR_REG(n) x##n +#define PTR_LOG_SIZE 3 #else #define AARCH64_R(NAME) R_AARCH64_P32_ ## NAME +#define PTR_REG(n) w##n +#define PTR_LOG_SIZE 2 #endif +#define PTR_SIZE (1<<PTR_LOG_SIZE) + #ifdef __ASSEMBLER__ /* Syntactic details of assembler. */ @@ -87,16 +93,18 @@ # define L(name) .L##name #endif -/* Load or store to/from a pc-relative EXPR into/from R, using T. */ -#define LDST_PCREL(OP, R, T, EXPR) \ - adrp T, EXPR; \ - OP R, [T, #:lo12:EXPR];\ - -/* Load or store to/from a got-relative EXPR into/from R, using T. */ -#define LDST_GLOBAL(OP, R, T, EXPR) \ - adrp T, :got:EXPR; \ - ldr T, [T, #:got_lo12:EXPR];\ - OP R, [T]; +/* Load or store to/from a pc-relative EXPR into/from R, using T. + Note R and T are register numbers and not register names. */ +#define LDST_PCREL(OP, R, T, EXPR) \ + adrp x##T, EXPR; \ + OP PTR_REG (R), [x##T, #:lo12:EXPR]; \ + +/* Load or store to/from a got-relative EXPR into/from R, using T. + Note R and T are register numbers and not register names. */ +#define LDST_GLOBAL(OP, R, T, EXPR) \ + adrp x##T, :got:EXPR; \ + ldr PTR_REG (T), [x##T, #:got_lo12:EXPR]; \ + OP x##R, [x##T]; /* Since C identifiers are not normally prefixed with an underscore on this system, the asm identifier `syscall_error' intrudes on the diff --git a/sysdeps/unix/sysv/linux/aarch64/sysdep.h b/sysdeps/unix/sysv/linux/aarch64/sysdep.h index a397e50..1ffabc2 100644 --- a/sysdeps/unix/sysv/linux/aarch64/sysdep.h +++ b/sysdeps/unix/sysv/linux/aarch64/sysdep.h @@ -250,12 +250,14 @@ (!defined SHARED && (IS_IN (libc) \ || IS_IN (libpthread)))) # ifdef __ASSEMBLER__ +/* Note, dst, src, guard, and tmp are all register numbers rather than + register names so they will work with both ILP32 and LP64. */ # define PTR_MANGLE(dst, src, guard, tmp) \ LDST_PCREL (ldr, guard, tmp, C_SYMBOL_NAME(__pointer_chk_guard_local)); \ PTR_MANGLE2 (dst, src, guard) /* Use PTR_MANGLE2 for efficiency if guard is already loaded. */ # define PTR_MANGLE2(dst, src, guard)\ - eor dst, src, guard + eor x##dst, x##src, x##guard # define PTR_DEMANGLE(dst, src, guard, tmp)\ PTR_MANGLE (dst, src, guard, tmp) # define PTR_DEMANGLE2(dst, src, guard)\ @@ -268,12 +270,14 @@ extern uintptr_t __pointer_chk_guard_local attribute_relro attribute_hidden; # endif #else # ifdef __ASSEMBLER__ +/* Note, dst, src, guard, and tmp are all register numbers rather than + register names so they will work with both ILP32 and LP64. */ # define PTR_MANGLE(dst, src, guard, tmp) \ LDST_GLOBAL (ldr, guard, tmp, C_SYMBOL_NAME(__pointer_chk_guard)); \ PTR_MANGLE2 (dst, src, guard) /* Use PTR_MANGLE2 for efficiency if guard is already loaded. */ # define PTR_MANGLE2(dst, src, guard)\ - eor dst, src, guard + eor x##dst, x##src, x##guard # define PTR_DEMANGLE(dst, src, guard, tmp)\ PTR_MANGLE (dst, src, guard, tmp) # define PTR_DEMANGLE2(dst, src, guard)\