Removed x86/ume_archdefs.h; moved CLIENT_BASE into x86/core_arch.h.

(CLIENT_BASE wasn't really part of UME.)

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2659

diff --git a/coregrind/stage1.c b/coregrind/stage1.c
index 25c046b662e19aeb83510cf2f762481d2eb11a31..f11b694d11b3d3e2e3ba7fbc969b1f02e3ed8f7b 100644 (file)
--- a/coregrind/stage1.c
+++ b/coregrind/stage1.c
@@ -44,7 +44,6 @@
 
 #include "ume.h"
 #include "ume_arch.h"
-#include "ume_archdefs.h"
 
 static int stack[SIGSTKSZ*4];
 
@@ -209,7 +208,7 @@ static void hoops(void)
    ume_go(info.init_eip, (addr_t)esp);   
 }
 
-int main(int argc, char **argv)
+int main(void)
 {
    struct rlimit rlim;
    const char *cp = getenv(VALGRINDLIB);

diff --git a/coregrind/ume.c b/coregrind/ume.c
index 1c2519364691e9de323a4c797f76762cc49dee02..f18f27581ddc16677be2887572a09fa76895f445 100644 (file)
--- a/coregrind/ume.c
+++ b/coregrind/ume.c
@@ -482,6 +482,10 @@ static int load_ELF(char *hdr, int len, int fd, const char *name,
               interp_size = end;
         }
         break;
+
+      default:
+         // do nothing
+         break;
       }
       }
    }

diff --git a/coregrind/vg_main.c b/coregrind/vg_main.c
index 3dc0de3e8077023606ec46996b8dbd187d1599a0..8e9dac6b48ce5b7ba3d0a9f8c68a2e0e35b36357 100644 (file)
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -33,7 +33,6 @@
 #include "core.h"
 #include "ume.h"
 #include "ume_arch.h"
-#include "ume_archdefs.h"
 
 #include <dirent.h>
 #include <dlfcn.h>

diff --git a/coregrind/x86/Makefile.am b/coregrind/x86/Makefile.am
index dd09e3a4c25ef875905babe7b3a819d8fc17f70d..ad664a850103add43634b9b1b9e8daa63b577013 100644 (file)
--- a/coregrind/x86/Makefile.am
+++ b/coregrind/x86/Makefile.am
@@ -5,8 +5,7 @@ AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fomit-frame-pointer -g
 
 noinst_HEADERS = \
        core_arch.h \
-       core_arch_asm.h \
-       ume_archdefs.h
+       core_arch_asm.h
 
 noinst_LIBRARIES = libarch.a
 

diff --git a/coregrind/x86/core_arch.h b/coregrind/x86/core_arch.h
index a73717b359087b371999760fe9333998f3e732f4..b71a7958a1ee2e3ea3de52d9a498468caaa40e6c 100644 (file)
--- a/coregrind/x86/core_arch.h
+++ b/coregrind/x86/core_arch.h
@@ -1,6 +1,6 @@
 
 /*--------------------------------------------------------------------*/
-/*---                                              x86/core_arch.h ---*/
+/*--- Arch-specific stuff for the core.            x86/core_arch.h ---*/
 /*--------------------------------------------------------------------*/
 
 /*
@@ -65,6 +65,7 @@ typedef struct _LDT_ENTRY {
     LdtEnt;
 } VgLdtEntry;
 
+
 /* ---------------------------------------------------------------------
    Constants pertaining to the simulated CPU state, VG_(baseBlock),
    which need to go here to avoid ugly circularities.
@@ -86,6 +87,8 @@ 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.
       Starts out as NULL, indicating there is no table, and we hope to
@@ -142,6 +145,14 @@ typedef struct {
 } 
 arch_thread_t;
 
+
+/* ---------------------------------------------------------------------
+   Constants involving memory layout
+   ------------------------------------------------------------------ */
+
+// base address of client address space
+#define CLIENT_BASE    0x00000000ul
+
 #endif   // __X86_CORE_ARCH_H
 
 /*--------------------------------------------------------------------*/

diff --git a/coregrind/x86/ume_archdefs.h b/coregrind/x86/ume_archdefs.h
deleted file mode 100644 (file)
index 14b738a..0000000
--- a/coregrind/x86/ume_archdefs.h
+++ /dev/null
@@ -1,32 +0,0 @@
-
-/*
-   This file is part of Valgrind, an extensible x86 protected-mode
-   emulator for monitoring program execution on x86-Unixes.
-
-   Copyright (C) 2000-2004 Julian Seward 
-      jseward@acm.org
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307, USA.
-
-   The GNU General Public License is contained in the file COPYING.
-*/
-
-#ifndef UME_ARCHDEFS_H
-#define UME_ARCHDEFS_H
-
-#define CLIENT_BASE    0x00000000ul                    /* base address of client address space */
-
-#endif /* UME_ARCHDEFS_H */