|
From: <sv...@va...> - 2012-01-18 14:05:12
|
Author: florian
Date: 2012-01-18 14:00:31 +0000 (Wed, 18 Jan 2012)
New Revision: 2240
Log:
Revert r2238. In 64-bit mode the length is in bits 0:63.
Not sure what I was thinking then....
Modified:
trunk/priv/guest_s390_toIR.c
trunk/priv/host_generic_reg_alloc2.c
Modified: trunk/priv/guest_s390_toIR.c
===================================================================
--- trunk/priv/guest_s390_toIR.c 2012-01-16 17:25:55 UTC (rev 2239)
+++ trunk/priv/guest_s390_toIR.c 2012-01-18 14:00:31 UTC (rev 2240)
@@ -10858,7 +10858,7 @@
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);
Modified: trunk/priv/host_generic_reg_alloc2.c
===================================================================
--- trunk/priv/host_generic_reg_alloc2.c 2012-01-16 17:25:55 UTC (rev 2239)
+++ trunk/priv/host_generic_reg_alloc2.c 2012-01-18 14:00:31 UTC (rev 2240)
@@ -624,6 +624,14 @@
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 @@
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 @@
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)
|