commit 0a4f4bb3e2a7a0119989ee0dc8fdffaab2f1b160
author sewardj <sewardj@8f6e269a-dfd6-0310-a8e1-e2731360e62c> Sat Mar 15 08:14:06 2014 +0000
committer sewardj <sewardj@8f6e269a-dfd6-0310-a8e1-e2731360e62c> Sat Mar 15 08:14:06 2014 +0000
tree f0bc10c61b40feef7d104a31e3df8eea04e64bb5
parent 505a27d213124d1c6275513cee739ad822747407

Correctly handle add(hi) when the destination register is the PC.
Fixes #332037.


git-svn-id: svn://svn.valgrind.org/vex/trunk@2838 8f6e269a-dfd6-0310-a8e1-e2731360e62c

priv/guest_arm_toIR.c

diff --git a/priv/guest_arm_toIR.c b/priv/guest_arm_toIR.c
index f3bc80d..86fa039 100644
--- a/priv/guest_arm_toIR.c
+++ b/priv/guest_arm_toIR.c
@@ -18203,9 +18203,9 @@
             condT = IRTemp_INVALID;
             // now uncond
             /* non-interworking branch */
-            irsb->next = binop(Iop_Or32, mkexpr(res), mkU32(1));
-            irsb->jumpkind = Ijk_Boring;
-            dres.whatNext = Dis_StopHere;
+            llPutIReg(15, binop(Iop_Or32, mkexpr(res), mkU32(1)));
+            dres.jk_StopHere = Ijk_Boring;
+            dres.whatNext    = Dis_StopHere;
          }
          DIP("add(hi) r%u, r%u\n", rD, rM);
          goto decode_success;