Don't #include pub_core_debuginfo.h in pub_core_aspacemgr.h. So have

to #include it explicitly in lots of other places, but at least the
dependency is clear now.

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

diff --git a/coregrind/m_aspacemgr/aspacemgr.c b/coregrind/m_aspacemgr/aspacemgr.c
index a87827a9232b649b7a145acbb2b700b0e73399aa..a780c1d9604ed9b35dea1618394f548b86a2fb43 100644 (file)
--- a/coregrind/m_aspacemgr/aspacemgr.c
+++ b/coregrind/m_aspacemgr/aspacemgr.c
@@ -31,6 +31,7 @@
 */
 
 #include "pub_core_basics.h"
+#include "pub_core_debuginfo.h"  // Needed for pub_core_aspacemgr :(
 #include "pub_core_aspacemgr.h"
 #include "pub_core_libcbase.h"
 #include "pub_core_libcassert.h"

diff --git a/coregrind/m_aspacemgr/read_procselfmaps.c b/coregrind/m_aspacemgr/read_procselfmaps.c
index 547d7048e6f0bb5145241a4bf93476359b8afdeb..78c1b51dc1ea0a9257c73a4f324cfe7960b49e52 100644 (file)
--- a/coregrind/m_aspacemgr/read_procselfmaps.c
+++ b/coregrind/m_aspacemgr/read_procselfmaps.c
@@ -30,6 +30,7 @@
 */
 
 #include "pub_core_basics.h"
+#include "pub_core_debuginfo.h"  // Needed for pub_core_aspacemgr :(
 #include "pub_core_aspacemgr.h"
 #include "pub_core_libcbase.h"
 #include "pub_core_libcassert.h"

diff --git a/coregrind/m_debuginfo/symtab.c b/coregrind/m_debuginfo/symtab.c
index 3b5b67b287826ff1af151f1dcf1596c0c2a39e1e..b649e8e28c6e28e632ea682587acc7ab8b98b388 100644 (file)
--- a/coregrind/m_debuginfo/symtab.c
+++ b/coregrind/m_debuginfo/symtab.c
@@ -31,6 +31,7 @@
 
 #include "pub_core_basics.h"
 #include "pub_core_threadstate.h"
+#include "pub_core_debuginfo.h"     // Needed for pub_core_aspacemgr :(
 #include "pub_core_aspacemgr.h"     // For Segment type
 #include "pub_core_debuginfo.h"
 #include "pub_core_demangle.h"

diff --git a/coregrind/m_libcmman.c b/coregrind/m_libcmman.c
index 70fcb836162a7f00fd6903c13b01112c2db15041..a2265d35ec996307b20deb298baf621ee67a5f08 100644 (file)
--- a/coregrind/m_libcmman.c
+++ b/coregrind/m_libcmman.c
@@ -29,6 +29,7 @@
 */
 
 #include "pub_core_basics.h"
+#include "pub_core_debuginfo.h"     // Needed for pub_core_aspacemgr :(
 #include "pub_core_aspacemgr.h"
 #include "pub_core_libcbase.h"
 #include "pub_core_libcassert.h"

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index 551e21f66f249d901582ac329fc96166f477c7a6..0aa2d03fc191793f36c6e5fba1a23fe6414c98e6 100644 (file)
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -32,6 +32,7 @@
 
 #include "pub_core_basics.h"
 #include "pub_core_threadstate.h"
+#include "pub_core_debuginfo.h"     // Needed for pub_core_aspacemgr :(
 #include "pub_core_aspacemgr.h"
 #include "pub_core_debuglog.h"
 #include "pub_core_errormgr.h"

diff --git a/coregrind/m_redir.c b/coregrind/m_redir.c
index 845507702fe19e77c1c57363023acfe3f98ad8b8..7c61ec308ddbfc7be84f13e56739f2e9e0c7ea30 100644 (file)
--- a/coregrind/m_redir.c
+++ b/coregrind/m_redir.c
@@ -31,7 +31,8 @@
 */
 
 #include "pub_core_basics.h"
-#include "pub_core_aspacemgr.h"     // Needed for pub_core_redir.h
+#include "pub_core_debuginfo.h"     // Needed for pub_core_aspacemgr :(
+#include "pub_core_aspacemgr.h"     // Needed for pub_core_redir.h :(
 #include "pub_core_libcbase.h"
 #include "pub_core_libcassert.h"
 #include "pub_core_libcprint.h"

diff --git a/coregrind/m_scheduler/scheduler.c b/coregrind/m_scheduler/scheduler.c
index 0e19591c613362b7133b684b5916dab224f09b26..afbedd0cfba8fe73835a874792ba2519ec14bbd8 100644 (file)
--- a/coregrind/m_scheduler/scheduler.c
+++ b/coregrind/m_scheduler/scheduler.c
@@ -62,6 +62,7 @@
 
 #include "pub_core_basics.h"
 #include "pub_core_threadstate.h"
+#include "pub_core_debuginfo.h"     // Needed for pub_core_aspacemgr :(
 #include "pub_core_aspacemgr.h"
 #include "pub_core_dispatch.h"
 #include "pub_core_errormgr.h"      // For VG_(get_n_errs_found)()

diff --git a/coregrind/m_sigframe/sigframe-amd64-linux.c b/coregrind/m_sigframe/sigframe-amd64-linux.c
index a3246bcc467262e9072df9c1dc22f5c3b30bb484..80983b0d947ed154c6be27b1884cd03b4e100c69 100644 (file)
--- a/coregrind/m_sigframe/sigframe-amd64-linux.c
+++ b/coregrind/m_sigframe/sigframe-amd64-linux.c
@@ -31,6 +31,7 @@
 
 #include "pub_core_basics.h"
 #include "pub_core_threadstate.h"
+#include "pub_core_debuginfo.h"     // Needed for pub_core_aspacemgr :(
 #include "pub_core_aspacemgr.h"
 #include "pub_core_libcbase.h"
 #include "pub_core_libcassert.h"

diff --git a/coregrind/m_sigframe/sigframe-ppc32-linux.c b/coregrind/m_sigframe/sigframe-ppc32-linux.c
index 6c654744121d92a36327d19db21c64a18d73a8e4..a6dd9f8482bf7d041bd9c6bbffbb81129718976c 100644 (file)
--- a/coregrind/m_sigframe/sigframe-ppc32-linux.c
+++ b/coregrind/m_sigframe/sigframe-ppc32-linux.c
@@ -31,6 +31,7 @@
 
 #include "pub_core_basics.h"
 #include "pub_core_threadstate.h"
+#include "pub_core_debuginfo.h"     // Needed for pub_core_aspacemgr :(
 #include "pub_core_aspacemgr.h"
 #include "pub_core_libcbase.h"
 #include "pub_core_libcassert.h"

diff --git a/coregrind/m_sigframe/sigframe-x86-linux.c b/coregrind/m_sigframe/sigframe-x86-linux.c
index 05af3194c32fcfa36ddcd5386bdbb18ba2b7a2cc..2ca201d36e7e9d222fbb4e491a9496c10b7c855d 100644 (file)
--- a/coregrind/m_sigframe/sigframe-x86-linux.c
+++ b/coregrind/m_sigframe/sigframe-x86-linux.c
@@ -31,6 +31,7 @@
 
 #include "pub_core_basics.h"
 #include "pub_core_threadstate.h"
+#include "pub_core_debuginfo.h"     // Needed for pub_core_aspacemgr :(
 #include "pub_core_aspacemgr.h" /* find_segment */
 #include "pub_core_libcbase.h"
 #include "pub_core_libcassert.h"

diff --git a/coregrind/m_signals.c b/coregrind/m_signals.c
index e954637ae645d8169d2b6a49fd65ef3e1c01a6b8..7b71f75a65079b1b3d21276f14ec91dbb5d29568 100644 (file)
--- a/coregrind/m_signals.c
+++ b/coregrind/m_signals.c
@@ -81,6 +81,7 @@
 
 #include "pub_core_basics.h"
 #include "pub_core_threadstate.h"
+#include "pub_core_debuginfo.h"     // Needed for pub_core_aspacemgr :(
 #include "pub_core_aspacemgr.h"
 #include "pub_core_debugger.h"
 #include "pub_core_errormgr.h"

diff --git a/coregrind/m_stacktrace.c b/coregrind/m_stacktrace.c
index f606de3ec6d8784a201729d99cbab13533c52956..9b086c789db6d4a87d20a37e8643cf619877642d 100644 (file)
--- a/coregrind/m_stacktrace.c
+++ b/coregrind/m_stacktrace.c
@@ -30,6 +30,7 @@
 
 #include "pub_core_basics.h"
 #include "pub_core_threadstate.h"
+#include "pub_core_debuginfo.h"     // Needed for pub_core_aspacemgr :(
 #include "pub_core_aspacemgr.h"     // For VG_(is_addressable)()
 #include "pub_core_libcbase.h"
 #include "pub_core_libcassert.h"

diff --git a/coregrind/m_syswrap/syswrap-amd64-linux.c b/coregrind/m_syswrap/syswrap-amd64-linux.c
index 43f6ea4d65158e380a3de4602de602ebb7536c4e..9d0afc807cf3634452c45070ae9dbec8c27507cf 100644 (file)
--- a/coregrind/m_syswrap/syswrap-amd64-linux.c
+++ b/coregrind/m_syswrap/syswrap-amd64-linux.c
@@ -30,8 +30,9 @@
 
 #include "pub_core_basics.h"
 #include "pub_core_threadstate.h"
-#include "pub_core_debuglog.h"
+#include "pub_core_debuginfo.h"     // Needed for pub_core_aspacemgr :(
 #include "pub_core_aspacemgr.h"
+#include "pub_core_debuglog.h"
 #include "pub_core_options.h"
 #include "pub_core_libcbase.h"
 #include "pub_core_libcassert.h"

diff --git a/coregrind/m_syswrap/syswrap-generic.c b/coregrind/m_syswrap/syswrap-generic.c
index 718c742aaa92c39ce4a99ce7df66511e7d794a4e..7e0fbbe73dc2133c3e9194ed0bd562b30b57bc86 100644 (file)
--- a/coregrind/m_syswrap/syswrap-generic.c
+++ b/coregrind/m_syswrap/syswrap-generic.c
@@ -30,8 +30,9 @@
 
 #include "pub_core_basics.h"
 #include "pub_core_threadstate.h"
-#include "pub_core_debuglog.h"
+#include "pub_core_debuginfo.h"     // Needed for pub_core_aspacemgr :(
 #include "pub_core_aspacemgr.h"
+#include "pub_core_debuglog.h"
 #include "pub_core_libcbase.h"
 #include "pub_core_libcassert.h"
 #include "pub_core_libcfile.h"

diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
index d915ea681857da22b660f70a6bdfde45e4c3117a..2a9422479d1942f0e74aa88ebe7db8081506108a 100644 (file)
--- a/coregrind/m_syswrap/syswrap-linux.c
+++ b/coregrind/m_syswrap/syswrap-linux.c
@@ -30,6 +30,7 @@
 
 #include "pub_core_basics.h"
 #include "pub_core_threadstate.h"
+#include "pub_core_debuginfo.h"     // Needed for pub_core_aspacemgr :(
 #include "pub_core_aspacemgr.h"
 #include "pub_core_debuglog.h"
 #include "pub_core_libcbase.h"

diff --git a/coregrind/m_syswrap/syswrap-ppc32-linux.c b/coregrind/m_syswrap/syswrap-ppc32-linux.c
index 35cfaeb99ba20fae510dfea604bbdcc36fa327a0..fa1a0e1ffdddbf5f443fb7fde96c92c238c23792 100644 (file)
--- a/coregrind/m_syswrap/syswrap-ppc32-linux.c
+++ b/coregrind/m_syswrap/syswrap-ppc32-linux.c
@@ -30,8 +30,9 @@
 
 #include "pub_core_basics.h"
 #include "pub_core_threadstate.h"
-#include "pub_core_debuglog.h"
+#include "pub_core_debuginfo.h"     // Needed for pub_core_aspacemgr :(
 #include "pub_core_aspacemgr.h"
+#include "pub_core_debuglog.h"
 #include "pub_core_libcbase.h"
 #include "pub_core_libcassert.h"
 #include "pub_core_libcmman.h"

diff --git a/coregrind/m_syswrap/syswrap-x86-linux.c b/coregrind/m_syswrap/syswrap-x86-linux.c
index ebe69ff7a6acf47bd833d63ddb296c6a2d5442df..684f00d797e4d20a14572626abe0a7fc0462ce2f 100644 (file)
--- a/coregrind/m_syswrap/syswrap-x86-linux.c
+++ b/coregrind/m_syswrap/syswrap-x86-linux.c
@@ -35,8 +35,9 @@
 
 #include "pub_core_basics.h"
 #include "pub_core_threadstate.h"
-#include "pub_core_debuglog.h"
+#include "pub_core_debuginfo.h"     // Needed for pub_core_aspacemgr :(
 #include "pub_core_aspacemgr.h"
+#include "pub_core_debuglog.h"
 #include "pub_core_libcbase.h"
 #include "pub_core_libcassert.h"
 #include "pub_core_libcmman.h"

diff --git a/coregrind/m_tooliface.c b/coregrind/m_tooliface.c
index 5b44b13c280fc4bb834c1acd2fdc2d34e51e7df4..c384bf523a8647f06d310c0fb274bb6e19657bb4 100644 (file)
--- a/coregrind/m_tooliface.c
+++ b/coregrind/m_tooliface.c
@@ -30,6 +30,7 @@
 */
 
 #include "pub_core_basics.h"
+#include "pub_core_debuginfo.h"     // Needed for pub_core_aspacemgr :(
 #include "pub_core_aspacemgr.h"     // For VG_(get_shadow_size)()
 #include "pub_core_libcassert.h"
 #include "pub_core_libcprint.h"

diff --git a/coregrind/m_translate.c b/coregrind/m_translate.c
index 30deb0d9cce7f93591753f9a6a4747bb7a9081ca..d1dd4b7e01ae2f6532eea2d7c830bcfe74785713 100644 (file)
--- a/coregrind/m_translate.c
+++ b/coregrind/m_translate.c
@@ -30,6 +30,7 @@
 */
 
 #include "pub_core_basics.h"
+#include "pub_core_debuginfo.h"     // Needed for pub_core_aspacemgr :(
 #include "pub_core_aspacemgr.h"
 #include "pub_core_cpuid.h"
 #include "pub_core_libcbase.h"

diff --git a/coregrind/pub_core_aspacemgr.h b/coregrind/pub_core_aspacemgr.h
index 26a92a3b5cb02d3c60c209d32b0fe8c563a65aaa..e59bc866203e39461971345afd1cc3bf60495b49 100644 (file)
--- a/coregrind/pub_core_aspacemgr.h
+++ b/coregrind/pub_core_aspacemgr.h
@@ -37,11 +37,12 @@
 // memory management.  Hence this module is almost completely
 // standalone; the only module it uses is m_debuglog.  DO NOT CHANGE
 // THIS.
-// [XXX: actually, this is far from true...]
+// [XXX: actually, this is far from true... especially that to #include
+// this header, you have to #include pub_core_debuginfo in order to 
+// see the SegInfo type, which is very bad...]
 //--------------------------------------------------------------------
 
 #include "pub_tool_aspacemgr.h"
-#include "pub_core_debuginfo.h"
 
 // Address space globals
 extern Addr VG_(client_base);   // client address space limits

diff --git a/coregrind/pub_core_syswrap.h b/coregrind/pub_core_syswrap.h
index 493f9a4a5ea230982de23fd809edfa80a39ca72c..a54a26a854a82cc880edc53ac3256f8a76e9ad44 100644 (file)
--- a/coregrind/pub_core_syswrap.h
+++ b/coregrind/pub_core_syswrap.h
@@ -32,8 +32,8 @@
 #define __PUB_CORE_SYSWRAP_H
 
 //--------------------------------------------------------------------
-// PURPOSE: This module contains all the syscall junk:  mostly wrappers,
-// but also the code that executes them, and related stuff.
+// PURPOSE: This module contains all the syscall junk:  mostly PRE/POST
+// wrappers, but also the main syscall jacketing code.
 //--------------------------------------------------------------------
 
 // Return how many bytes of a thread's Valgrind stack are unused