Arch-abstraction:

- add a new file x86/x86_private.h, a header for the x86-specific stuff that is
  not seen by the core.
- move some LDT function decls into x86_private.h.

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

diff --git a/coregrind/core.h b/coregrind/core.h
index cee987d75c0ee8bb9233f3c8b82d6947a658a22b..018da8b7d50666074d17de397f500a32b070c8d8 100644 (file)
--- a/coregrind/core.h
+++ b/coregrind/core.h
@@ -609,11 +609,6 @@ extern Bool VG_(sk_malloc_called_by_scheduler);
    Exports of vg_ldt.c
    ------------------------------------------------------------------ */
 
-/* Alloc & copy, and dealloc. */
-extern VgLdtEntry* VG_(allocate_LDT_for_thread)   ( VgLdtEntry* parent_ldt );
-extern void        VG_(deallocate_LDT_for_thread) ( VgLdtEntry* ldt );
-extern void        VG_(clear_TLS_for_thread)      ( VgLdtEntry* tls );
-
 /* Simulate the modify_ldt syscall. */
 extern Int VG_(sys_modify_ldt) ( ThreadId tid,
                                  Int func, void* ptr, UInt bytecount );

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

diff --git a/coregrind/x86/state.c b/coregrind/x86/state.c
index 884fe4cc5698209819b127bc4eb2a7e6a0e1ec76..89fcff62befca54d82c065f8ae3862b87ca67a5d 100644 (file)
--- a/coregrind/x86/state.c
+++ b/coregrind/x86/state.c
@@ -29,6 +29,7 @@
 */
 
 #include "core.h"
+#include "x86_private.h"
 #include <sys/ptrace.h>
 
 /*------------------------------------------------------------*/

diff --git a/coregrind/x86/x86_private.h b/coregrind/x86/x86_private.h
new file mode 100644 (file)
index 0000000..4092240
--- /dev/null
+++ b/coregrind/x86/x86_private.h
@@ -0,0 +1,51 @@
+
+/*--------------------------------------------------------------------*/
+/*--- Private x86 specific header.                   x86/private.h ---*/
+/*--------------------------------------------------------------------*/
+
+/*
+   This file is part of Valgrind, an extensible x86 protected-mode
+   emulator for monitoring program execution on x86-Unixes.
+
+   Copyright (C) 2000-2004 Nicholas Nethercote
+      njn25@cam.ac.uk
+
+   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 __X86_PRIVATE_H
+#define __X86_PRIVATE_H
+
+#include "core_arch_asm.h"    // arch-specific asm  stuff
+#include "tool_arch.h"        // arch-specific tool stuff
+
+/* ---------------------------------------------------------------------
+   Exports of vg_ldt.c
+   ------------------------------------------------------------------ */
+
+/* Alloc & copy, and dealloc. */
+extern VgLdtEntry* VG_(allocate_LDT_for_thread)   ( VgLdtEntry* parent_ldt );
+extern void        VG_(deallocate_LDT_for_thread) ( VgLdtEntry* ldt );
+extern void        VG_(clear_TLS_for_thread)      ( VgLdtEntry* tls );
+
+
+#endif   // __X86_PRIVATE_H
+
+/*--------------------------------------------------------------------*/
+/*--- end                                                          ---*/
+/*--------------------------------------------------------------------*/