Arch-abstraction step: renamed "vg_include.h" as "core.h".

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

diff --git a/auxprogs/valgrind-listener.c b/auxprogs/valgrind-listener.c
index d835043b8cddf3aa83645c912cedb7578d10baeb..1ab139cfe3654fa11c6534ca4ac451e1dcf856df 100644 (file)
--- a/auxprogs/valgrind-listener.c
+++ b/auxprogs/valgrind-listener.c
@@ -46,7 +46,7 @@
 
 
 /* For VG_CLO_DEFAULT_LOGPORT and VG_BUGS_TO. */
-#include "vg_include.h"
+#include "core.h"
 
 
 /*---------------------------------------------------------------*/

diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index b8696479afa4e98d586f1535a82eb7f02eabd426..14a6c2082a89263a10e427d480643fa37e672dab 100644 (file)
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -139,9 +139,9 @@ vg_inject_so_LDFLAGS = \
        -Wl,-z,initfirst
 
 noinst_HEADERS = \
+       core.h                  \
        ume.h                   \
        ume_arch.h              \
-        vg_include.h            \
         vg_constants.h          \
        vg_symtab2.h            \
         vg_unistd.h             \

diff --git a/coregrind/vg_include.h b/coregrind/core.h
similarity index 100%
rename from coregrind/vg_include.h
rename to coregrind/core.h

diff --git a/coregrind/demangle/cp-demangle.c b/coregrind/demangle/cp-demangle.c
index 78dfa2eecf579da56fe70c2f6ff749ba346dce2d..4bd37481f9b91578e8488a665ce60790e73069f1 100644 (file)
--- a/coregrind/demangle/cp-demangle.c
+++ b/coregrind/demangle/cp-demangle.c
@@ -40,7 +40,7 @@
 #include <string.h>
 #endif*/
 
-#include "vg_include.h"
+#include "core.h"
 #include "ansidecl.h"
 #include "dyn-string.h"
 #include "demangle.h"

diff --git a/coregrind/demangle/cplus-dem.c b/coregrind/demangle/cplus-dem.c
index 0daf833780093a7e3abc0c8fcf4f0dca103e8977..311b84fb955d69eb17d32da956d9c60e7c21963e 100644 (file)
--- a/coregrind/demangle/cplus-dem.c
+++ b/coregrind/demangle/cplus-dem.c
@@ -37,7 +37,7 @@ Boston, MA 02111-1307, USA.  */
 #endif
 
 #include "safe-ctype.h"
-#include "vg_include.h"
+#include "core.h"
 
 /*#include <sys/types.h>
 #include <string.h>

diff --git a/coregrind/demangle/dyn-string.c b/coregrind/demangle/dyn-string.c
index 6d83a416a34b55c855d295ea4e9e3969a1cc8b59..96a2f7dba9cab87cba42751b808262b115b67b26 100644 (file)
--- a/coregrind/demangle/dyn-string.c
+++ b/coregrind/demangle/dyn-string.c
@@ -31,7 +31,7 @@ Boston, MA 02111-1307, USA.  */
 #include <stdlib.h>
 #endif*/
 
-#include "vg_include.h"
+#include "core.h"
 #include "ansidecl.h"
 #include "dyn-string.h"
 

diff --git a/coregrind/gen_toolint.pl b/coregrind/gen_toolint.pl
index 674d16d215abe4875c10b85202d23576f3907275..bc02cbe1a5d76cbc81febf15729017bdd6feff14 100644 (file)
--- a/coregrind/gen_toolint.pl
+++ b/coregrind/gen_toolint.pl
@@ -69,7 +69,7 @@ sub getargtypes(@) {
 
 # Different output modes
 if ($output eq "callwrap") {
-    $include = "vg_include.h";
+    $include = "core.h";
     $generate = sub ($$$@) {
        my ($pfx, $ret, $func, @args) = @_;
        my $args = join ", ", @args;
@@ -79,7 +79,7 @@ if ($output eq "callwrap") {
        print "}\n";
     }
 } elsif ($output eq "proto") {
-    $include = "vg_include.h";
+    $include = "core.h";
     $generate = sub ($$$@) {
        my ($pfx, $ret, $func, @args) = @_;
        my $args = join ', ', @args;
@@ -95,7 +95,7 @@ if ($output eq "callwrap") {
        print "$ret $pfxmap{$pfx}($func)($args);\n";
     }
 } elsif ($output eq "missingfuncs") {
-    $include = "vg_include.h";
+    $include = "core.h";
     $generate = sub ($$$@) {
        my ($pfx, $ret, $func, @args) = @_;
        my $args = join ", ", @args;
@@ -109,7 +109,7 @@ if ($output eq "callwrap") {
     };
     $indent = "   ";
 } elsif ($output eq "struct") {
-    $include = "vg_include.h";
+    $include = "core.h";
     $pre = sub () {
        print "typedef struct {\n";
     };

diff --git a/coregrind/stage1.c b/coregrind/stage1.c
index 9ec46639f586b438091d41b692ec2452e7774c65..25c046b662e19aeb83510cf2f762481d2eb11a31 100644 (file)
--- a/coregrind/stage1.c
+++ b/coregrind/stage1.c
@@ -40,7 +40,7 @@
 #include <errno.h>
 #include <sys/resource.h>
 
-#include "vg_include.h"
+#include "core.h"
 
 #include "ume.h"
 #include "ume_arch.h"

diff --git a/coregrind/ume.c b/coregrind/ume.c
index 735904d227bc9ed750dfd61bd31a303ba8b1e26f..1c2519364691e9de323a4c797f76762cc49dee02 100644 (file)
--- a/coregrind/ume.c
+++ b/coregrind/ume.c
@@ -32,7 +32,7 @@
 #define _GNU_SOURCE
 #define _FILE_OFFSET_BITS 64
 
-#include "vg_include.h"
+#include "core.h"
 
 #include <stddef.h>
 #include <sys/mman.h>
@@ -48,7 +48,6 @@
 #include <assert.h>
 
 #include "ume.h"
-#include "vg_include.h"
 
 struct elfinfo
 {

diff --git a/coregrind/vg_default.c b/coregrind/vg_default.c
index 2bb6b03c62673aeb1edaf60a1fb668fa160cd690..ed425e24b1478f618625cf1679a8e3034c952921 100644 (file)
--- a/coregrind/vg_default.c
+++ b/coregrind/vg_default.c
@@ -31,7 +31,7 @@
 */
 
 
-#include "vg_include.h"
+#include "core.h"
 
 /* ---------------------------------------------------------------------
    Error messages (for malformed tools)

diff --git a/coregrind/vg_demangle.c b/coregrind/vg_demangle.c
index 49a1047e42b524d0813aab0ecea438d89e3bbf76..f5696aa1dd830d77d1b6d95b77a8c3b30e5a720c 100644 (file)
--- a/coregrind/vg_demangle.c
+++ b/coregrind/vg_demangle.c
@@ -29,7 +29,7 @@
    The GNU General Public License is contained in the file COPYING.
 */
 
-#include "vg_include.h"
+#include "core.h"
 #include "demangle.h"
 
 #define ADD_TO_RESULT(zzstr,zzn)                   \

diff --git a/coregrind/vg_dummy_profile.c b/coregrind/vg_dummy_profile.c
index 8514347a2c4c16c6e51bca8b3ecbaa721494283c..a44133e1ca096e61e0bf49d528f47f6e941b3855 100644 (file)
--- a/coregrind/vg_dummy_profile.c
+++ b/coregrind/vg_dummy_profile.c
@@ -30,7 +30,7 @@
    The GNU General Public License is contained in the file COPYING.
 */
 
-#include "vg_include.h"
+#include "core.h"
 
 static void vgp_die(void)
 {

diff --git a/coregrind/vg_dwarf.c b/coregrind/vg_dwarf.c
index 38d11553698c49bf3c5fb098e2a456a3504f712f..aff343f8d1273c2db0eb6abb37d3222ca5e20d14 100644 (file)
--- a/coregrind/vg_dwarf.c
+++ b/coregrind/vg_dwarf.c
@@ -27,7 +27,7 @@
    The GNU General Public License is contained in the file COPYING.
 */
 
-#include "vg_include.h"
+#include "core.h"
 #include "vg_symtab2.h"
 
 

diff --git a/coregrind/vg_errcontext.c b/coregrind/vg_errcontext.c
index 53e94a4f19402e671cb6416f6bf420be8efbbb49..d53f71205288105cacdcd79f1742ed838daaa96b 100644 (file)
--- a/coregrind/vg_errcontext.c
+++ b/coregrind/vg_errcontext.c
@@ -28,7 +28,7 @@
    The GNU General Public License is contained in the file COPYING.
 */
 
-#include "vg_include.h"
+#include "core.h"
 
 /*------------------------------------------------------------*/
 /*--- Globals                                              ---*/

diff --git a/coregrind/vg_execontext.c b/coregrind/vg_execontext.c
index 7dd56c3b15f125229787702654ad3a50f9b45f13..d4e87a82eb830078fa107e5c8cb6058b02ddbf4f 100644 (file)
--- a/coregrind/vg_execontext.c
+++ b/coregrind/vg_execontext.c
@@ -29,7 +29,7 @@
    The GNU General Public License is contained in the file COPYING.
 */
 
-#include "vg_include.h"
+#include "core.h"
 
 
 /*------------------------------------------------------------*/

diff --git a/coregrind/vg_from_ucode.c b/coregrind/vg_from_ucode.c
index fbb2a7c68c7e69ecd4eeff2732f1e6b69024bf3f..1391423da0dcd66e8d3aabd48b7c2d8f1799457d 100644 (file)
--- a/coregrind/vg_from_ucode.c
+++ b/coregrind/vg_from_ucode.c
@@ -29,7 +29,7 @@
    The GNU General Public License is contained in the file COPYING.
 */
 
-#include "vg_include.h"
+#include "core.h"
 
 
 /*------------------------------------------------------------*/

diff --git a/coregrind/vg_hashtable.c b/coregrind/vg_hashtable.c
index f1966cd3066994a0b2ecaed6273ecd8352ccdea8..8b19cf73a88a8f383a703f6795639ca7a6e3e87e 100644 (file)
--- a/coregrind/vg_hashtable.c
+++ b/coregrind/vg_hashtable.c
@@ -28,7 +28,7 @@
    The GNU General Public License is contained in the file COPYING.
 */
 
-#include "vg_include.h"
+#include "core.h"
 
 /*--------------------------------------------------------------------*/
 /*--- Declarations                                                 ---*/

diff --git a/coregrind/vg_ldt.c b/coregrind/vg_ldt.c
index ba9b245bfe8305ea00b0e0a824c125837336e23e..45b4c4c388bf4a42ace50a6ed1516bf776563aae 100644 (file)
--- a/coregrind/vg_ldt.c
+++ b/coregrind/vg_ldt.c
@@ -83,7 +83,7 @@
    am not sure what is and isn't allowed in user-mode.
 */
 
-#include "vg_include.h"
+#include "core.h"
 /* Allocate and deallocate LDTs for threads. */
 
 /* Create an LDT.  If the parent_ldt is NULL, zero out the

diff --git a/coregrind/vg_libpthread.c b/coregrind/vg_libpthread.c
index cc7bbd82a3b6eaedf7dd197e551dc471219af970..4aa252d4ae61b952bcee70dceddc614fa6ca81e7 100644 (file)
--- a/coregrind/vg_libpthread.c
+++ b/coregrind/vg_libpthread.c
@@ -53,7 +53,7 @@
 */
 
 #include "valgrind.h"    /* For the request-passing mechanism */
-#include "vg_include.h"  /* For the VG_USERREQ__* constants */
+#include "core.h"        /* For the VG_USERREQ__* constants */
 
 #define __USE_UNIX98
 #include <sys/types.h>

diff --git a/coregrind/vg_main.c b/coregrind/vg_main.c
index 70b8dfb680a08cab22e71184890b2784768d6f0d..c7b81549bf1e44869898b072e96c428fc015a3d0 100644 (file)
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -30,7 +30,7 @@
 
 #define _FILE_OFFSET_BITS 64
 
-#include "vg_include.h"
+#include "core.h"
 #include "ume.h"
 #include "ume_arch.h"
 #include "ume_archdefs.h"
@@ -1442,7 +1442,7 @@ Int    VG_(clo_verbosity)      = 1;
 Bool   VG_(clo_demangle)       = True;
 Bool   VG_(clo_trace_children) = False;
 
-/* See big comment in vg_include.h for meaning of these three.
+/* See big comment in core.h for meaning of these three.
    fd is initially stdout, for --help, but gets moved to stderr by default
    immediately afterwards. */
 VgLogTo VG_(clo_log_to)        = VgLogTo_Fd;

diff --git a/coregrind/vg_malloc2.c b/coregrind/vg_malloc2.c
index 06e8fd1228c2dec2832128b5aff8848b541b74b7..a6d8832e784572a277a3c1632dd119014068d4e5 100644 (file)
--- a/coregrind/vg_malloc2.c
+++ b/coregrind/vg_malloc2.c
@@ -30,7 +30,7 @@
 */
 
 
-#include "vg_include.h"
+#include "core.h"
 
 //#define DEBUG_MALLOC      // turn on heavyweight debugging machinery
 //#define VERBOSE_MALLOC    // make verbose, esp. in debugging machinery

diff --git a/coregrind/vg_memory.c b/coregrind/vg_memory.c
index d1a10c0715b459f16f8f419c67f68e156d2679b4..588297ed161d77406f99cdcf555ff38839fa4f24 100644 (file)
--- a/coregrind/vg_memory.c
+++ b/coregrind/vg_memory.c
@@ -30,7 +30,7 @@
    The GNU General Public License is contained in the file COPYING.
 */
 
-#include "vg_include.h"
+#include "core.h"
 
 #include <stddef.h>
 

diff --git a/coregrind/vg_messages.c b/coregrind/vg_messages.c
index c7b35d109b0f8888dd81242b1e87c128302bc431..1d2d1df389b95457e6c95c317e5b38e1d496e3e2 100644 (file)
--- a/coregrind/vg_messages.c
+++ b/coregrind/vg_messages.c
@@ -30,7 +30,7 @@
 */
 
 
-#include "vg_include.h"
+#include "core.h"
 
 #include <time.h>
 #include <sys/time.h>

diff --git a/coregrind/vg_mylibc.c b/coregrind/vg_mylibc.c
index 3dd68df87e88fe85909f993ef2dec81f8539147b..0b70234aed52c8f1e03dd32d70a44213c21c6ce7 100644 (file)
--- a/coregrind/vg_mylibc.c
+++ b/coregrind/vg_mylibc.c
@@ -30,7 +30,7 @@
    The GNU General Public License is contained in the file COPYING.
 */
 
-#include "vg_include.h"
+#include "core.h"
 
 /* ---------------------------------------------------------------------
    Wrappers around system calls, and other stuff, to do with signals.

diff --git a/coregrind/vg_needs.c b/coregrind/vg_needs.c
index 9de43c7633fcde8485379f8228e7971684f77497..b85abb79329ecfa0fc0c74e25636c10c1fce538d 100644 (file)
--- a/coregrind/vg_needs.c
+++ b/coregrind/vg_needs.c
@@ -29,7 +29,7 @@
    The GNU General Public License is contained in the file COPYING.
 */
 
-#include "vg_include.h"
+#include "core.h"
 
 
 /* ---------------------------------------------------------------------

diff --git a/coregrind/vg_procselfmaps.c b/coregrind/vg_procselfmaps.c
index 356eca78a95d94aa2bd6781f904f9972850835dd..02d2c8c992241fee6d29f80bc610b4599200138c 100644 (file)
--- a/coregrind/vg_procselfmaps.c
+++ b/coregrind/vg_procselfmaps.c
@@ -30,7 +30,7 @@
 */
 
 
-#include "vg_include.h"
+#include "core.h"
 
 
 /* static ... to keep it out of the stack frame. */

diff --git a/coregrind/vg_proxylwp.c b/coregrind/vg_proxylwp.c
index 831469b069c6cb619c370192c223ce1d1f0eeafe..57625e94edf2a88aa4bd2c9dcc15851df6e7fb29 100644 (file)
--- a/coregrind/vg_proxylwp.c
+++ b/coregrind/vg_proxylwp.c
@@ -29,7 +29,7 @@
 */
 
 
-#include "vg_include.h"
+#include "core.h"
 
 /* We need our own copy of VG_(do_syscall)() to handle a special
    race-condition.  If we've got signals unblocked, and we take a

diff --git a/coregrind/vg_scheduler.c b/coregrind/vg_scheduler.c
index ceede65ee39d3eff0ac9ecb55579a7d786a725ef..68948971463f5914e2dfa0433946ce75fb6c73eb 100644 (file)
--- a/coregrind/vg_scheduler.c
+++ b/coregrind/vg_scheduler.c
@@ -30,7 +30,7 @@
 
 #include "valgrind.h" /* for VG_USERREQ__RUNNING_ON_VALGRIND and
                              VG_USERREQ__DISCARD_TRANSLATIONS, and others */
-#include "vg_include.h"
+#include "core.h"
 
 
 /* ---------------------------------------------------------------------

diff --git a/coregrind/vg_signals.c b/coregrind/vg_signals.c
index 41c2b89b8e51ae14823d58db9570ee61ce4d19c8..1fb60eaf737a49b00ccc0b950103721b31aa0760 100644 (file)
--- a/coregrind/vg_signals.c
+++ b/coregrind/vg_signals.c
@@ -74,7 +74,7 @@
    appropriate proxy LWP.
  */
 
-#include "vg_include.h"
+#include "core.h"
 #include <stddef.h>            /* OK, no library dependencies */
 
 /* Define to give more sanity checking for signals. */

diff --git a/coregrind/vg_skiplist.c b/coregrind/vg_skiplist.c
index fac7b7c0afad6e21d03fe1d305269e686355d39c..a02fb65d0a4f918379635b1aee64641a0e6088bf 100644 (file)
--- a/coregrind/vg_skiplist.c
+++ b/coregrind/vg_skiplist.c
@@ -82,7 +82,7 @@
    won't be accidentally used.
  */
 
-#include "vg_include.h"
+#include "core.h"
 
 #include <stdlib.h>
 

diff --git a/coregrind/vg_stabs.c b/coregrind/vg_stabs.c
index 59bc7e5fed7b0ba3912fd1a6cbaea601825408ac..05303aef30c6796633299eeea4dc5cf02a6f9617 100644 (file)
--- a/coregrind/vg_stabs.c
+++ b/coregrind/vg_stabs.c
@@ -27,7 +27,7 @@
    The GNU General Public License is contained in the file COPYING.
 */
 
-#include "vg_include.h"
+#include "core.h"
 #include "vg_symtab2.h"
 
 #include <a.out.h>        /* stabs defns                    */

diff --git a/coregrind/vg_symtab2.c b/coregrind/vg_symtab2.c
index ea2f0a3d329bf6dfad6c3134f402761cdd24f093..2759f991a28dbd00ca87ca1d44852e3682c71986 100644 (file)
--- a/coregrind/vg_symtab2.c
+++ b/coregrind/vg_symtab2.c
@@ -28,7 +28,7 @@
    The GNU General Public License is contained in the file COPYING.
 */
 
-#include "vg_include.h"
+#include "core.h"
 #include "vg_symtypes.h"
 #include "vg_symtab2.h"
 

diff --git a/coregrind/vg_symtypes.c b/coregrind/vg_symtypes.c
index e697c92d88237b7aaf5150c87819a6ae167ba3df..2018a3b48ebf0d66cac4d5a19503a344949ccd8d 100644 (file)
--- a/coregrind/vg_symtypes.c
+++ b/coregrind/vg_symtypes.c
@@ -27,7 +27,7 @@
    The GNU General Public License is contained in the file COPYING.
 */
 
-#include "vg_include.h"
+#include "core.h"
 #include "vg_symtypes.h"
 
 typedef enum {

diff --git a/coregrind/vg_syscalls.c b/coregrind/vg_syscalls.c
index caded6f2818fe88f0f3608a8f4fc8bb919e0c5d3..9c836bb66751e1e21b8c1a1b9146464e44caf3e1 100644 (file)
--- a/coregrind/vg_syscalls.c
+++ b/coregrind/vg_syscalls.c
@@ -28,7 +28,7 @@
    The GNU General Public License is contained in the file COPYING.
 */
 
-#include "vg_include.h"
+#include "core.h"
 
 /* vg_unsafe.h should NOT be included into any file except this
    one. */

diff --git a/coregrind/vg_to_ucode.c b/coregrind/vg_to_ucode.c
index 63d2c63118cb9d9478fb20c73cab13921baba410..c4832ae6aa3462c32c41464143441c1e3586451e 100644 (file)
--- a/coregrind/vg_to_ucode.c
+++ b/coregrind/vg_to_ucode.c
@@ -29,7 +29,7 @@
    The GNU General Public License is contained in the file COPYING.
 */
 
-#include "vg_include.h"
+#include "core.h"
 
 
 /*------------------------------------------------------------*/

diff --git a/coregrind/vg_translate.c b/coregrind/vg_translate.c
index 3659820110b946f26ad2d4fe887c9ae71a817df6..688db25c833712ec0fe5d928edc474cc983ac1e4 100644 (file)
--- a/coregrind/vg_translate.c
+++ b/coregrind/vg_translate.c
@@ -29,7 +29,7 @@
    The GNU General Public License is contained in the file COPYING.
 */
 
-#include "vg_include.h"
+#include "core.h"
 
 /*------------------------------------------------------------*/
 /*--- Renamings of frequently-used global functions.       ---*/

diff --git a/coregrind/vg_transtab.c b/coregrind/vg_transtab.c
index 41f535660c2d80246977231410f8eefda53b5ad1..24d550044c8b58b57d5cccf995bc700638b7f796 100644 (file)
--- a/coregrind/vg_transtab.c
+++ b/coregrind/vg_transtab.c
@@ -29,7 +29,7 @@
    The GNU General Public License is contained in the file COPYING.
 */
 
-#include "vg_include.h"
+#include "core.h"
 #include <stddef.h>
 
 /* #define DEBUG_TRANSTAB */