src/cpu/sparc/vm/macroAssembler_sparc.cpp

*** 2186,2200 ****
      intf_klass = intf_2;
      did_save = true;
    }
  
    // Compute start of first itableOffsetEntry (which is at the end of the vtable)
!   int vtable_base = in_bytes(InstanceKlass::vtable_start_offset());
    int scan_step   = itableOffsetEntry::size() * wordSize;
    int vte_size    = vtableEntry::size_in_bytes();
  
!   lduw(recv_klass, in_bytes(InstanceKlass::vtable_length_offset()), scan_temp);
    // %%% We should store the aligned, prescaled offset in the klassoop.
    // Then the next several instructions would fold away.
  
    int round_to_unit = ((HeapWordsPerLong > 1) ? BytesPerLong : 0);
    int itb_offset = vtable_base;
--- 2186,2200 ----
      intf_klass = intf_2;
      did_save = true;
    }
  
    // Compute start of first itableOffsetEntry (which is at the end of the vtable)
!   int vtable_base = in_bytes(Klass::vtable_start_offset());
    int scan_step   = itableOffsetEntry::size() * wordSize;
    int vte_size    = vtableEntry::size_in_bytes();
  
!   lduw(recv_klass, in_bytes(Klass::vtable_length_offset()), scan_temp);
    // %%% We should store the aligned, prescaled offset in the klassoop.
    // Then the next several instructions would fold away.
  
    int round_to_unit = ((HeapWordsPerLong > 1) ? BytesPerLong : 0);
    int itb_offset = vtable_base;
*** 2278,2288 ****
  void MacroAssembler::lookup_virtual_method(Register recv_klass,
                                             RegisterOrConstant vtable_index,
                                             Register method_result) {
    assert_different_registers(recv_klass, method_result, vtable_index.register_or_noreg());
    Register sethi_temp = method_result;
!   const int base = in_bytes(InstanceKlass::vtable_start_offset()) +
                     // method pointer offset within the vtable entry:
                     vtableEntry::method_offset_in_bytes();
    RegisterOrConstant vtable_offset = vtable_index;
    // Each of the following three lines potentially generates an instruction.
    // But the total number of address formation instructions will always be
--- 2278,2288 ----
  void MacroAssembler::lookup_virtual_method(Register recv_klass,
                                             RegisterOrConstant vtable_index,
                                             Register method_result) {
    assert_different_registers(recv_klass, method_result, vtable_index.register_or_noreg());
    Register sethi_temp = method_result;
!   const int base = in_bytes(Klass::vtable_start_offset()) +
                     // method pointer offset within the vtable entry:
                     vtableEntry::method_offset_in_bytes();
    RegisterOrConstant vtable_offset = vtable_index;
    // Each of the following three lines potentially generates an instruction.
    // But the total number of address formation instructions will always be