1.1 --- a/src/cpu/sparc/vm/templateInterpreter_sparc.cpp Tue Dec 20 00:55:02 2011 -0800
1.2 +++ b/src/cpu/sparc/vm/templateInterpreter_sparc.cpp Wed Dec 07 11:35:03 2011 +0100
1.3 @@ -366,7 +366,7 @@
1.4
1.5 // get synchronization object to O0
1.6 { Label done;
1.7 - const int mirror_offset = klassOopDesc::klass_part_offset_in_bytes() + Klass::java_mirror_offset_in_bytes();
1.8 + const int mirror_offset = in_bytes(Klass::java_mirror_offset());
1.9 __ btst(JVM_ACC_STATIC, O0);
1.10 __ br( Assembler::zero, true, Assembler::pt, done);
1.11 __ delayed()->ld_ptr(Llocals, Interpreter::local_offset_in_bytes(0), O0); // get receiver for not-static case
1.12 @@ -984,7 +984,7 @@
1.13 // get native function entry point(O0 is a good temp until the very end)
1.14 __ delayed()->ld_ptr(Lmethod, in_bytes(methodOopDesc::native_function_offset()), O0);
1.15 // for static methods insert the mirror argument
1.16 - const int mirror_offset = klassOopDesc::klass_part_offset_in_bytes() + Klass::java_mirror_offset_in_bytes();
1.17 + const int mirror_offset = in_bytes(Klass::java_mirror_offset());
1.18
1.19 __ ld_ptr(Lmethod, methodOopDesc:: constants_offset(), O1);
1.20 __ ld_ptr(O1, constantPoolOopDesc::pool_holder_offset_in_bytes(), O1);
