src/cpu/x86/vm/macroAssembler_x86.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 5805,5822 ****
    assert_different_registers(recv_klass, intf_klass, method_result, scan_temp);
    assert(itable_index.is_constant() || itable_index.as_register() == method_result,
           "caller must use same register for non-constant itable index as for method");
  
    // Compute start of first itableOffsetEntry (which is at the end of the vtable)
!   int vtable_base = InstanceKlass::vtable_start_offset() * wordSize;
    int itentry_off = itableMethodEntry::method_offset_in_bytes();
    int scan_step   = itableOffsetEntry::size() * wordSize;
!   int vte_size    = vtableEntry::size() * wordSize;
    Address::ScaleFactor times_vte_scale = Address::times_ptr;
    assert(vte_size == wordSize, "else adjust times_vte_scale");
  
!   movl(scan_temp, Address(recv_klass, InstanceKlass::vtable_length_offset() * wordSize));
  
    // %%% Could store the aligned, prescaled offset in the klassoop.
    lea(scan_temp, Address(recv_klass, scan_temp, times_vte_scale, vtable_base));
    if (HeapWordsPerLong > 1) {
      // Round up to align_object_offset boundary
--- 5805,5822 ----
    assert_different_registers(recv_klass, intf_klass, method_result, scan_temp);
    assert(itable_index.is_constant() || itable_index.as_register() == method_result,
           "caller must use same register for non-constant itable index as for method");
  
    // Compute start of first itableOffsetEntry (which is at the end of the vtable)
!   int vtable_base = in_bytes(InstanceKlass::vtable_start_offset());
    int itentry_off = itableMethodEntry::method_offset_in_bytes();
    int scan_step   = itableOffsetEntry::size() * wordSize;
!   int vte_size    = vtableEntry::size_in_bytes();
    Address::ScaleFactor times_vte_scale = Address::times_ptr;
    assert(vte_size == wordSize, "else adjust times_vte_scale");
  
!   movl(scan_temp, Address(recv_klass, InstanceKlass::vtable_length_offset()));
  
    // %%% Could store the aligned, prescaled offset in the klassoop.
    lea(scan_temp, Address(recv_klass, scan_temp, times_vte_scale, vtable_base));
    if (HeapWordsPerLong > 1) {
      // Round up to align_object_offset boundary
*** 5868,5878 ****
  
  // virtual method calling
  void MacroAssembler::lookup_virtual_method(Register recv_klass,
                                             RegisterOrConstant vtable_index,
                                             Register method_result) {
!   const int base = InstanceKlass::vtable_start_offset() * wordSize;
    assert(vtableEntry::size() * wordSize == wordSize, "else adjust the scaling in the code below");
    Address vtable_entry_addr(recv_klass,
                              vtable_index, Address::times_ptr,
                              base + vtableEntry::method_offset_in_bytes());
    movptr(method_result, vtable_entry_addr);
--- 5868,5878 ----
  
  // virtual method calling
  void MacroAssembler::lookup_virtual_method(Register recv_klass,
                                             RegisterOrConstant vtable_index,
                                             Register method_result) {
!   const int base = in_bytes(InstanceKlass::vtable_start_offset());
    assert(vtableEntry::size() * wordSize == wordSize, "else adjust the scaling in the code below");
    Address vtable_entry_addr(recv_klass,
                              vtable_index, Address::times_ptr,
                              base + vtableEntry::method_offset_in_bytes());
    movptr(method_result, vtable_entry_addr);