From: Julian Seward <jseward@acm.org>
Date: Fri, 20 Apr 2012 15:41:33 +0000 (+0000)
Subject: Avoid word-size warnings when this is compiled on 64 bit platforms.
X-Git-Tag: svn/VALGRIND_3_8_1^2~182^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8fb1902e1efa4ce36ca398c0123192e664a4b47;p=thirdparty%2Fvalgrind.git

Avoid word-size warnings when this is compiled on 64 bit platforms.


git-svn-id: svn://svn.valgrind.org/vex/branches/TCHAIN@2293
---

diff --git a/VEX/priv/host_arm_defs.c b/VEX/priv/host_arm_defs.c
index dc1860bc6e..755699ebe5 100644
--- a/VEX/priv/host_arm_defs.c
+++ b/VEX/priv/host_arm_defs.c
@@ -4512,7 +4512,7 @@ VexInvalRange chainXDirect_ARM ( void* place_to_chain,
         E1 2F FF 3C
    */
    UInt* p = (UInt*)place_to_chain;
-   vassert(0 == (3 & (UInt)p));
+   vassert(0 == (3 & (HWord)p));
    vassert(is_imm32_to_iregNo_EXACTLY2(
               p, /*r*/12, (UInt)Ptr_to_ULong(disp_cp_chain_me_EXPECTED)));
    vassert(p[2] == 0xE12FFF3C);
@@ -4548,7 +4548,7 @@ VexInvalRange unchainXDirect_ARM ( void* place_to_unchain,
         E1 2F FF 1C
    */
    UInt* p = (UInt*)place_to_unchain;
-   vassert(0 == (3 & (UInt)p));
+   vassert(0 == (3 & (HWord)p));
    vassert(is_imm32_to_iregNo_EXACTLY2(
               p, /*r*/12, (UInt)Ptr_to_ULong(place_to_jump_to_EXPECTED)));
    vassert(p[2] == 0xE12FFF1C);
@@ -4575,7 +4575,7 @@ VexInvalRange patchProfInc_ARM ( void*  place_to_patch,
 {
    vassert(sizeof(ULong*) == 4);
    UInt* p = (UInt*)place_to_patch;
-   vassert(0 == (3 & (UInt)p));
+   vassert(0 == (3 & (HWord)p));
    vassert(is_imm32_to_iregNo_EXACTLY2(p, /*r*/12, 0x65556555));
    vassert(p[2] == 0xE59CB000);
    vassert(p[3] == 0xE29BB001);