commit fed3ea35b9c5546928500466c1da9ab5bdb494c8
author florian <florian@8f6e269a-dfd6-0310-a8e1-e2731360e62c> Thu Jul 19 14:54:03 2012 +0000
committer florian <florian@8f6e269a-dfd6-0310-a8e1-e2731360e62c> Thu Jul 19 14:54:03 2012 +0000
tree 9a2f30463629eaf7da2451b0651451001bef9540
parent 5df0b2fb56b3b6a172a590aa52186e40986bc27c

Fix disassembly for insns using the RRF_M0RERE format.


git-svn-id: svn://svn.valgrind.org/vex/trunk@2439 8f6e269a-dfd6-0310-a8e1-e2731360e62c

priv/guest_s390_toIR.c

diff --git a/priv/guest_s390_toIR.c b/priv/guest_s390_toIR.c
index 2f017e3..2f60d47 100644
--- a/priv/guest_s390_toIR.c
+++ b/priv/guest_s390_toIR.c
@@ -1624,10 +1624,10 @@
 s390_format_RRF_M0RERE(HChar *(*irgen)(UChar m3, UChar r1, UChar r2),
                        UChar m3, UChar r1, UChar r2)
 {
-   irgen(m3, r1, r2);
+   HChar *mnm = irgen(m3, r1, r2);
 
    if (UNLIKELY(vex_traceflags & VEX_TRACE_FE))
-      s390_disasm(ENC3(MNM, GPR, GPR), m3, r1, r2);
+      s390_disasm(ENC4(MNM, GPR, GPR, UINT), mnm, r1, r2, m3);
 }
 
 static void