]> git.ipfire.org Git - thirdparty/valgrind.git/commitdiff
Avoid word-size warnings when this is compiled on 64 bit platforms.
authorJulian Seward <jseward@acm.org>
Fri, 20 Apr 2012 15:41:33 +0000 (15:41 +0000)
committerJulian Seward <jseward@acm.org>
Fri, 20 Apr 2012 15:41:33 +0000 (15:41 +0000)
git-svn-id: svn://svn.valgrind.org/vex/branches/TCHAIN@2293

VEX/priv/host_arm_defs.c

index dc1860bc6ecf6443a6d4e3030209869e8f1e570b..755699ebe5a7c4a0e860f9248ef0c272c6b4e463 100644 (file)
@@ -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);