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 1d889ac32c60cc490428345f1ba3305da854f520..b6e8e5997e12e0fc03cf735f9f2ca669a5034858 100644 (file)
--- 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