From: Julian Seward <jseward@acm.org>
Date: Fri, 25 Jan 2013 09:03:32 +0000 (+0000)
Subject: Fix some HReg/UInt mixups, spotted by Florian.
X-Git-Tag: svn/VALGRIND_3_9_0^2~134
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed6b8b89c0264b5620216d2861fd0f2716a07d14;p=thirdparty%2Fvalgrind.git

Fix some HReg/UInt mixups, spotted by Florian.


git-svn-id: svn://svn.valgrind.org/vex/trunk@2660
---

diff --git a/VEX/priv/host_arm_defs.c b/VEX/priv/host_arm_defs.c
index e9272e4b3d..9328375f54 100644
--- a/VEX/priv/host_arm_defs.c
+++ b/VEX/priv/host_arm_defs.c
@@ -3032,7 +3032,7 @@ Int emit_ARMInstr ( /*MB_MOD*/Bool* is_profInc,
          UInt SBZ    = 0;
          instr |= XXXXX___(X1110, (1 & (subopc >> 3)),
                            ((subopc << 1) & 0xF) | 1,
-                           i->ARMin.CmpOrTst.argL, SBZ );
+                           iregNo(i->ARMin.CmpOrTst.argL), SBZ );
          *p++ = instr;
          goto done;
       }
@@ -3041,7 +3041,8 @@ Int emit_ARMInstr ( /*MB_MOD*/Bool* is_profInc,
          UInt subopc = X1101; /* MOV */
          UInt SBZ    = 0;
          instr |= XXXXX___(X1110, (1 & (subopc >> 3)),
-                           (subopc << 1) & 0xF, SBZ, i->ARMin.Mov.dst);
+                           (subopc << 1) & 0xF, SBZ,
+                           iregNo(i->ARMin.Mov.dst));
          *p++ = instr;
          goto done;
       }
@@ -3346,7 +3347,8 @@ Int emit_ARMInstr ( /*MB_MOD*/Bool* is_profInc,
          UInt subopc = X1101; /* MOV */
          UInt SBZ    = 0;
          instr |= XXXXX___(i->ARMin.CMov.cond, (1 & (subopc >> 3)),
-                           (subopc << 1) & 0xF, SBZ, i->ARMin.CMov.dst);
+                           (subopc << 1) & 0xF, SBZ,
+                           iregNo(i->ARMin.CMov.dst));
          *p++ = instr;
          goto done;
       }