|
From: <sv...@va...> - 2011-02-14 13:53:26
|
Author: sewardj
Date: 2011-02-14 13:53:18 +0000 (Mon, 14 Feb 2011)
New Revision: 2100
Log:
Merge from trunk, r2086 (Get rid of unintended complex integral constant)
Modified:
branches/VEX_3_6_BRANCH/priv/guest_arm_toIR.c
Modified: branches/VEX_3_6_BRANCH/priv/guest_arm_toIR.c
===================================================================
--- branches/VEX_3_6_BRANCH/priv/guest_arm_toIR.c 2011-02-14 13:50:19 UTC (rev 2099)
+++ branches/VEX_3_6_BRANCH/priv/guest_arm_toIR.c 2011-02-14 13:53:18 UTC (rev 2100)
@@ -10985,7 +10985,7 @@
UInt rT = INSN(15,12);
UInt Q = INSN(21,21);
UInt size = (INSN(22,22) << 1) | INSN(5,5);
- if (rT == 15 || (isT && rT == 13) || size == 3i || (Q && (rD & 1))) {
+ if (rT == 15 || (isT && rT == 13) || size == 3 || (Q && (rD & 1))) {
/* fall through */
} else {
IRExpr* e = isT ? getIRegT(rT) : getIRegA(rT);
|