From: Julian Seward <jseward@acm.org>
Date: Mon, 14 Feb 2011 13:53:18 +0000 (+0000)
Subject: Merge from trunk, r2086 (Get rid of unintended complex integral constant)
X-Git-Tag: svn/VALGRIND_3_6_1^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba198717499b3c69c2721d048752654ec47a8305;p=thirdparty%2Fvalgrind.git

Merge from trunk, r2086 (Get rid of unintended complex integral constant)


git-svn-id: svn://svn.valgrind.org/vex/branches/VEX_3_6_BRANCH@2100
---

diff --git a/VEX/priv/guest_arm_toIR.c b/VEX/priv/guest_arm_toIR.c
index c1f92111f6..da65d8c3ec 100644
--- a/VEX/priv/guest_arm_toIR.c
+++ b/VEX/priv/guest_arm_toIR.c
@@ -10985,7 +10985,7 @@ static Bool decode_CP10_CP11_instruction (
       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);