|
From: <sv...@va...> - 2010-08-22 18:47:38
|
Author: sewardj
Date: 2010-08-22 19:47:30 +0100 (Sun, 22 Aug 2010)
New Revision: 2018
Log:
Fix some compiler complaints when building on 64-bit platforms.
Modified:
trunk/priv/guest_arm_toIR.c
Modified: trunk/priv/guest_arm_toIR.c
===================================================================
--- trunk/priv/guest_arm_toIR.c 2010-08-22 18:24:51 UTC (rev 2017)
+++ trunk/priv/guest_arm_toIR.c 2010-08-22 18:47:30 UTC (rev 2018)
@@ -11847,7 +11847,7 @@
insn. So, have a look at them. */
forceZ = True; /* assume no 'it' insn found, till we do */
- UShort* hwp = (UShort*)pc;
+ UShort* hwp = (UShort*)(HWord)pc;
Int i;
for (i = -1; i >= -9; i--) {
/* We're in the same page. (True, but commented out due
@@ -12863,7 +12863,7 @@
UInt rD = INSN0(10,8);
UInt imm8 = INSN0(7,0);
putIRegT(rD, binop(Iop_Add32,
- binop(Iop_And32, getIRegT(15), mkU32(~3UL)),
+ binop(Iop_And32, getIRegT(15), mkU32(~3U)),
mkU32(imm8 * 4)),
condT);
DIP("add r%u, pc, #%u\n", rD, imm8 * 4);
@@ -12923,7 +12923,7 @@
// now uncond
assign(ea, binop(Iop_Add32,
- binop(Iop_And32, getIRegT(15), mkU32(~3UL)),
+ binop(Iop_And32, getIRegT(15), mkU32(~3U)),
mkU32(imm8 * 4)));
put_ITSTATE(old_itstate); // backout
putIRegT(rD, loadLE(Ity_I32, mkexpr(ea)),
@@ -13058,7 +13058,7 @@
IRTemp oldRn = newTemp(Ity_I32);
IRTemp base = newTemp(Ity_I32);
assign(oldRn, getIRegT(rN));
- assign(base, binop(Iop_And32, mkexpr(oldRn), mkU32(~3UL)));
+ assign(base, binop(Iop_And32, mkexpr(oldRn), mkU32(~3U)));
for (i = 0; i < 8; i++) {
if (0 == (list & (1 << i)))
continue;
@@ -13112,7 +13112,7 @@
IRTemp oldRn = newTemp(Ity_I32);
IRTemp base = newTemp(Ity_I32);
assign(oldRn, getIRegT(rN));
- assign(base, binop(Iop_And32, mkexpr(oldRn), mkU32(~3UL)));
+ assign(base, binop(Iop_And32, mkexpr(oldRn), mkU32(~3U)));
for (i = 0; i < 8; i++) {
if (0 == (list & (1 << i)))
continue;
@@ -14865,7 +14865,7 @@
UInt imm32 = (INSN0(10,10) << 11)
| (INSN1(14,12) << 8) | INSN1(7,0);
putIRegT(rD, binop(Iop_Add32,
- binop(Iop_And32, getIRegT(15), mkU32(~3UL)),
+ binop(Iop_And32, getIRegT(15), mkU32(~3U)),
mkU32(imm32)),
condT);
DIP("add r%u, pc, #%u\n", rD, imm32);
@@ -14917,7 +14917,7 @@
UInt imm32 = (INSN0(10,10) << 11)
| (INSN1(14,12) << 8) | INSN1(7,0);
putIRegT(rD, binop(Iop_Sub32,
- binop(Iop_And32, getIRegT(15), mkU32(~3UL)),
+ binop(Iop_And32, getIRegT(15), mkU32(~3U)),
mkU32(imm32)),
condT);
DIP("sub r%u, pc, #%u\n", rD, imm32);
|