From: Florian Krohm <flo2030@eich-krohm.de>
Date: Wed, 4 Dec 2024 15:53:17 +0000 (+0100)
Subject: Bug 495817 - s390x: Fix disassembly for SEL[G]R and SELFHR
X-Git-Tag: VALGRIND_3_25_0~207
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c23ec25e896b06950ac4c677bfe7f2d59c666078;p=thirdparty%2Fvalgrind.git

Bug 495817 - s390x: Fix disassembly for SEL[G]R and SELFHR

The disassemblies of selr, selgr, and selfhr have their register operands
mixed up, and no extended mnemonics are used.  Fix this.
---

diff --git a/VEX/priv/guest_s390_toIR.c b/VEX/priv/guest_s390_toIR.c
index 1d889ac32..b6e8e5997 100644
--- a/VEX/priv/guest_s390_toIR.c
+++ b/VEX/priv/guest_s390_toIR.c
@@ -3186,7 +3186,7 @@ s390_format_RRF_RURR(const HChar *(*irgen)(UChar, UChar, UChar, UChar),
    const HChar *mnm = irgen(r3, m4, r1, r2);
 
    if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
-      s390_disasm(ENC5(MNM, GPR, GPR, GPR, UINT), mnm, r1, r3, r2, m4);
+      s390_disasm(ENC4(XMNM, GPR, GPR, GPR), S390_XMNM_CLS, mnm, m4, r1, r2, r3);
 }
 
 static void