|
[Valgrind-developers] vex: r2306: (post-tchain-merge cleanup) Stop
s390x asserting on illegal insns.
From: <sv...@va...> - 2012-04-22 02:51:35
|
florian 2012-04-22 03:51:27 +0100 (Sun, 22 Apr 2012)
New Revision: 2306
Log:
(post-tchain-merge cleanup) Stop s390x asserting on illegal insns.
none/tests/s390x/op_exception will now pass.
Modified files:
trunk/priv/guest_s390_toIR.c
trunk/priv/host_s390_isel.c
Modified: trunk/priv/host_s390_isel.c (+2 -0)
===================================================================
--- trunk/priv/host_s390_isel.c 2012-04-21 17:06:04 +01:00 (rev 2305)
+++ trunk/priv/host_s390_isel.c 2012-04-22 03:51:27 +01:00 (rev 2306)
@@ -2485,6 +2485,7 @@
/* 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 @@
/* Case: some other kind of transfer to any address */
switch (jk) {
+ case Ijk_NoDecode:
case Ijk_TInval:
case Ijk_Sys_syscall:
case Ijk_ClientReq:
Modified: trunk/priv/guest_s390_toIR.c (+1 -1)
===================================================================
--- trunk/priv/guest_s390_toIR.c 2012-04-21 17:06:04 +01:00 (rev 2305)
+++ trunk/priv/guest_s390_toIR.c 2012-04-22 03:51:27 +01:00 (rev 2306)
@@ -13609,7 +13609,7 @@
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;
|