From: Florian Krohm <florian@eich-krohm.de>
Date: Sun, 22 Apr 2012 02:51:27 +0000 (+0000)
Subject: (post-tchain-merge cleanup) Stop s390x asserting on illegal insns.
X-Git-Tag: svn/VALGRIND_3_8_1^2~172
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=206c6387bea5a7f66634f235ac91bb3a3a117bc8;p=thirdparty%2Fvalgrind.git

(post-tchain-merge cleanup) Stop s390x asserting on illegal insns.
none/tests/s390x/op_exception will now pass.


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

diff --git a/VEX/priv/guest_s390_toIR.c b/VEX/priv/guest_s390_toIR.c
index 26190f0b4a..fd5431631c 100644
--- a/VEX/priv/guest_s390_toIR.c
+++ b/VEX/priv/guest_s390_toIR.c
@@ -13609,7 +13609,7 @@ disInstr_S390_WRK(UChar *insn)
          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_curr_instr));
+      put_IA(mkaddr_expr(guest_IA_next_instr));
 
       dres.whatNext    = Dis_StopHere;
       dres.jk_StopHere = Ijk_NoDecode;
diff --git a/VEX/priv/host_s390_isel.c b/VEX/priv/host_s390_isel.c
index 35226f9963..3cebc4e277 100644
--- a/VEX/priv/host_s390_isel.c
+++ b/VEX/priv/host_s390_isel.c
@@ -2485,6 +2485,7 @@ s390_isel_stmt(ISelEnv *env, IRStmt *stmt)
 
       /* Case: assisted transfer to arbitrary address */
       switch (stmt->Ist.Exit.jk) {
+      case Ijk_NoDecode:
       case Ijk_TInval:
       case Ijk_Sys_syscall:
       case Ijk_ClientReq:
@@ -2597,6 +2598,7 @@ iselNext(ISelEnv *env, IRExpr *next, IRJumpKind jk, int offsIP)
 
    /* Case: some other kind of transfer to any address */
    switch (jk) {
+   case Ijk_NoDecode:
    case Ijk_TInval:
    case Ijk_Sys_syscall:
    case Ijk_ClientReq: