From: Julian Seward <jseward@acm.org>
Date: Mon, 17 Sep 2012 17:57:26 +0000 (+0000)
Subject: Merge from trunk, r2531 (ARM: STM<c>.W <Rn>{!}, <registers> too
X-Git-Tag: svn/VALGRIND_3_8_1^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea92abbea0fd5b7bb7a1857370816e9006f27450;p=thirdparty%2Fvalgrind.git

Merge from trunk, r2531 (ARM: STM<c>.W <Rn>{!}, <registers> too
strict, #306297)



git-svn-id: svn://svn.valgrind.org/vex/branches/VEX_3_8_BRANCH@2535
---

diff --git a/VEX/priv/guest_arm_toIR.c b/VEX/priv/guest_arm_toIR.c
index 553dee1c8a..da40d39c48 100644
--- a/VEX/priv/guest_arm_toIR.c
+++ b/VEX/priv/guest_arm_toIR.c
@@ -16399,15 +16399,6 @@ DisResult disInstr_THUMB_WRK (
          if (rN == 15)                       valid = False;
          if (popcount32(regList) < 2)        valid = False;
          if (bW == 1 && (regList & (1<<rN))) valid = False;
-         if (regList & (1<<rN)) {
-            UInt i;
-            /* if Rn is in the list, then it must be the
-               lowest numbered entry */
-            for (i = 0; i < rN; i++) {
-               if (regList & (1<<i))
-                  valid = False;
-            }
-         }
       }
 
       if (valid) {