src/cpu/sparc/vm/cppInterpreter_sparc.cpp

*** 764,774 ****
      __ br( Assembler::zero, false, Assembler::pt, not_static);
      __ delayed()->
        // get native function entry point(O0 is a good temp until the very end)
         ld_ptr(Address(G5_method, 0, in_bytes(methodOopDesc::native_function_offset())), O0);
      // for static methods insert the mirror argument
!     const int mirror_offset = klassOopDesc::klass_part_offset_in_bytes() + Klass::java_mirror_offset_in_bytes();
  
      __ ld_ptr(Address(G5_method, 0, in_bytes(methodOopDesc:: constants_offset())), O1);
      __ ld_ptr(Address(O1, 0, constantPoolOopDesc::pool_holder_offset_in_bytes()), O1);
      __ ld_ptr(O1, mirror_offset, O1);
      // where the mirror handle body is allocated:
--- 764,774 ----
      __ br( Assembler::zero, false, Assembler::pt, not_static);
      __ delayed()->
        // get native function entry point(O0 is a good temp until the very end)
         ld_ptr(Address(G5_method, 0, 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(Address(G5_method, 0, in_bytes(methodOopDesc:: constants_offset())), O1);
      __ ld_ptr(Address(O1, 0, constantPoolOopDesc::pool_holder_offset_in_bytes()), O1);
      __ ld_ptr(O1, mirror_offset, O1);
      // where the mirror handle body is allocated:
*** 1171,1181 ****
      Label done;
      Label got_obj;
      __ btst(JVM_ACC_SYNCHRONIZED, O1);
      __ br( Assembler::zero, false, Assembler::pt, done);
  
!     const int mirror_offset = klassOopDesc::klass_part_offset_in_bytes() + Klass::java_mirror_offset_in_bytes();
      __ delayed()->btst(JVM_ACC_STATIC, O1);
      __ ld_ptr(XXX_STATE(_locals), O1);
      __ br( Assembler::zero, true, Assembler::pt, got_obj);
      __ delayed()->ld_ptr(O1, 0, O1);                  // get receiver for not-static case
      __ ld_ptr(constants, O1);
--- 1171,1181 ----
      Label done;
      Label got_obj;
      __ btst(JVM_ACC_SYNCHRONIZED, O1);
      __ br( Assembler::zero, false, Assembler::pt, done);
  
!     const int mirror_offset = in_bytes(Klass::java_mirror_offset());
      __ delayed()->btst(JVM_ACC_STATIC, O1);
      __ ld_ptr(XXX_STATE(_locals), O1);
      __ br( Assembler::zero, true, Assembler::pt, got_obj);
      __ delayed()->ld_ptr(O1, 0, O1);                  // get receiver for not-static case
      __ ld_ptr(constants, O1);