Revert r2238. In 64-bit mode the length is in bits 0:63.

Not sure what I was thinking then....

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

diff --git a/VEX/priv/guest_s390_toIR.c b/VEX/priv/guest_s390_toIR.c
index 32118e373775a39abb5c65e9c7bbb840874c0ed3..e7b64b486d0af59bbb997d824a291ca643a4d64b 100644 (file)
--- a/VEX/priv/guest_s390_toIR.c
+++ b/VEX/priv/guest_s390_toIR.c
@@ -10858,7 +10858,7 @@ s390_irgen_TROO(UChar m3, UChar r1, UChar r2)
    assign(src_addr, get_gpr_dw0(r2));
    assign(des_addr, get_gpr_dw0(r1));
    assign(tab_addr, get_gpr_dw0(1));
-   assign(src_len, unop(Iop_32Uto64, get_gpr_w1(r1+1)));
+   assign(src_len, get_gpr_dw0(r1+1));
    assign(test_byte, get_gpr_b7(0));
 
    IRTemp op = newTemp(Ity_I8);

diff --git a/VEX/priv/host_generic_reg_alloc2.c b/VEX/priv/host_generic_reg_alloc2.c
index 5052d9df8f0a2ee82fe10b24bdc5735732fb0ed5..e9a096a100c18d1a57f661f4464871f559b0930b 100644 (file)
--- a/VEX/priv/host_generic_reg_alloc2.c
+++ b/VEX/priv/host_generic_reg_alloc2.c
@@ -624,6 +624,14 @@ HInstrArray* doRegisterAllocation (
                break;
          if (k == n_available_real_regs) 
             continue; /* not found -- ignore. */
+
+#if 0
+available_real_regs[k] is involved in a real live range
+  and since:
+      rreg_state[j].rreg          = available_real_regs[j];
+#endif
+      rreg_state[k].has_hlrs = True;
+
          flush = False;
          switch (reg_usage.mode[j]) {
             case HRmWrite:
@@ -721,7 +729,7 @@ HInstrArray* doRegisterAllocation (
       any HLRs, since ones with HLRs may need to be spilled around
       their HLRs.  Correctness of final assignment is unaffected by
       this mechanism -- it is only an optimisation. */
-
+#if 0
    for (j = 0; j < rreg_lrs_used; j++) {
       rreg = rreg_lrs_la[j].rreg;
       vassert(!hregIsVirtual(rreg));
@@ -733,6 +741,7 @@ HInstrArray* doRegisterAllocation (
       vassert(k < n_rregs); /* else rreg was not found in rreg_state?! */
       rreg_state[k].has_hlrs = True;
    }
+#endif
    if (0) {
       for (j = 0; j < n_rregs; j++) {
          if (!rreg_state[j].has_hlrs)