|
From: <sv...@va...> - 2006-01-10 20:58:52
|
Author: sewardj
Date: 2006-01-10 20:58:43 +0000 (Tue, 10 Jan 2006)
New Revision: 5513
Log:
Oops; unbreak x86 fn wrapping.
Modified:
branches/FNWRAP/include/valgrind.h
Modified: branches/FNWRAP/include/valgrind.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/FNWRAP/include/valgrind.h 2006-01-10 20:40:11 UTC (rev 5512)
+++ branches/FNWRAP/include/valgrind.h 2006-01-10 20:58:43 UTC (rev 5513)
@@ -200,7 +200,7 @@
#define VALGRIND_CALL_NOREDIR_EAX \
__SPECIAL_INSTRUCTION_PREAMBLE \
/* call-noredir *%EAX */ \
- "xchgl %%edx,%%edx"
+ "xchgl %%edx,%%edx\n\t"
#endif /* ARCH_x86 */
=20
/* --------------------------- amd64 --------------------------- */
@@ -245,7 +245,7 @@
#define VALGRIND_CALL_NOREDIR_RAX \
__SPECIAL_INSTRUCTION_PREAMBLE \
/* call-noredir *%RAX */ \
- "xchgq %%rdx,%%rdx"
+ "xchgq %%rdx,%%rdx\n\t"
#endif /* ARCH_amd64 */
=20
/* --------------------------- ppc32 --------------------------- */
@@ -642,10 +642,10 @@
=20
/* --------------------------- amd64 --------------------------- */
=20
+#if defined(ARCH_amd64)
+
/* ARGREGS: rdi rsi rdx rcx r8 r9 (the rest on stack in R-to-L order) */
=20
-#if defined(ARCH_amd64)
-
/* These regs are trashed by the hidden call. */
#define __CALLER_SAVED_REGS /*"rax",*/ "rcx", "rdx", "rsi", \
"rdi", "r8", "r9", "r10", "r11"
@@ -711,6 +711,8 @@
=20
/* --------------------------- ppc32 --------------------------- */
=20
+#if defined(ARCH_ppc32)
+
/* ARGREGS: r3 r4 r5 r6 r7 r8 r9 r10 (the rest on stack somewhere) */
=20
/* These regs are trashed by the hidden call. */
@@ -781,6 +783,8 @@
lval =3D (__typeof__(lval)) _res; \
} while (0)
=20
+#endif /* ARCH_ppc32 */
+
/* --------------------------- ppc64 --------------------------- */
=20
=20
|