src/cpu/x86/vm/templateInterpreter_x86_64.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 2003, 2011, 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) 2003, 2012, 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.
*** 520,530 ****
      __ movl(rax, access_flags);
      __ testl(rax, JVM_ACC_STATIC);
      // get receiver (assume this is frequent case)
      __ movptr(rax, Address(r14, Interpreter::local_offset_in_bytes(0)));
      __ jcc(Assembler::zero, done);
!     __ movptr(rax, Address(rbx, methodOopDesc::constants_offset()));
      __ movptr(rax, Address(rax,
                             constantPoolOopDesc::pool_holder_offset_in_bytes()));
      __ movptr(rax, Address(rax, mirror_offset));
  
  #ifdef ASSERT
--- 520,531 ----
      __ movl(rax, access_flags);
      __ testl(rax, JVM_ACC_STATIC);
      // get receiver (assume this is frequent case)
      __ movptr(rax, Address(r14, Interpreter::local_offset_in_bytes(0)));
      __ jcc(Assembler::zero, done);
!     __ movptr(rax, Address(rbx, methodOopDesc::const_offset()));
!     __ movptr(rax, Address(rax, constMethodOopDesc::constants_offset()));
      __ movptr(rax, Address(rax,
                             constantPoolOopDesc::pool_holder_offset_in_bytes()));
      __ movptr(rax, Address(rax, mirror_offset));
  
  #ifdef ASSERT
*** 577,587 ****
      __ push(rdx);      // set the mdp (method data pointer)
    } else {
      __ push(0);
    }
  
!   __ movptr(rdx, Address(rbx, methodOopDesc::constants_offset()));
    __ movptr(rdx, Address(rdx, constantPoolOopDesc::cache_offset_in_bytes()));
    __ push(rdx); // set constant pool cache
    __ push(r14); // set locals pointer
    if (native_call) {
      __ push(0); // no bcp
--- 578,589 ----
      __ push(rdx);      // set the mdp (method data pointer)
    } else {
      __ push(0);
    }
  
!   __ movptr(rdx, Address(rbx, methodOopDesc::const_offset()));
!   __ movptr(rdx, Address(rdx, constMethodOopDesc::constants_offset()));
    __ movptr(rdx, Address(rdx, constantPoolOopDesc::cache_offset_in_bytes()));
    __ push(rdx); // set constant pool cache
    __ push(r14); // set locals pointer
    if (native_call) {
      __ push(0); // no bcp
*** 627,639 ****
  
      // check if local 0 != NULL and read field
      __ testptr(rax, rax);
      __ jcc(Assembler::zero, slow_path);
  
-     __ movptr(rdi, Address(rbx, methodOopDesc::constants_offset()));
      // read first instruction word and extract bytecode @ 1 and index @ 2
      __ movptr(rdx, Address(rbx, methodOopDesc::const_offset()));
      __ movl(rdx, Address(rdx, constMethodOopDesc::codes_offset()));
      // Shift codes right to get the index on the right.
      // The bytecode fetched looks like <index><0xb4><0x2a>
      __ shrl(rdx, 2 * BitsPerByte);
      __ shll(rdx, exact_log2(in_words(ConstantPoolCacheEntry::size())));
--- 629,641 ----
  
      // check if local 0 != NULL and read field
      __ testptr(rax, rax);
      __ jcc(Assembler::zero, slow_path);
  
      // read first instruction word and extract bytecode @ 1 and index @ 2
      __ movptr(rdx, Address(rbx, methodOopDesc::const_offset()));
+     __ movptr(rdi, Address(rdx, constMethodOopDesc::constants_offset()));
      __ movl(rdx, Address(rdx, constMethodOopDesc::codes_offset()));
      // Shift codes right to get the index on the right.
      // The bytecode fetched looks like <index><0xb4><0x2a>
      __ shrl(rdx, 2 * BitsPerByte);
      __ shll(rdx, exact_log2(in_words(ConstantPoolCacheEntry::size())));
*** 1018,1028 ****
      const int mirror_offset = in_bytes(Klass::java_mirror_offset());
      __ movl(t, Address(method, methodOopDesc::access_flags_offset()));
      __ testl(t, JVM_ACC_STATIC);
      __ jcc(Assembler::zero, L);
      // get mirror
!     __ movptr(t, Address(method, methodOopDesc::constants_offset()));
      __ movptr(t, Address(t, constantPoolOopDesc::pool_holder_offset_in_bytes()));
      __ movptr(t, Address(t, mirror_offset));
      // copy mirror into activation frame
      __ movptr(Address(rbp, frame::interpreter_frame_oop_temp_offset * wordSize),
              t);
--- 1020,1031 ----
      const int mirror_offset = in_bytes(Klass::java_mirror_offset());
      __ movl(t, Address(method, methodOopDesc::access_flags_offset()));
      __ testl(t, JVM_ACC_STATIC);
      __ jcc(Assembler::zero, L);
      // get mirror
!     __ movptr(t, Address(method, methodOopDesc::const_offset()));
!     __ movptr(t, Address(t, constMethodOopDesc::constants_offset()));
      __ movptr(t, Address(t, constantPoolOopDesc::pool_holder_offset_in_bytes()));
      __ movptr(t, Address(t, mirror_offset));
      // copy mirror into activation frame
      __ movptr(Address(rbp, frame::interpreter_frame_oop_temp_offset * wordSize),
              t);