Fix some linking problems which were preventing memcheck from starting.

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

diff --git a/coregrind/x86/state.c b/coregrind/x86/state.c
index 2cf446aacdbfe8508fb6b8e11f3ea79e08a3e91b..68bdb0d0d88a85516e766564bdbf8beaa2aab158 100644 (file)
--- a/coregrind/x86/state.c
+++ b/coregrind/x86/state.c
@@ -251,6 +251,7 @@ UInt VGA_(get_thread_shadow_archreg) ( ThreadId tid, UInt archreg )
    vg_assert(VG_(is_valid_tid)(tid));
    tst = & VG_(threads)[tid];
 
+   if (0)
    VG_(printf)("get_thread_shadow_archreg(%d, %d)\n",
                tid, archreg);
 
@@ -270,6 +271,7 @@ UInt VGA_(get_thread_shadow_archreg) ( ThreadId tid, UInt archreg )
 /* Return the baseBlock index for the specified shadow register */
 static Int shadow_reg_index ( Int arch )
 {
+   if (0)
    VG_(printf)("shadow_reg_index(%d)\n",
                arch);
    switch (arch) {

diff --git a/include/tool.h.base b/include/tool.h.base
index d928b56f7be99396cd111b08a877401203937133..3e9a8736126463170e000dc4d09b60d887dac5d1 100644 (file)
--- a/include/tool.h.base
+++ b/include/tool.h.base
@@ -579,17 +579,17 @@ extern void VG_(cpuid) ( UInt eax,
 /* ------------------------------------------------------------------ */
 /* Accessing archregs and their shadows */
 /* ToDo: is this still needed ? */
-extern UInt VG_(get_archreg)            ( UInt archreg );
-extern UInt VG_(get_thread_archreg)     ( ThreadId tid, UInt archreg );
+extern UInt VGA_(get_archreg)            ( UInt archreg );
+extern UInt VGA_(get_thread_archreg)     ( ThreadId tid, UInt archreg );
 
-extern UInt VG_(get_shadow_archreg)     ( UInt archreg );
-extern void VG_(set_shadow_archreg)     ( UInt archreg, UInt val );
-extern void VG_(set_shadow_eflags)      ( UInt val );
-extern Addr VG_(shadow_archreg_address) ( UInt archreg );
+extern UInt VGA_(get_shadow_archreg)     ( UInt archreg );
+extern void VGA_(set_shadow_archreg)     ( UInt archreg, UInt val );
 
-extern UInt VG_(get_thread_shadow_archreg) ( ThreadId tid, UInt archreg );
-extern void VG_(set_thread_shadow_archreg) ( ThreadId tid, UInt archreg,
-                                             UInt val );
+extern Addr VGA_(shadow_archreg_address) ( UInt archreg );
+
+extern UInt VGA_(get_thread_shadow_archreg) ( ThreadId tid, UInt archreg );
+extern void VGA_(set_thread_shadow_archreg) ( ThreadId tid, UInt archreg,
+                                              UInt val );
 
 /* ToDo: FIX */
 /* This is the Intel register encoding -- integer regs. */

diff --git a/memcheck/mc_main.c b/memcheck/mc_main.c
index a3f78bd783488b7e422f5493be4b4edb506648dc..fedc4fe2cfa6ba783a7cc5ba538ebb955b23db98 100644 (file)
--- a/memcheck/mc_main.c
+++ b/memcheck/mc_main.c
@@ -760,12 +760,12 @@ static void mc_post_regs_write_init ( void )
 
 static void mc_post_reg_write(ThreadId tid, UInt reg)
 {
-   VG_(set_thread_shadow_archreg)( tid, reg, VGM_WORD_VALID );
+   VGA_(set_thread_shadow_archreg)( tid, reg, VGM_WORD_VALID );
 }
 
 static void mc_post_reg_write_clientcall(ThreadId tid, UInt reg, Addr f )
 {
-   VG_(set_thread_shadow_archreg)( tid, reg, VGM_WORD_VALID );
+   VGA_(set_thread_shadow_archreg)( tid, reg, VGM_WORD_VALID );
 }
 
 static void mc_pre_reg_read(CorePart part, ThreadId tid, Char* s, UInt reg,
@@ -783,7 +783,7 @@ static void mc_pre_reg_read(CorePart part, ThreadId tid, Char* s, UInt reg,
    default: VG_(tool_panic)("Unhandled size in mc_pre_reg_read");
    }
 
-   if (VGM_WORD_VALID != (mask & VG_(get_thread_shadow_archreg)( tid, reg )) )
+   if (VGM_WORD_VALID != (mask & VGA_(get_thread_shadow_archreg)( tid, reg )) )
       MAC_(record_param_error) ( tid, 0, /*isReg*/True, /*isUnaddr*/False, s );
 }