Special-case the TR insn for EX.

With this change all insns of the SS format with a length field
are special-cased for EX.

git-svn-id: svn://svn.valgrind.org/vex/trunk@2322

diff --git a/VEX/priv/guest_s390_toIR.c b/VEX/priv/guest_s390_toIR.c
index 01d8b3e5b399357d3d3291eec731c40e02e59fb9..ed5d4dc561cba05ffe795efea133ceb8f9a4e50f 100644 (file)
--- a/VEX/priv/guest_s390_toIR.c
+++ b/VEX/priv/guest_s390_toIR.c
@@ -8834,6 +8834,28 @@ s390_irgen_MVC_EX(IRTemp length, IRTemp start1, IRTemp start2)
    put_counter_dw0(mkU64(0));
 }
 
+static void
+s390_irgen_TR_EX(IRTemp length, IRTemp start1, IRTemp start2)
+{
+   IRTemp op = newTemp(Ity_I8);
+   IRTemp op1 = newTemp(Ity_I8);
+   IRTemp result = newTemp(Ity_I64);
+   IRTemp counter = newTemp(Ity_I64);
+
+   assign(counter, get_counter_dw0());
+
+   assign(op, load(Ity_I8, binop(Iop_Add64, mkexpr(start1), mkexpr(counter))));
+
+   assign(result, binop(Iop_Add64, unop(Iop_8Uto64, mkexpr(op)), mkexpr(start2)));
+
+   assign(op1, load(Ity_I8, mkexpr(result)));
+   store(binop(Iop_Add64, mkexpr(start1), mkexpr(counter)), mkexpr(op1));
+
+   put_counter_dw0(binop(Iop_Add64, mkexpr(counter), mkU64(1)));
+   if_condition_goto(binop(Iop_CmpNE64, mkexpr(counter), mkexpr(length)),
+                     guest_IA_curr_instr);
+   put_counter_dw0(mkU64(0));
+}
 
 
 static void
@@ -8943,6 +8965,11 @@ s390_irgen_EX(UChar r1, IRTemp addr2)
       s390_irgen_EX_SS(r1, addr2, s390_irgen_NC_EX, 32);
       return "nc via ex";
 
+   case 0xdc00000000000000ULL:
+      /* special case TR */
+      s390_irgen_EX_SS(r1, addr2, s390_irgen_TR_EX, 64);
+      return "tr via ex";
+
    default:
    {
       /* everything else will get a self checking prefix that also checks the
@@ -11074,25 +11101,10 @@ s390_irgen_TRTT(UChar m3, UChar r1, UChar r2)
 static HChar *
 s390_irgen_TR(UChar length, IRTemp start1, IRTemp start2)
 {
-   IRTemp op = newTemp(Ity_I8);
-   IRTemp op1 = newTemp(Ity_I8);
-   IRTemp result = newTemp(Ity_I64);
-   IRTemp counter = newTemp(Ity_I64);
-
-   assign(counter, get_counter_dw0());
-
-   assign(op, load(Ity_I8, binop(Iop_Add64, mkexpr(start1), mkexpr(counter))));
-
-   assign(result, binop(Iop_Add64, unop(Iop_8Uto64, mkexpr(op)), mkexpr(start2)));
-
-   assign(op1, load(Ity_I8, mkexpr(result)));
-   store(binop(Iop_Add64, mkexpr(start1), mkexpr(counter)), mkexpr(op1));
-
-   put_counter_dw0(binop(Iop_Add64, mkexpr(counter), mkU64(1)));
-   if_condition_goto(binop(Iop_CmpNE64, mkexpr(counter), mkU64(length)),
-                     guest_IA_curr_instr);
+   IRTemp len = newTemp(Ity_I64);
 
-   put_counter_dw0(mkU64(0));
+   assign(len, mkU64(length));
+   s390_irgen_TR_EX(len, start1, start2);
    dummy_put_IA();
 
    return "tr";