src/cpu/sparc/vm/sparc.ad

*** 557,570 ****
      int entry_offset = InstanceKlass::vtable_start_offset() + vtable_index*vtableEntry::size();
      int v_off = entry_offset*wordSize + vtableEntry::method_offset_in_bytes();
      int klass_load_size;
      if (UseCompressedKlassPointers) {
        assert(Universe::heap() != NULL, "java heap should be initialized");
!       if (Universe::narrow_klass_base() == NULL)
!         klass_load_size = 2*BytesPerInstWord; // see MacroAssembler::load_klass()
!       else
!         klass_load_size = 3*BytesPerInstWord;
      } else {
        klass_load_size = 1*BytesPerInstWord;
      }
      if (Assembler::is_simm13(v_off)) {
        return klass_load_size +
--- 557,567 ----
      int entry_offset = InstanceKlass::vtable_start_offset() + vtable_index*vtableEntry::size();
      int v_off = entry_offset*wordSize + vtableEntry::method_offset_in_bytes();
      int klass_load_size;
      if (UseCompressedKlassPointers) {
        assert(Universe::heap() != NULL, "java heap should be initialized");
!       klass_load_size = MacroAssembler::instr_size_for_decode_klass_not_null() + 1*BytesPerInstWord;
      } else {
        klass_load_size = 1*BytesPerInstWord;
      }
      if (Assembler::is_simm13(v_off)) {
        return klass_load_size +
*** 1661,1673 ****
    st->print_cr("\nUEP:");
  #ifdef    _LP64
    if (UseCompressedKlassPointers) {
      assert(Universe::heap() != NULL, "java heap should be initialized");
      st->print_cr("\tLDUW   [R_O0 + oopDesc::klass_offset_in_bytes],R_G5\t! Inline cache check - compressed klass");
      st->print_cr("\tSLL    R_G5,3,R_G5");
!     if (Universe::narrow_klass_base() != NULL)
        st->print_cr("\tADD    R_G5,R_G6_heap_base,R_G5");
    } else {
      st->print_cr("\tLDX    [R_O0 + oopDesc::klass_offset_in_bytes],R_G5\t! Inline cache check");
    }
    st->print_cr("\tCMP    R_G5,R_G3" );
    st->print   ("\tTne    xcc,R_G0+ST_RESERVED_FOR_USER_0+2");
--- 1658,1673 ----
    st->print_cr("\nUEP:");
  #ifdef    _LP64
    if (UseCompressedKlassPointers) {
      assert(Universe::heap() != NULL, "java heap should be initialized");
      st->print_cr("\tLDUW   [R_O0 + oopDesc::klass_offset_in_bytes],R_G5\t! Inline cache check - compressed klass");
+     st->print_cr("\tSET    Universe::narrow_klass_base,R_G6_heap_base");
+     if (Universe::narrow_klass_shift() != 0) {
        st->print_cr("\tSLL    R_G5,3,R_G5");
!     }
      st->print_cr("\tADD    R_G5,R_G6_heap_base,R_G5");
+     st->print_cr("\tSET    Universe::narrow_ptrs_base,R_G6_heap_base");
    } else {
      st->print_cr("\tLDX    [R_O0 + oopDesc::klass_offset_in_bytes],R_G5\t! Inline cache check");
    }
    st->print_cr("\tCMP    R_G5,R_G3" );
    st->print   ("\tTne    xcc,R_G0+ST_RESERVED_FOR_USER_0+2");
*** 2561,2574 ****
        int off = __ offset();
        __ load_klass(O0, G3_scratch);
        int klass_load_size;
        if (UseCompressedKlassPointers) {
          assert(Universe::heap() != NULL, "java heap should be initialized");
!         if (Universe::narrow_klass_base() == NULL)
!           klass_load_size = 2*BytesPerInstWord;
!         else
!           klass_load_size = 3*BytesPerInstWord;
        } else {
          klass_load_size = 1*BytesPerInstWord;
        }
        int entry_offset = InstanceKlass::vtable_start_offset() + vtable_index*vtableEntry::size();
        int v_off = entry_offset*wordSize + vtableEntry::method_offset_in_bytes();
--- 2561,2571 ----
        int off = __ offset();
        __ load_klass(O0, G3_scratch);
        int klass_load_size;
        if (UseCompressedKlassPointers) {
          assert(Universe::heap() != NULL, "java heap should be initialized");
!         klass_load_size = MacroAssembler::instr_size_for_decode_klass_not_null() + 1*BytesPerInstWord;
        } else {
          klass_load_size = 1*BytesPerInstWord;
        }
        int entry_offset = InstanceKlass::vtable_start_offset() + vtable_index*vtableEntry::size();
        int v_off = entry_offset*wordSize + vtableEntry::method_offset_in_bytes();