Move some decls out of tool.h into the new file pub_tool_aspacemgr.h.

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

diff --git a/coregrind/m_tooliface.c b/coregrind/m_tooliface.c
index c0b2c16a069a794c6c121919d368504bba4f82a7..e65126a35c0986aa131c612b58cfe983da0b8e32 100644 (file)
--- a/coregrind/m_tooliface.c
+++ b/coregrind/m_tooliface.c
@@ -30,10 +30,11 @@
 */
 
 #include "core.h"
-#include "pub_core_tooliface.h"
+#include "pub_core_aspacemgr.h"
 #include "pub_core_libcbase.h"
 #include "pub_core_libcprint.h"
 #include "pub_core_mallocfree.h"
+#include "pub_core_tooliface.h"
 
 // The core/tool dictionary of functions (initially zeroed, as we want it)
 VgToolInterface VG_(tdict);

diff --git a/coregrind/pub_core_aspacemgr.h b/coregrind/pub_core_aspacemgr.h
index 15a5400dc7ae3a11036d57d505b17e0e1619aed3..4c39c29857efd1c18c3898cea7b9d963c0a19929 100644 (file)
--- a/coregrind/pub_core_aspacemgr.h
+++ b/coregrind/pub_core_aspacemgr.h
@@ -40,7 +40,7 @@
 // [XXX: actually, this is far from true...]
 //--------------------------------------------------------------------
 
-/* #include "pub_tool_aspacemgr.h" */
+#include "pub_tool_aspacemgr.h"
 #include "pub_core_debuginfo.h"
 
 // Address space globals

diff --git a/helgrind/hg_main.c b/helgrind/hg_main.c
index c919cb033c11d5f4c63ba0685c4bd1ccedb3b841..91bf650b4af5177752664350a489b45527df6040 100644 (file)
--- a/helgrind/hg_main.c
+++ b/helgrind/hg_main.c
@@ -30,6 +30,7 @@
 */
 
 #include "tool.h"
+#include "pub_tool_aspacemgr.h"
 #include "pub_tool_debuginfo.h"
 #include "pub_tool_hashtable.h"
 #include "pub_tool_libcbase.h"

diff --git a/include/Makefile.am b/include/Makefile.am
index 6445b3d91bbe6aa183ce90196009cb75076f03b4..9e9ea7077bef3c15a2af656775dd2a8e1db6fa83 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -5,6 +5,7 @@ incinc_HEADERS = \
        basic_types.h                   \
        tool.h                          \
        tool_asm.h                      \
+       pub_tool_aspacemgr.h            \
        pub_tool_errormgr.h             \
        pub_tool_execontext.h           \
        pub_tool_hashtable.h            \

diff --git a/include/pub_tool_aspacemgr.h b/include/pub_tool_aspacemgr.h
new file mode 100644 (file)
index 0000000..ea709f6
--- /dev/null
+++ b/include/pub_tool_aspacemgr.h
@@ -0,0 +1,59 @@
+
+/*--------------------------------------------------------------------*/
+/*--- Address space manager.                  pub_tool_aspacemgr.h ---*/
+/*--------------------------------------------------------------------*/
+
+/*
+   This file is part of Valgrind, a dynamic binary instrumentation
+   framework.
+
+   Copyright (C) 2000-2005 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 __PUB_TOOL_ASPACEMGR
+#define __PUB_TOOL_ASPACEMGR
+
+extern Bool VG_(is_client_addr) (Addr a);
+
+extern Bool VG_(is_shadow_addr) (Addr a);
+extern Addr VG_(get_shadow_size)(void);
+
+extern void *VG_(shadow_alloc)(UInt size);
+
+extern Bool VG_(is_addressable)(Addr p, SizeT sz, UInt prot);
+
+/* initialize shadow pages in the range [p, p+sz) This calls
+   init_shadow_page for each one.  It should be a lot more efficient
+   for bulk-initializing shadow pages than faulting on each one. 
+*/
+extern void VG_(init_shadow_range)(Addr p, UInt sz, Bool call_init);
+
+/* Calls into the core used by leak-checking */
+
+/* Calls "add_rootrange" with each range of memory which looks like a
+   plausible source of root pointers. */
+extern void VG_(find_root_memory)(void (*add_rootrange)(Addr addr, SizeT sz));
+
+#endif   // __PUB_TOOL_ASPACEMGR
+
+/*--------------------------------------------------------------------*/
+/*--- end                                                          ---*/
+/*--------------------------------------------------------------------*/

diff --git a/include/tool.h b/include/tool.h
index be561bb618a660305e2b0d4d192e825dd726fc7e..7fd9c75d6b2d28037922113ac2f01ddfa1f867c8 100644 (file)
--- a/include/tool.h
+++ b/include/tool.h
@@ -140,32 +140,11 @@ extern Int  VG_(setpgid) ( Int pid, Int pgrp );
 /* Get memory by anonymous mmap. */
 extern void* VG_(get_memory_from_mmap) ( SizeT nBytes, Char* who );
 
-extern Bool VG_(is_client_addr) (Addr a);
-
-extern Bool VG_(is_shadow_addr) (Addr a);
-extern Addr VG_(get_shadow_size)(void);
-
-extern void *VG_(shadow_alloc)(UInt size);
-
-extern Bool VG_(is_addressable)(Addr p, SizeT sz, UInt prot);
-
 /* Register an interest in apparently internal faults; used code which
    wanders around dangerous memory (ie, leakcheck).  The catcher is
    not expected to return. */
 extern void VG_(set_fault_catcher)(void (*catcher)(Int sig, Addr addr));
 
-/* initialize shadow pages in the range [p, p+sz) This calls
-   init_shadow_page for each one.  It should be a lot more efficient
-   for bulk-initializing shadow pages than faulting on each one. 
-*/
-extern void VG_(init_shadow_range)(Addr p, UInt sz, Bool call_init);
-
-/* Calls into the core used by leak-checking */
-
-/* Calls "add_rootrange" with each range of memory which looks like a
-   plausible source of root pointers. */
-extern void VG_(find_root_memory)(void (*add_rootrange)(Addr addr, SizeT sz));
-
 /* Calls "mark_addr" with register values (which may or may not be pointers) */
 extern void VG_(mark_from_registers)(void (*mark_addr)(Addr addr));
 

diff --git a/memcheck/mac_leakcheck.c b/memcheck/mac_leakcheck.c
index ad626da9015b299edc51d03374182756ae26680d..b7ef0216dcbafdbac708a35375aa60c38cab2749 100644 (file)
--- a/memcheck/mac_leakcheck.c
+++ b/memcheck/mac_leakcheck.c
@@ -32,6 +32,7 @@
 
 #include <setjmp.h>
 #include "mac_shared.h"
+#include "pub_tool_aspacemgr.h"
 #include "pub_tool_libcbase.h"
 #include "pub_tool_libcassert.h"
 #include "pub_tool_libcprint.h"

diff --git a/memcheck/mc_main.c b/memcheck/mc_main.c
index c8cba1b65d5d9a11900693b14c1d0cfc76276f6c..3a667e202f342940801f197dc3ff7ad0227be49f 100644 (file)
--- a/memcheck/mc_main.c
+++ b/memcheck/mc_main.c
@@ -38,6 +38,7 @@
 
 #include "mc_include.h"
 #include "memcheck.h"   /* for client requests */
+#include "pub_tool_aspacemgr.h"
 #include "pub_tool_libcbase.h"
 #include "pub_tool_libcassert.h"
 #include "pub_tool_libcprint.h"