Arch-abstraction step: renamed "vg_include.h" as "core.h".
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2643 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/auxprogs/valgrind-listener.c b/auxprogs/valgrind-listener.c
index d835043..1ab139c 100644
--- 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 b869647..14a6c20 100644
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -139,9 +139,9 @@
-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 78dfa2e..4bd3748 100644
--- 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 0daf833..311b84f 100644
--- a/coregrind/demangle/cplus-dem.c
+++ b/coregrind/demangle/cplus-dem.c
@@ -37,7 +37,7 @@
#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 6d83a41..96a2f7d 100644
--- a/coregrind/demangle/dyn-string.c
+++ b/coregrind/demangle/dyn-string.c
@@ -31,7 +31,7 @@
#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 674d16d..bc02cbe 100644
--- a/coregrind/gen_toolint.pl
+++ b/coregrind/gen_toolint.pl
@@ -69,7 +69,7 @@
# 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 @@
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 @@
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 @@
};
$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 9ec4663..25c046b 100644
--- 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 735904d..1c25193 100644
--- 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 2bb6b03..ed425e2 100644
--- 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 49a1047..f5696aa 100644
--- 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 8514347..a44133e 100644
--- 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 38d1155..aff343f 100644
--- 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 53e94a4..d53f712 100644
--- 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 7dd56c3..d4e87a8 100644
--- 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 fbb2a7c..1391423 100644
--- 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 f1966cd..8b19cf7 100644
--- 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 ba9b245..45b4c4c 100644
--- 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 cc7bbd8..4aa252d 100644
--- 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 70b8dfb..c7b8154 100644
--- 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 @@
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 06e8fd1..a6d8832 100644
--- 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 d1a10c0..588297e 100644
--- 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 c7b35d1..1d2d1df 100644
--- 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 3dd68df..0b70234 100644
--- 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 9de43c7..b85abb7 100644
--- 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 356eca7..02d2c8c 100644
--- 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 831469b..57625e9 100644
--- 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 ceede65..6894897 100644
--- 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 41c2b89..1fb60ea 100644
--- 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 fac7b7c..a02fb65 100644
--- 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 59bc7e5..05303ae 100644
--- 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 ea2f0a3..2759f99 100644
--- 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 e697c92..2018a3b 100644
--- 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 caded6f..9c836bb 100644
--- 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 63d2c63..c4832ae 100644
--- 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 3659820..688db25 100644
--- 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 41f5356..24d5500 100644
--- 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 */