|
From: <sv...@va...> - 2005-03-29 21:35:12
|
Author: sewardj
Date: 2005-03-29 22:35:08 +0100 (Tue, 29 Mar 2005)
New Revision: 1111
Modified:
trunk/pub/libvex_basictypes.h
trunk/switchback/linker.c
trunk/switchback/switchback.c
Log:
Use cpp symbol __x86_64__ rather than __amd64__ on the advice of
Michael Matz.
Modified: trunk/pub/libvex_basictypes.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
--- trunk/pub/libvex_basictypes.h 2005-03-29 21:33:11 UTC (rev 1110)
+++ trunk/pub/libvex_basictypes.h 2005-03-29 21:35:08 UTC (rev 1111)
@@ -124,7 +124,7 @@
=20
#undef VEX_HOST_WORDSIZE
=20
-#if defined(__amd64__)
+#if defined(__x86_64__)
# define VEX_HOST_WORDSIZE 8
#elif defined(__i386__)
# define VEX_HOST_WORDSIZE 4
Modified: trunk/switchback/linker.c
=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
--- trunk/switchback/linker.c 2005-03-29 21:33:11 UTC (rev 1110)
+++ trunk/switchback/linker.c 2005-03-29 21:35:08 UTC (rev 1111)
@@ -18,7 +18,7 @@
static int debug_linker =3D 0;
=20
=20
-#if defined(__amd64__)
+#if defined(__x86_64__)
# define x86_64_TARGET_ARCH
#elif defined(__i386__)
# define i386_TARGET_ARCH
@@ -1175,7 +1175,7 @@
=20
if (secno =3D=3D SHN_COMMON) {
isLocal =3D FALSE;
-# if defined(__amd64__)
+# if defined(__x86_64__)
ad =3D calloc_below2G(1, stab[j].st_size);
# else
ad =3D calloc(1, stab[j].st_size);
Modified: trunk/switchback/switchback.c
=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
--- trunk/switchback/switchback.c 2005-03-29 21:33:11 UTC (rev 1110)
+++ trunk/switchback/switchback.c 2005-03-29 21:35:08 UTC (rev 1111)
@@ -35,7 +35,7 @@
# define VexArch VexArchX86
# define VexSubArch VexSubArchX86_sse1
# define GuestPC guest_EIP
-#elif defined(__amd64__)
+#elif defined(__x86_64__)
# define VexGuestState VexGuestAMD64State
# define LibVEX_Guest_initialise LibVEX_GuestAMD64_initialise
# define VexArch VexArchAMD64
@@ -143,7 +143,7 @@
switchback_asm(); // never returns
}
=20
-#elif defined(__amd64__)
+#elif defined(__x86_64__)
=20
asm(
"switchback_asm:\n"
@@ -340,7 +340,7 @@
" ret\n"
);
=20
-#elif defined(__amd64__)
+#elif defined(__x86_64__)
asm(
"run_translation_asm:\n"
=20
@@ -656,7 +656,7 @@
gst.guest_ESP =3D esp+4;
next_guest =3D gst.guest_EIP;
}
-# elif defined(__amd64__)
+# elif defined(__x86_64__)
{
HWord esp =3D gst.guest_RSP;
gst.guest_RIP =3D *(UInt*)(esp+0);
@@ -772,7 +772,7 @@
gst.guest_ESP =3D (UInt)&gstack[25000];
*(UInt*)(gst.guest_ESP+4) =3D (UInt)serviceFn;
*(UInt*)(gst.guest_ESP+0) =3D 0x12345678;
-# elif defined(__amd64__)
+# elif defined(__x86_64__)
gst.guest_RIP =3D (ULong)entry;
gst.guest_RSP =3D (ULong)&gstack[25000];
gst.guest_RDI =3D (ULong)serviceFn;
|