src/cpu/sparc/vm/templateInterpreter_sparc.cpp

*** 1,7 ****
  /*
!  * Copyright (c) 1997, 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) 1997, 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.
*** 369,379 ****
      const int mirror_offset = in_bytes(Klass::java_mirror_offset());
      __ btst(JVM_ACC_STATIC, O0);
      __ br( Assembler::zero, true, Assembler::pt, done);
      __ delayed()->ld_ptr(Llocals, Interpreter::local_offset_in_bytes(0), O0); // get receiver for not-static case
  
!     __ ld_ptr( Lmethod, in_bytes(methodOopDesc::constants_offset()), O0);
      __ ld_ptr( O0, constantPoolOopDesc::pool_holder_offset_in_bytes(), O0);
  
      // lock the mirror, not the klassOop
      __ ld_ptr( O0, mirror_offset, O0);
  
--- 369,380 ----
      const int mirror_offset = in_bytes(Klass::java_mirror_offset());
      __ btst(JVM_ACC_STATIC, O0);
      __ br( Assembler::zero, true, Assembler::pt, done);
      __ delayed()->ld_ptr(Llocals, Interpreter::local_offset_in_bytes(0), O0); // get receiver for not-static case
  
!     __ ld_ptr( Lmethod, in_bytes(methodOopDesc::const_offset()), O0);
!     __ ld_ptr( O0, in_bytes(constMethodOopDesc::constants_offset()), O0);
      __ ld_ptr( O0, constantPoolOopDesc::pool_holder_offset_in_bytes(), O0);
  
      // lock the mirror, not the klassOop
      __ ld_ptr( O0, mirror_offset, O0);
  
*** 668,678 ****
      __ sll(G1_scratch, 2*BitsPerByte, G1_scratch);
      __ srl(G1_scratch, 2*BitsPerByte - exact_log2(in_words(
                        ConstantPoolCacheEntry::size()) * BytesPerWord), G1_scratch);
  
      // get constant pool cache
!     __ ld_ptr(G5_method, methodOopDesc::constants_offset(), G3_scratch);
      __ ld_ptr(G3_scratch, constantPoolOopDesc::cache_offset_in_bytes(), G3_scratch);
  
      // get specific constant pool cache entry
      __ add(G3_scratch, G1_scratch, G3_scratch);
  
--- 669,680 ----
      __ sll(G1_scratch, 2*BitsPerByte, G1_scratch);
      __ srl(G1_scratch, 2*BitsPerByte - exact_log2(in_words(
                        ConstantPoolCacheEntry::size()) * BytesPerWord), G1_scratch);
  
      // get constant pool cache
!     __ ld_ptr(G5_method, methodOopDesc::const_offset(), G3_scratch);
!     __ ld_ptr(G3_scratch, constMethodOopDesc::constants_offset(), G3_scratch);
      __ ld_ptr(G3_scratch, constantPoolOopDesc::cache_offset_in_bytes(), G3_scratch);
  
      // get specific constant pool cache entry
      __ add(G3_scratch, G1_scratch, G3_scratch);
  
*** 991,1001 ****
      // get native function entry point(O0 is a good temp until the very end)
      __ delayed()->ld_ptr(Lmethod, in_bytes(methodOopDesc::native_function_offset()), O0);
      // for static methods insert the mirror argument
      const int mirror_offset = in_bytes(Klass::java_mirror_offset());
  
!     __ ld_ptr(Lmethod, methodOopDesc:: constants_offset(), O1);
      __ ld_ptr(O1, constantPoolOopDesc::pool_holder_offset_in_bytes(), O1);
      __ ld_ptr(O1, mirror_offset, O1);
  #ifdef ASSERT
      if (!PrintSignatureHandlers)  // do not dirty the output with this
      { Label L;
--- 993,1004 ----
      // get native function entry point(O0 is a good temp until the very end)
      __ delayed()->ld_ptr(Lmethod, in_bytes(methodOopDesc::native_function_offset()), O0);
      // for static methods insert the mirror argument
      const int mirror_offset = in_bytes(Klass::java_mirror_offset());
  
!     __ ld_ptr(Lmethod, methodOopDesc:: const_offset(), O1);
!     __ ld_ptr(O1, constMethodOopDesc::constants_offset(), O1);
      __ ld_ptr(O1, constantPoolOopDesc::pool_holder_offset_in_bytes(), O1);
      __ ld_ptr(O1, mirror_offset, O1);
  #ifdef ASSERT
      if (!PrintSignatureHandlers)  // do not dirty the output with this
      { Label L;