src/cpu/sparc/vm/sparc.ad

*** 599,610 ****
      assert(vtable_index == Method::invalid_vtable_index, "correct sentinel value");
      return (NativeMovConstReg::instruction_size +
             NativeCall::instruction_size);  // sethi; setlo; call; delay slot
    } else {
      assert(!UseInlineCaches, "expect vtable calls only if not using ICs");
!     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 (UseCompressedClassPointers) {
        assert(Universe::heap() != NULL, "java heap should be initialized");
        klass_load_size = MacroAssembler::instr_size_for_decode_klass_not_null() + 1*BytesPerInstWord;
      } else {
--- 599,610 ----
      assert(vtable_index == Method::invalid_vtable_index, "correct sentinel value");
      return (NativeMovConstReg::instruction_size +
             NativeCall::instruction_size);  // sethi; setlo; call; delay slot
    } else {
      assert(!UseInlineCaches, "expect vtable calls only if not using ICs");
!     int entry_offset = in_bytes(InstanceKlass::vtable_start_offset()) + vtable_index*vtableEntry::size_in_bytes();
!     int v_off = entry_offset + vtableEntry::method_offset_in_bytes();
      int klass_load_size;
      if (UseCompressedClassPointers) {
        assert(Universe::heap() != NULL, "java heap should be initialized");
        klass_load_size = MacroAssembler::instr_size_for_decode_klass_not_null() + 1*BytesPerInstWord;
      } else {
*** 2656,2667 ****
          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();
        if (Assembler::is_simm13(v_off)) {
          __ ld_ptr(G3, v_off, G5_method);
        } else {
          // Generate 2 instructions
          __ Assembler::sethi(v_off & ~0x3ff, G5_method);
--- 2656,2667 ----
          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 = in_bytes(InstanceKlass::vtable_start_offset()) + vtable_index*vtableEntry::size_in_bytes();
!       int v_off = entry_offset + vtableEntry::method_offset_in_bytes();
        if (Assembler::is_simm13(v_off)) {
          __ ld_ptr(G3, v_off, G5_method);
        } else {
          // Generate 2 instructions
          __ Assembler::sethi(v_off & ~0x3ff, G5_method);