From: Philippe Waroquiers <philippe.waroquiers@skynet.be>
Date: Thu, 17 Jul 2014 21:23:09 +0000 (+0000)
Subject: Simplify the code to get the function entry + avoids too many casts
X-Git-Tag: svn/VALGRIND_3_10_0~264
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2e2cea2af6712ab806df506309e7d1c8ca8637aa;p=thirdparty%2Fvalgrind.git

Simplify the code to get the function entry + avoids too many casts


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

diff --git a/coregrind/vg_preloaded.c b/coregrind/vg_preloaded.c
index eaf6272778..fe8b50a330 100644
--- a/coregrind/vg_preloaded.c
+++ b/coregrind/vg_preloaded.c
@@ -86,9 +86,10 @@ void * VG_NOTIFY_ON_LOAD(ifunc_wrapper) (void)
 #if defined(VGP_ppc64_linux)
    /* ppc64 uses function descriptors, so get the actual function entry
       address for the client request, but return the function descriptor
-      from this function. */
-    UWord *descr = (UWord*)(void*)result;
-    fnentry = (Addr)(void*)(descr[0]);
+      from this function. 
+      result points to the function descriptor, which starts with the
+      function entry. */
+    fnentry = *(Addr*)result;
 #else
     fnentry = result;
 #endif