Upon decode failure set the guest_IA to the address of the insn that

could not be decoded (current insn). Otherwise, a wrong address will be
reported in the complaint.

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

diff --git a/VEX/priv/guest_s390_toIR.c b/VEX/priv/guest_s390_toIR.c
index a4a0562d90430e4ca3aff6730ae929d04d99e3c7..9c158649cc49013a46fe53d682f141eb1cd91a36 100644 (file)
--- a/VEX/priv/guest_s390_toIR.c
+++ b/VEX/priv/guest_s390_toIR.c
@@ -13809,8 +13809,11 @@ disInstr_S390_WRK(UChar *insn)
       /* All decode failures end up here. The decoder has already issued an
          error message.
          Tell the dispatcher that this insn cannot be decoded, and so has
-         not been executed, and (is currently) the next to be executed. */
-      put_IA(mkaddr_expr(guest_IA_next_instr));
+         not been executed, and (is currently) the next to be executed.
+         The insn address in the guest state needs to be set to 
+         guest_IA_curr_instr, otherwise the complaint will report an
+         incorrect address. */
+      put_IA(mkaddr_expr(guest_IA_curr_instr));
 
       dres.whatNext    = Dis_StopHere;
       dres.jk_StopHere = Ijk_NoDecode;