From: Julian Seward <jseward@acm.org>
Date: Tue, 13 May 2014 15:54:14 +0000 (+0000)
Subject: Thumb encoding: fix assertion failure caused by
X-Git-Tag: svn/VALGRIND_3_10_1^2~110
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01994c366067e480b5314f4fd2eaf566e83c8db3;p=thirdparty%2Fvalgrind.git

Thumb encoding: fix assertion failure caused by
"ldr.w pc, [reg, #imm]".  Fixes #333428.  (dimitry@google.com)



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

diff --git a/VEX/priv/guest_arm_toIR.c b/VEX/priv/guest_arm_toIR.c
index c28642e97a..e72ef3d3af 100644
--- a/VEX/priv/guest_arm_toIR.c
+++ b/VEX/priv/guest_arm_toIR.c
@@ -20416,9 +20416,8 @@ DisResult disInstr_THUMB_WRK (
                vassert(rT == 15);
                vassert(condT == IRTemp_INVALID); /* due to check above */
                llPutIReg(15, mkexpr(newRt));
-               irsb->next = mkexpr(newRt);
-               irsb->jumpkind = Ijk_Boring;  /* or _Ret ? */
-               dres.whatNext  = Dis_StopHere;
+               dres.jk_StopHere = Ijk_Boring;
+               dres.whatNext    = Dis_StopHere;
             }
          }