From: Julian Seward <jseward@acm.org>
Date: Wed, 20 Oct 2004 01:12:08 +0000 (+0000)
Subject: find_helper: ensure function addresses are unsignedly widened to Addr64
X-Git-Tag: svn/VALGRIND_3_0_1^2~959
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b049169b05edf4f9ebf428292f8799f34b8ca31;p=thirdparty%2Fvalgrind.git

find_helper: ensure function addresses are unsignedly widened to Addr64


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

diff --git a/VEX/priv/guest-x86/ghelpers.c b/VEX/priv/guest-x86/ghelpers.c
index 3427691d63..66e63b5a93 100644
--- a/VEX/priv/guest-x86/ghelpers.c
+++ b/VEX/priv/guest-x86/ghelpers.c
@@ -590,17 +590,17 @@ static UInt calculate_eflags_c ( UInt cc_op, UInt cc_src, UInt cc_dst )
 Addr64 x86guest_findhelper ( Char* function_name )
 {
    if (vex_streq(function_name, "calculate_condition"))
-      return (Addr64)(& calculate_condition);
+      return (Addr64)(Addr32)(& calculate_condition);
    if (vex_streq(function_name, "calculate_eflags_c"))
-      return (Addr64)(& calculate_eflags_c);
+      return (Addr64)(Addr32)(& calculate_eflags_c);
    if (vex_streq(function_name, "calculate_eflags_all"))
-      return (Addr64)(& calculate_eflags_all);
+      return (Addr64)(Addr32)(& calculate_eflags_all);
    if (vex_streq(function_name, "calculate_FXAM"))
-      return (Addr64)(& calculate_FXAM);
+      return (Addr64)(Addr32)(& calculate_FXAM);
    if (vex_streq(function_name, "storeF80le"))
-      return (Addr64)(& storeF80le);
+      return (Addr64)(Addr32)(& storeF80le);
    if (vex_streq(function_name, "loadF80le"))
-      return (Addr64)(& loadF80le);
+      return (Addr64)(Addr32)(& loadF80le);
    vex_printf("\nx86 guest: can't find helper: %s\n", function_name);
    vpanic("x86guest_findhelper");
 }