|
From: <sv...@va...> - 2005-06-09 14:17:49
|
Author: sewardj
Date: 2005-06-09 15:17:47 +0100 (Thu, 09 Jun 2005)
New Revision: 3860
Log:
Move some #define-d constants into the VKI department, where I should
have put them in the first place.
Modified:
trunk/coregrind/m_syscalls/syscalls-amd64-linux.c
trunk/include/vki-amd64-linux.h
Modified: trunk/coregrind/m_syscalls/syscalls-amd64-linux.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/coregrind/m_syscalls/syscalls-amd64-linux.c 2005-06-09 13:56:07=
UTC (rev 3859)
+++ trunk/coregrind/m_syscalls/syscalls-amd64-linux.c 2005-06-09 14:17:47=
UTC (rev 3860)
@@ -48,13 +48,7 @@
=20
#include "vki_unistd.h" /* for the __NR_* constants */
=20
-/* COPIED FROM /usr/include/asm-i386/prctl.h (amd64-linux) */
-#define ARCH_SET_GS 0x1001
-#define ARCH_SET_FS 0x1002
-#define ARCH_GET_FS 0x1003
-#define ARCH_GET_GS 0x1004
=20
-
/* ---------------------------------------------------------------------
Stacks, thread wrappers
Note. Why is this stuff here?
@@ -682,7 +676,7 @@
// PRE_MEM_READs/PRE_MEM_WRITEs as necessary...
=20
/* "do" the syscall ourselves; the kernel never sees it */
- vg_assert(ARG1 =3D=3D ARCH_SET_FS);
+ vg_assert(ARG1 =3D=3D VKI_ARCH_SET_FS);
tst =3D VG_(get_ThreadState)(tid);
tst->arch.vex.guest_FS_ZERO =3D ARG2;
=20
Modified: trunk/include/vki-amd64-linux.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/include/vki-amd64-linux.h 2005-06-09 13:56:07 UTC (rev 3859)
+++ trunk/include/vki-amd64-linux.h 2005-06-09 14:17:47 UTC (rev 3860)
@@ -483,6 +483,13 @@
#define VKI_GDT_ENTRY_TLS_MIN 11
#define VKI_GDT_ENTRY_TLS_MAX 13
=20
+// These are actually from linux-???/include/asm-i386/prctl.h.
+// But they appear to be needed on amd64.
+#define VKI_ARCH_SET_GS 0x1001
+#define VKI_ARCH_SET_FS 0x1002
+#define VKI_ARCH_GET_FS 0x1003
+#define VKI_ARCH_GET_GS 0x1004
+
//----------------------------------------------------------------------
// From linux-2.6.9/include/asm-x86_64/ldt.h
//----------------------------------------------------------------------
|