1.1 --- a/src/cpu/sparc/vm/c1_MacroAssembler_sparc.cpp Tue Dec 20 00:55:02 2011 -0800
1.2 +++ b/src/cpu/sparc/vm/c1_MacroAssembler_sparc.cpp Wed Dec 07 11:35:03 2011 +0100
1.3 @@ -181,7 +181,7 @@
1.4 void C1_MacroAssembler::initialize_header(Register obj, Register klass, Register len, Register t1, Register t2) {
1.5 assert_different_registers(obj, klass, len, t1, t2);
1.6 if (UseBiasedLocking && !len->is_valid()) {
1.7 - ld_ptr(klass, Klass::prototype_header_offset_in_bytes() + klassOopDesc::klass_part_offset_in_bytes(), t1);
1.8 + ld_ptr(klass, in_bytes(Klass::prototype_header_offset()), t1);
1.9 } else {
1.10 set((intx)markOopDesc::prototype(), t1);
1.11 }
1.12 @@ -252,7 +252,7 @@
1.13 #ifdef ASSERT
1.14 {
1.15 Label ok;
1.16 - ld(klass, klassOopDesc::header_size() * HeapWordSize + Klass::layout_helper_offset_in_bytes(), t1);
1.17 + ld(klass, in_bytes(Klass::layout_helper_offset()), t1);
1.18 if (var_size_in_bytes != noreg) {
1.19 cmp_and_brx_short(t1, var_size_in_bytes, Assembler::equal, Assembler::pt, ok);
1.20 } else {
