Rename a couple of inconsistently-named helper functions.

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

diff --git a/VEX/priv/guest-x86/gdefs.h b/VEX/priv/guest-x86/gdefs.h
index d1d3d29037607b865835badb1bfa9d18592e679a..310423929af7adcf751a7d893a1d8cb8cdf3af5e 100644 (file)
--- a/VEX/priv/guest-x86/gdefs.h
+++ b/VEX/priv/guest-x86/gdefs.h
@@ -137,9 +137,9 @@ extern UInt  x86g_calculate_sse_pmovmskb ( ULong w64hi, ULong w64lo );
 
 /* --- DIRTY HELPERS --- */
 
-extern ULong x86g_loadF80le  ( UInt );
+extern ULong x86g_dirtyhelper_loadF80le  ( UInt );
 
-extern void  x86g_storeF80le ( UInt, ULong );
+extern void  x86g_dirtyhelper_storeF80le ( UInt, ULong );
 
 extern void  x86g_dirtyhelper_CPUID_sse0 ( VexGuestX86State* );
 extern void  x86g_dirtyhelper_CPUID_sse1 ( VexGuestX86State* );

diff --git a/VEX/priv/guest-x86/ghelpers.c b/VEX/priv/guest-x86/ghelpers.c
index b188718b8df31249168f6c9e5f8b156f6f12c5f2..fa2323bd307d5f59d95ee525b04c185a03373265 100644 (file)
--- a/VEX/priv/guest-x86/ghelpers.c
+++ b/VEX/priv/guest-x86/ghelpers.c
@@ -1228,7 +1228,7 @@ UInt x86g_calculate_FXAM ( UInt tag, ULong dbl )
 
 /* CALLED FROM GENERATED CODE */
 /* DIRTY HELPER (reads guest memory) */
-ULong x86g_loadF80le ( UInt addrU )
+ULong x86g_dirtyhelper_loadF80le ( UInt addrU )
 {
    ULong f64;
    convert_f80le_to_f64le ( (UChar*)ULong_to_Ptr(addrU), (UChar*)&f64 );
@@ -1237,7 +1237,7 @@ ULong x86g_loadF80le ( UInt addrU )
 
 /* CALLED FROM GENERATED CODE */
 /* DIRTY HELPER (writes guest memory) */
-void x86g_storeF80le ( UInt addrU, ULong f64 )
+void x86g_dirtyhelper_storeF80le ( UInt addrU, ULong f64 )
 {
    convert_f64le_to_f80le( (UChar*)&f64, (UChar*)ULong_to_Ptr(addrU) );
 }

diff --git a/VEX/priv/guest-x86/toIR.c b/VEX/priv/guest-x86/toIR.c
index 515785dd5d685a705c601d8b9da785f21ccf267d..68b898e185409d7b7a65a1a50696d86b881ec49d 100644 (file)
--- a/VEX/priv/guest-x86/toIR.c
+++ b/VEX/priv/guest-x86/toIR.c
@@ -4152,7 +4152,8 @@ UInt dis_FPU ( Bool* decode_ok, UChar sorb, Int delta )
                IRDirty* d = unsafeIRDirty_1_N ( 
                                val, 
                                0/*regparms*/, 
-                               "x86g_loadF80le", &x86g_loadF80le, 
+                               "x86g_dirtyhelper_loadF80le", 
+                               &x86g_dirtyhelper_loadF80le, 
                                args 
                             );
                /* declare that we're reading memory */
@@ -4177,7 +4178,8 @@ UInt dis_FPU ( Bool* decode_ok, UChar sorb, Int delta )
 
                IRDirty* d = unsafeIRDirty_0_N ( 
                                0/*regparms*/, 
-                               "x86g_storeF80le", &x86g_storeF80le,
+                               "x86g_dirtyhelper_storeF80le", 
+                               &x86g_dirtyhelper_storeF80le,
                                args 
                             );
                /* declare we're writing memory */