[Glibc-bsd-commits] r1944 - in trunk/glibc-ports/kfreebsd: i386 x86_64

[ps-guest at alioth.debian.org]

Author: ps-guest
Date: 2007-05-25 19:51:14 +0000 (Fri, 25 May 2007)
New Revision: 1944

Modified:
   trunk/glibc-ports/kfreebsd/i386/sysdep.h
   trunk/glibc-ports/kfreebsd/x86_64/sysdep.h
Log:
* merge PTR_MANGLE/PTR_DEMANGLE from Linux variants



Modified: trunk/glibc-ports/kfreebsd/i386/sysdep.h
===================================================================
--- trunk/glibc-ports/kfreebsd/i386/sysdep.h	2007-05-25 11:23:25 UTC (rev 1943)
+++ trunk/glibc-ports/kfreebsd/i386/sysdep.h	2007-05-25 19:51:14 UTC (rev 1944)
@@ -204,4 +204,32 @@
 
 #endif	/* __ASSEMBLER__ */
 
+
+/* Pointer mangling support.  */
+#if defined NOT_IN_libc && defined IS_IN_rtld
+/* We cannot use the thread descriptor because in ld.so we use setjmp
+   earlier than the descriptor is initialized.  Using a global variable
+   is too complicated here since we have no PC-relative addressing mode.  */
+#else
+# ifdef __ASSEMBLER__
+#  define PTR_MANGLE(reg)	xorl %gs:POINTER_GUARD, reg;		      \
+				roll $9, reg
+#  define PTR_DEMANGLE(reg)	rorl $9, reg;				      \
+				xorl %gs:POINTER_GUARD, reg
+# else
+#  define PTR_MANGLE(var)	asm ("xorl %%gs:%c2, %0\n"		      \
+				     "roll $9, %0"			      \
+				     : "=r" (var)			      \
+				     : "0" (var),			      \
+				       "i" (offsetof (tcbhead_t,	      \
+						      pointer_guard)))
+#  define PTR_DEMANGLE(var)	asm ("rorl $9, %0\n"			      \
+				     "xorl %%gs:%c2, %0"		      \
+				     : "=r" (var)			      \
+				     : "0" (var),			      \
+				       "i" (offsetof (tcbhead_t,	      \
+						      pointer_guard)))
+# endif
+#endif
+
 #endif /* _FREEBSD_I386_SYSDEP_H */

Modified: trunk/glibc-ports/kfreebsd/x86_64/sysdep.h
===================================================================
--- trunk/glibc-ports/kfreebsd/x86_64/sysdep.h	2007-05-25 11:23:25 UTC (rev 1943)
+++ trunk/glibc-ports/kfreebsd/x86_64/sysdep.h	2007-05-25 19:51:14 UTC (rev 1944)
@@ -190,4 +190,44 @@
 
 #endif	/* __ASSEMBLER__ */
 
+
+/* Pointer mangling support.  */
+#if defined NOT_IN_libc && defined IS_IN_rtld
+/* 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
+# else
+#  define PTR_MANGLE(reg)	asm ("xorq __pointer_chk_guard_local(%%rip), %0\n" \
+				     "rolq $17, %0"			      \
+				     : "=r" (reg) : "0" (reg))
+#  define PTR_DEMANGLE(reg)	asm ("rorq $17, %0\n"			      \
+				     "xorq __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
+# else
+#  define PTR_MANGLE(var)	asm ("xorq %%fs:%c2, %0\n"		      \
+				     "rolq $17, %0"			      \
+				     : "=r" (var)			      \
+				     : "0" (var),			      \
+				       "i" (offsetof (tcbhead_t,	      \
+						      pointer_guard)))
+#  define PTR_DEMANGLE(var)	asm ("rorq $17, %0\n"			      \
+				     "xorq %%fs:%c2, %0"		      \
+				     : "=r" (var)			      \
+				     : "0" (var),			      \
+				       "i" (offsetof (tcbhead_t,	      \
+						      pointer_guard)))
+# endif
+#endif
+
 #endif /* _KFREEBSD_X86_64_SYSDEP_H  */