1.1 --- a/src/cpu/x86/vm/templateTable_x86_32.cpp Tue Dec 20 00:55:02 2011 -0800
1.2 +++ b/src/cpu/x86/vm/templateTable_x86_32.cpp Wed Dec 07 11:35:03 2011 +0100
1.3 @@ -980,7 +980,7 @@
1.4 __ load_klass(rbx, rax);
1.5 // Move superklass into EAX
1.6 __ load_klass(rax, rdx);
1.7 - __ movptr(rax, Address(rax, sizeof(oopDesc) + objArrayKlass::element_klass_offset_in_bytes()));
1.8 + __ movptr(rax, Address(rax, objArrayKlass::element_klass_offset()));
1.9 // Compress array+index*wordSize+12 into a single register. Frees ECX.
1.10 __ lea(rdx, element_address);
1.11
1.12 @@ -2033,7 +2033,7 @@
1.13 assert(state == vtos, "only valid state");
1.14 __ movptr(rax, aaddress(0));
1.15 __ load_klass(rdi, rax);
1.16 - __ movl(rdi, Address(rdi, Klass::access_flags_offset_in_bytes() + sizeof(oopDesc)));
1.17 + __ movl(rdi, Address(rdi, Klass::access_flags_offset()));
1.18 __ testl(rdi, JVM_ACC_HAS_FINALIZER);
1.19 Label skip_register_finalizer;
1.20 __ jcc(Assembler::zero, skip_register_finalizer);
1.21 @@ -3188,11 +3188,11 @@
1.22
1.23 // make sure klass is initialized & doesn't have finalizer
1.24 // make sure klass is fully initialized
1.25 - __ cmpl(Address(rcx, instanceKlass::init_state_offset_in_bytes() + sizeof(oopDesc)), instanceKlass::fully_initialized);
1.26 + __ cmpl(Address(rcx, instanceKlass::init_state_offset()), instanceKlass::fully_initialized);
1.27 __ jcc(Assembler::notEqual, slow_case);
1.28
1.29 // get instance_size in instanceKlass (scaled to a count of bytes)
1.30 - __ movl(rdx, Address(rcx, Klass::layout_helper_offset_in_bytes() + sizeof(oopDesc)));
1.31 + __ movl(rdx, Address(rcx, Klass::layout_helper_offset()));
1.32 // test to see if it has a finalizer or is malformed in some way
1.33 __ testl(rdx, Klass::_lh_instance_slow_path_bit);
1.34 __ jcc(Assembler::notZero, slow_case);
1.35 @@ -3293,7 +3293,7 @@
1.36 __ bind(initialize_header);
1.37 if (UseBiasedLocking) {
1.38 __ pop(rcx); // get saved klass back in the register.
1.39 - __ movptr(rbx, Address(rcx, Klass::prototype_header_offset_in_bytes() + klassOopDesc::klass_part_offset_in_bytes()));
1.40 + __ movptr(rbx, Address(rcx, Klass::prototype_header_offset()));
1.41 __ movptr(Address(rax, oopDesc::mark_offset_in_bytes ()), rbx);
1.42 } else {
1.43 __ movptr(Address(rax, oopDesc::mark_offset_in_bytes ()),
