From: Nicholas Nethercote Date: Tue, 21 Jun 2005 00:28:11 +0000 (+0000) Subject: Don't #include pub_core_debuginfo.h in pub_core_aspacemgr.h. So have X-Git-Tag: svn/VALGRIND_3_0_0~344 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc38860306a5d3e12ab42753852ea5f5d6f7b042;p=thirdparty%2Fvalgrind.git 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 a87827a923..a780c1d960 100644 --- 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 547d7048e6..78c1b51dc1 100644 --- 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 3b5b67b287..b649e8e28c 100644 --- 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 70fcb83616..a2265d35ec 100644 --- 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 551e21f66f..0aa2d03fc1 100644 --- 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 845507702f..7c61ec308d 100644 --- 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 0e19591c61..afbedd0cfb 100644 --- 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 a3246bcc46..80983b0d94 100644 --- 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 6c65474412..a6dd9f8482 100644 --- 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 05af3194c3..2ca201d36e 100644 --- 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 e954637ae6..7b71f75a65 100644 --- 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 f606de3ec6..9b086c789d 100644 --- 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 43f6ea4d65..9d0afc807c 100644 --- 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 718c742aaa..7e0fbbe73d 100644 --- 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 d915ea6818..2a9422479d 100644 --- 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 35cfaeb99b..fa1a0e1ffd 100644 --- 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 ebe69ff7a6..684f00d797 100644 --- 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 5b44b13c28..c384bf523a 100644 --- 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 30deb0d9cc..d1dd4b7e01 100644 --- 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 26a92a3b5c..e59bc86620 100644 --- 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 493f9a4a5e..a54a26a854 100644 --- 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