From: Julian Seward <jseward@acm.org>
Date: Thu, 28 Oct 2004 22:16:49 +0000 (+0000)
Subject: Misc hacks to get Addrcheck working.
X-Git-Tag: svn/VALGRIND_3_0_1^2~884
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=59333a0588cd66ca7d1ec1d0844b3a558ef279c0;p=thirdparty%2Fvalgrind.git

Misc hacks to get Addrcheck working.


git-svn-id: svn://svn.valgrind.org/vex/trunk@450
---

diff --git a/VEX/head20041019/coregrind/core.h b/VEX/head20041019/coregrind/core.h
index 6d4f0ade39..b794302819 100644
--- a/VEX/head20041019/coregrind/core.h
+++ b/VEX/head20041019/coregrind/core.h
@@ -1336,7 +1336,7 @@ extern Bool     VG_(seg_overlaps)(const Segment *s, Addr ptr, UInt size);
 extern void VG_(pad_address_space)(void);
 extern void VG_(unpad_address_space)(void);
 
-extern REGPARM(1)
+extern //REGPARM(1)
        void VG_(unknown_esp_update) ( Addr new_ESP );
 
 /* ---------------------------------------------------------------------
@@ -1481,7 +1481,7 @@ extern void VG_(missing_tool_func) ( const Char* fn );
    startup time, are given values denoting offsets into baseBlock.
    These offsets are in *words* from the start of baseBlock. */
 
-#define VG_BASEBLOCK_WORDS 157
+#define VG_BASEBLOCK_WORDS 200 // 157
 
 extern UInt VG_(baseBlock)[VG_BASEBLOCK_WORDS];
 
diff --git a/VEX/head20041019/coregrind/toolfuncs.def b/VEX/head20041019/coregrind/toolfuncs.def
index 7965f562d8..d4b61b878a 100644
--- a/VEX/head20041019/coregrind/toolfuncs.def
+++ b/VEX/head20041019/coregrind/toolfuncs.def
@@ -24,7 +24,7 @@ void,		post_clo_init
 ## always results in the same output, because basic blocks can be
 ## retranslated.  Unless you're doing something really strange...
 ## 'orig_addr' is the address of the first instruction in the block.
-IRBB*,	instrument,	IRBB* bb
+IRBB*,	instrument,	IRBB* bb,   VexGuestLayoutInfo* layout
 
 ## Return the address of a helper function name inserted by this tool
 ## into the IR.  Return 0 if not found.
diff --git a/VEX/head20041019/coregrind/valgrind.vs b/VEX/head20041019/coregrind/valgrind.vs
index d787f6ae90..f964bab73f 100644
--- a/VEX/head20041019/coregrind/valgrind.vs
+++ b/VEX/head20041019/coregrind/valgrind.vs
@@ -5,13 +5,11 @@ VALGRIND_2.1 {
 		vgProf_*;
                 vgOff_*;
                 vgArch_*;
-		ppIRBB;
-		emptyIR*;
-		*IRTypeEnv;
 		*IRExpr*;
 		*IRStmt*;
 		*IRBB*;
 		*IRDirty*;
+		*IRType*;
 		LibVEX_Alloc;
 
 	local:
diff --git a/VEX/head20041019/coregrind/vg_memory.c b/VEX/head20041019/coregrind/vg_memory.c
index 637dc6f0a7..31d328f309 100644
--- a/VEX/head20041019/coregrind/vg_memory.c
+++ b/VEX/head20041019/coregrind/vg_memory.c
@@ -674,7 +674,7 @@ Segment *VG_(next_segment)(Segment *s)
 /* This function gets called if new_mem_stack and/or die_mem_stack are
    tracked by the tool, and one of the specialised cases (eg. new_mem_stack_4)
    isn't used in preference */
-REGPARM(1)
+//REGPARM(1)
 void VG_(unknown_esp_update)(Addr new_SP)
 {
    Addr old_SP = BASEBLOCK_STACK_PTR; //VG_(get_archreg)(R_STACK_PTR);
diff --git a/VEX/head20041019/include/tool.h.base b/VEX/head20041019/include/tool.h.base
index ef704f4618..a1370a1ad4 100644
--- a/VEX/head20041019/include/tool.h.base
+++ b/VEX/head20041019/include/tool.h.base
@@ -38,6 +38,7 @@
 
 #include "../../../pub/libvex_basictypes.h"
 #include "../../../pub/libvex_ir.h"
+#include "../../../pub/libvex.h"
 
 
 /*====================================================================*/