Rename a couple of inconsistently-named helper functions.

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

diff --git a/VEX/priv/guest-amd64/gdefs.h b/VEX/priv/guest-amd64/gdefs.h
index 2ac553c6d9abba231efd021d586f40070630ff3f..6c4fabc47f4e42fc0650ebb2d47daa8d780a2a5f 100644 (file)
--- a/VEX/priv/guest-amd64/gdefs.h
+++ b/VEX/priv/guest-amd64/gdefs.h
@@ -139,11 +139,11 @@ extern ULong amd64g_calculate_sse_pmovmskb ( ULong w64hi, ULong w64lo );
 
 /* --- DIRTY HELPERS --- */
 
-extern ULong amd64g_loadF80le  ( ULong/*addr*/ );
+extern ULong amd64g_dirtyhelper_loadF80le  ( ULong/*addr*/ );
 
-extern void  amd64g_storeF80le ( ULong/*addr*/, ULong/*data*/ );
+extern void  amd64g_dirtyhelper_storeF80le ( ULong/*addr*/, ULong/*data*/ );
 
-extern void amd64g_dirtyhelper_CPUID ( VexGuestAMD64State* st );
+extern void  amd64g_dirtyhelper_CPUID ( VexGuestAMD64State* st );
 
 extern ULong amd64g_dirtyhelper_RDTSC ( void );
 

diff --git a/VEX/priv/guest-amd64/ghelpers.c b/VEX/priv/guest-amd64/ghelpers.c
index ee8688b4c4d87f94ec6d09b73241dc139e9ccd7a..d4532be74feabf19a2a67f90a6044f4024bb73eb 100644 (file)
--- a/VEX/priv/guest-amd64/ghelpers.c
+++ b/VEX/priv/guest-amd64/ghelpers.c
@@ -1340,7 +1340,7 @@ void amd64g_dirtyhelper_FINIT ( VexGuestAMD64State* gst )
 
 /* CALLED FROM GENERATED CODE */
 /* DIRTY HELPER (reads guest memory) */
-ULong amd64g_loadF80le ( ULong addrU )
+ULong amd64g_dirtyhelper_loadF80le ( ULong addrU )
 {
    ULong f64;
    convert_f80le_to_f64le ( (UChar*)ULong_to_Ptr(addrU), (UChar*)&f64 );
@@ -1349,7 +1349,7 @@ ULong amd64g_loadF80le ( ULong addrU )
 
 /* CALLED FROM GENERATED CODE */
 /* DIRTY HELPER (writes guest memory) */
-void amd64g_storeF80le ( ULong addrU, ULong f64 )
+void amd64g_dirtyhelper_storeF80le ( ULong addrU, ULong f64 )
 {
    convert_f64le_to_f80le( (UChar*)&f64, (UChar*)ULong_to_Ptr(addrU) );
 }

diff --git a/VEX/priv/guest-amd64/toIR.c b/VEX/priv/guest-amd64/toIR.c
index 0a27bef0890d3e0190a343f083561b82133e5f23..6a9eb08ddf7159a295bcd7a8df3defa4a180125e 100644 (file)
--- a/VEX/priv/guest-amd64/toIR.c
+++ b/VEX/priv/guest-amd64/toIR.c
@@ -4967,7 +4967,8 @@ ULong dis_FPU ( /*OUT*/Bool* decode_ok,
                IRDirty* d = unsafeIRDirty_1_N ( 
                                val, 
                                0/*regparms*/, 
-                               "amd64g_loadF80le", &amd64g_loadF80le, 
+                               "amd64g_dirtyhelper_loadF80le", 
+                               &amd64g_dirtyhelper_loadF80le, 
                                args 
                             );
                /* declare that we're reading memory */
@@ -4994,7 +4995,8 @@ ULong dis_FPU ( /*OUT*/Bool* decode_ok,
 
                IRDirty* d = unsafeIRDirty_0_N ( 
                                0/*regparms*/, 
-                               "amd64g_storeF80le", &amd64g_storeF80le,
+                               "amd64g_dirtyhelper_storeF80le", 
+                               &amd64g_dirtyhelper_storeF80le,
                                args 
                             );
                /* declare we're writing memory */