AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-22 13:00:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update x86_64 PTR_MANGLE/PTR_DEMANGLE for x32

Browse Source
This commit is contained in:
H.J. Lu 2012-05-14 15:16:27 -07:00
parent 520ae0fd0b
commit e02f153a1a
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2012-05-14 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/unix/sysv/linux/x86_64/sysdep.h (PTR_MANGLE): Remove
the `q' suffix from xor/rol instructions. Use $2*LP_SIZE+1
instead of $17.
(PTR_DEMANGLE): Likewise.
2012-05-14 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/x86_64/sysdep.h (LP_SIZE): New macro.

32
sysdeps/unix/sysv/linux/x86_64/sysdep.h
View File

@ -342,33 +342,33 @@
/* We cannot use the thread descriptor because in ld.so we use setjmp
earlier than the descriptor is initialized. */
# ifdef __ASSEMBLER__
# define PTR_MANGLE(reg) xorq __pointer_chk_guard_local(%rip), reg; \
rolq $17, reg
# define PTR_DEMANGLE(reg) rorq $17, reg; \
xorq __pointer_chk_guard_local(%rip), reg
# define PTR_MANGLE(reg) xor __pointer_chk_guard_local(%rip), reg; \
rol $2*LP_SIZE+1, reg
# define PTR_DEMANGLE(reg) ror $2*LP_SIZE+1, reg; \
xor __pointer_chk_guard_local(%rip), reg
# else
# define PTR_MANGLE(reg) asm ("xorq __pointer_chk_guard_local(%%rip), %0\n" \
"rolq $17, %0" \
# define PTR_MANGLE(reg) asm ("xor __pointer_chk_guard_local(%%rip), %0\n" \
"rol $2*" LP_SIZE "+1, %0" \
: "=r" (reg) : "0" (reg))
# define PTR_DEMANGLE(reg) asm ("rorq $17, %0\n" \
"xorq __pointer_chk_guard_local(%%rip), %0" \
# define PTR_DEMANGLE(reg) asm ("ror $2*" LP_SIZE "+1, %0\n" \
"xor __pointer_chk_guard_local(%%rip), %0" \
: "=r" (reg) : "0" (reg))
# endif
#else
# ifdef __ASSEMBLER__
# define PTR_MANGLE(reg) xorq %fs:POINTER_GUARD, reg; \
rolq $17, reg
# define PTR_DEMANGLE(reg) rorq $17, reg; \
xorq %fs:POINTER_GUARD, reg
# define PTR_MANGLE(reg) xor %fs:POINTER_GUARD, reg; \
rol $2*LP_SIZE+1, reg
# define PTR_DEMANGLE(reg) ror $2*LP_SIZE+1, reg; \
xor %fs:POINTER_GUARD, reg
# else
# define PTR_MANGLE(var) asm ("xorq %%fs:%c2, %0\n" \
"rolq $17, %0" \
# define PTR_MANGLE(var) asm ("xor %%fs:%c2, %0\n" \
"rol $2*" LP_SIZE "+1, %0" \
: "=r" (var) \
: "0" (var), \
"i" (offsetof (tcbhead_t, \
pointer_guard)))
# define PTR_DEMANGLE(var) asm ("rorq $17, %0\n" \
"xorq %%fs:%c2, %0" \
# define PTR_DEMANGLE(var) asm ("ror $2*" LP_SIZE "+1, %0\n" \
"xor %%fs:%c2, %0" \
: "=r" (var) \
: "0" (var), \
"i" (offsetof (tcbhead_t, \