changeset 474:c748a6624c8b

meth: transfer last asm change to sparc
author jrose
date Wed, 11 Jul 2012 17:29:28 -0700
parents a3668184eaae
children 7b29f3a51eea
files meth-lazy-7023639.patch
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/meth-lazy-7023639.patch	Wed Jul 11 17:18:25 2012 -0700
+++ b/meth-lazy-7023639.patch	Wed Jul 11 17:29:28 2012 -0700
@@ -899,7 +899,7 @@
    Label L_ok, L_bad;
    BLOCK_COMMENT("verify_klass {");
    __ verify_oop(obj_reg);
-@@ -498,538 +91,419 @@
+@@ -498,538 +91,421 @@
    __ set(ExternalAddress(klass_addr), temp2_reg);
    __ ld_ptr(Address(temp2_reg, 0), temp2_reg);
    __ cmp_and_brx_short(temp_reg, temp2_reg, Assembler::equal, Assembler::pt, L_ok);
@@ -1229,6 +1229,8 @@
 +  }
 +  assert_different_registers(temp1, temp2, temp3, temp4, receiver_reg);
 +  assert_different_registers(temp1, temp2, temp3, temp4, member_reg);
++  if (!for_compiler_entry)
++    assert_different_registers(temp1, temp2, temp3, temp4, O5_savedSP);  // don't trash lastSP
  
 -static RegisterOrConstant adjust_SP_and_Gargs_down_by_slots(MacroAssembler* _masm,
 -                                                            RegisterOrConstant arg_slots,
@@ -1794,7 +1796,7 @@
  
    if (Verbose) {
      // dumping last frame with frame::describe
-@@ -1090,6 +564,7 @@
+@@ -1090,6 +566,7 @@
  
      // mark saved_sp, if seems valid (may not be valid for some adapters)
      intptr_t *unbiased_sp = (intptr_t *)(STACK_BIAS+(uintptr_t)saved_sp);
@@ -1802,7 +1804,7 @@
      if ((unbiased_sp >= dump_sp - UNREASONABLE_STACK_MOVE) && (unbiased_sp < dump_fp)) {
        values.describe(-1, unbiased_sp, "*saved_sp+STACK_BIAS");
      }
-@@ -1097,10 +572,13 @@
+@@ -1097,10 +574,13 @@
      // Note: the unextended_sp may not be correct
      tty->print_cr("  stack layout:");
      values.print(p);
@@ -1820,7 +1822,7 @@
    }
  }
  
-@@ -1143,1260 +621,3 @@
+@@ -1143,1260 +623,3 @@
    BLOCK_COMMENT("} trace_method_handle");
  }
  #endif // PRODUCT