From: Florian Krohm <flo2030@eich-krohm.de>
Date: Wed, 23 Apr 2025 12:49:20 +0000 (+0000)
Subject: s390x only: Clean up unused Ijk_... values
X-Git-Tag: VALGRIND_3_25_0~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b44d61f5b63f1330cbca0ffd6294991979d370e9;p=thirdparty%2Fvalgrind.git

s390x only: Clean up unused Ijk_... values

The following jump kinds were never assigned to any variable but were
checked for in various contexts:

- Ijk_MapFail
- Ijk_SigTRAP
- Ijk_SigSEGV
- Ijk_SigBUS

Tighten that up.
---

diff --git a/VEX/priv/host_s390_defs.c b/VEX/priv/host_s390_defs.c
index 3cf1cbd3a..e26ea09d4 100644
--- a/VEX/priv/host_s390_defs.c
+++ b/VEX/priv/host_s390_defs.c
@@ -7572,13 +7572,9 @@ s390_jump_kind_as_string(IRJumpKind kind)
    case Ijk_EmWarn:      return "EmWarn";
    case Ijk_EmFail:      return "EmFail";
    case Ijk_NoDecode:    return "NoDecode";
-   case Ijk_MapFail:     return "MapFail";
    case Ijk_InvalICache: return "Invalidate";
    case Ijk_NoRedir:     return "NoRedir";
-   case Ijk_SigTRAP:     return "SigTRAP";
    case Ijk_SigFPE:      return "SigFPE";
-   case Ijk_SigSEGV:     return "SigSEGV";
-   case Ijk_SigBUS:      return "SigBUS";
    case Ijk_Sys_syscall: return "Sys_syscall";
    case Ijk_Extension:   return "Extension";
    default:
@@ -11300,13 +11296,10 @@ s390_insn_xassisted_emit(UChar *buf, const s390_insn *insn,
    case Ijk_Yield:       trcval = VEX_TRC_JMP_YIELD;       break;
    case Ijk_EmWarn:      trcval = VEX_TRC_JMP_EMWARN;      break;
    case Ijk_EmFail:      trcval = VEX_TRC_JMP_EMFAIL;      break;
-   case Ijk_MapFail:     trcval = VEX_TRC_JMP_MAPFAIL;     break;
    case Ijk_NoDecode:    trcval = VEX_TRC_JMP_NODECODE;    break;
    case Ijk_InvalICache: trcval = VEX_TRC_JMP_INVALICACHE; break;
    case Ijk_NoRedir:     trcval = VEX_TRC_JMP_NOREDIR;     break;
-   case Ijk_SigTRAP:     trcval = VEX_TRC_JMP_SIGTRAP;     break;
    case Ijk_SigFPE:      trcval = VEX_TRC_JMP_SIGFPE;      break;
-   case Ijk_SigSEGV:     trcval = VEX_TRC_JMP_SIGSEGV;     break;
    case Ijk_Boring:      trcval = VEX_TRC_JMP_BORING;      break;
       /* We don't expect to see the following being assisted. */
    case Ijk_Ret:
diff --git a/VEX/priv/host_s390_isel.c b/VEX/priv/host_s390_isel.c
index 10aebf73f..2b075c930 100644
--- a/VEX/priv/host_s390_isel.c
+++ b/VEX/priv/host_s390_isel.c
@@ -5365,7 +5365,6 @@ no_memcpy_put:
       case Ijk_ClientReq:
       case Ijk_NoRedir:
       case Ijk_Yield:
-      case Ijk_SigTRAP:
       case Ijk_SigFPE: {
          HReg dst = s390_isel_int_expr(env, IRExpr_Const(stmt->Ist.Exit.dst));
          addInstr(env, s390_insn_xassisted(cond, dst, guest_IA,
@@ -5482,7 +5481,6 @@ iselNext(ISelEnv *env, IRExpr *next, IRJumpKind jk, Int offsIP)
    case Ijk_ClientReq:
    case Ijk_NoRedir:
    case Ijk_Yield:
-   case Ijk_SigTRAP:
    case Ijk_SigFPE: {
       HReg dst = s390_isel_int_expr(env, next);
       addInstr(env, s390_insn_xassisted(S390_CC_ALWAYS, dst, guest_IA, jk));