|
From: Nicholas N. <nj...@ca...> - 2004-09-03 23:25:50
|
CVS commit by nethercote:
Removed x86/ume_archdefs.h; moved CLIENT_BASE into x86/core_arch.h.
(CLIENT_BASE wasn't really part of UME.)
M +1 -2 stage1.c 1.19
M +4 -0 ume.c 1.22
M +0 -1 vg_main.c 1.201
M +1 -2 x86/Makefile.am 1.9
M +12 -1 x86/core_arch.h 1.2
R x86/ume_archdefs.h 1.2
--- valgrind/coregrind/stage1.c #1.18:1.19
@@ -45,5 +45,4 @@
#include "ume.h"
#include "ume_arch.h"
-#include "ume_archdefs.h"
static int stack[SIGSTKSZ*4];
@@ -210,5 +209,5 @@ static void hoops(void)
}
-int main(int argc, char **argv)
+int main(void)
{
struct rlimit rlim;
--- valgrind/coregrind/ume.c #1.21:1.22
@@ -483,4 +483,8 @@ static int load_ELF(char *hdr, int len,
}
break;
+
+ default:
+ // do nothing
+ break;
}
}
--- valgrind/coregrind/vg_main.c #1.200:1.201
@@ -34,5 +34,4 @@
#include "ume.h"
#include "ume_arch.h"
-#include "ume_archdefs.h"
#include <dirent.h>
--- valgrind/coregrind/x86/Makefile.am #1.8:1.9
@@ -6,6 +6,5 @@
noinst_HEADERS = \
core_arch.h \
- core_arch_asm.h \
- ume_archdefs.h
+ core_arch_asm.h
noinst_LIBRARIES = libarch.a
--- valgrind/coregrind/x86/core_arch.h #1.1:1.2
@@ -1,5 +1,5 @@
/*--------------------------------------------------------------------*/
-/*--- x86/core_arch.h ---*/
+/*--- Arch-specific stuff for the core. x86/core_arch.h ---*/
/*--------------------------------------------------------------------*/
@@ -87,4 +88,6 @@ typedef struct _LDT_ENTRY {
// Architecture-specific part of a ThreadState
+// XXX: eventually this should be made abstract, ie. the fields not visible
+// to the core...
typedef struct {
/* Pointer to this thread's Local (Segment) Descriptor Table.
@@ -143,4 +146,12 @@ typedef struct {
arch_thread_t;
+
+/* ---------------------------------------------------------------------
+ Constants involving memory layout
+ ------------------------------------------------------------------ */
+
+// base address of client address space
+#define CLIENT_BASE 0x00000000ul
+
#endif // __X86_CORE_ARCH_H
|