|
From: <sv...@va...> - 2016-10-18 05:20:31
|
Author: sewardj
Date: Tue Oct 18 06:20:24 2016
New Revision: 3270
Log:
Merge from trunk:
3263 mips64: fix error introduced by r3262
Modified:
branches/VEX_3_12_BRANCH/ (props changed)
branches/VEX_3_12_BRANCH/priv/guest_mips_toIR.c
Modified: branches/VEX_3_12_BRANCH/priv/guest_mips_toIR.c
==============================================================================
--- branches/VEX_3_12_BRANCH/priv/guest_mips_toIR.c (original)
+++ branches/VEX_3_12_BRANCH/priv/guest_mips_toIR.c Tue Oct 18 06:20:24 2016
@@ -13538,7 +13538,7 @@
t1 = newTemp(ty);
assign(t0, binop(mode64 ? Iop_Add64 : Iop_Add32,
getIReg(rs), getIReg(rt)));
- assign(t1, binop(mode64 ? Iop_Add64 : Iop_And32,
+ assign(t1, binop(mode64 ? Iop_And64 : Iop_And32,
mkexpr(t0),
mode64 ? mkU64(0xfffffffffffffff8ULL)
: mkU32(0xfffffff8ULL)));
@@ -13577,7 +13577,7 @@
t1 = newTemp(ty);
assign(t0, binop(mode64 ? Iop_Add64 : Iop_Add32,
getIReg(rs), getIReg(rt)));
- assign(t1, binop(mode64 ? Iop_Add64 : Iop_And32,
+ assign(t1, binop(mode64 ? Iop_And64 : Iop_And32,
mkexpr(t0),
mode64 ? mkU64(0xfffffffffffffff8ULL)
: mkU32(0xfffffff8ULL)));
|