1.1 --- a/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp Tue Dec 20 00:55:02 2011 -0800
1.2 +++ b/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp Wed Dec 07 11:35:03 2011 +0100
1.3 @@ -1558,7 +1558,7 @@
1.4 void LIR_Assembler::emit_alloc_obj(LIR_OpAllocObj* op) {
1.5 if (op->init_check()) {
1.6 __ cmpl(Address(op->klass()->as_register(),
1.7 - instanceKlass::init_state_offset_in_bytes() + sizeof(oopDesc)),
1.8 + instanceKlass::init_state_offset()),
1.9 instanceKlass::fully_initialized);
1.10 add_debug_info_for_null_check_here(op->stub()->info());
1.11 __ jcc(Assembler::notEqual, *op->stub()->entry());
1.12 @@ -1730,7 +1730,7 @@
1.13 #else
1.14 __ cmpoop(Address(klass_RInfo, k->super_check_offset()), k->constant_encoding());
1.15 #endif // _LP64
1.16 - if (sizeof(oopDesc) + Klass::secondary_super_cache_offset_in_bytes() != k->super_check_offset()) {
1.17 + if ((juint)in_bytes(Klass::secondary_super_cache_offset()) != k->super_check_offset()) {
1.18 __ jcc(Assembler::notEqual, *failure_target);
1.19 // successful cast, fall through to profile or jump
1.20 } else {
1.21 @@ -1842,7 +1842,7 @@
1.22 __ load_klass(klass_RInfo, value);
1.23
1.24 // get instance klass (it's already uncompressed)
1.25 - __ movptr(k_RInfo, Address(k_RInfo, objArrayKlass::element_klass_offset_in_bytes() + sizeof(oopDesc)));
1.26 + __ movptr(k_RInfo, Address(k_RInfo, objArrayKlass::element_klass_offset()));
1.27 // perform the fast part of the checking logic
1.28 __ check_klass_subtype_fast_path(klass_RInfo, k_RInfo, Rtmp1, success_target, failure_target, NULL);
1.29 // call out-of-line instance of __ check_klass_subtype_slow_path(...):
1.30 @@ -3289,8 +3289,7 @@
1.31 } else if (!(flags & LIR_OpArrayCopy::dst_objarray)) {
1.32 __ load_klass(tmp, dst);
1.33 }
1.34 - int lh_offset = klassOopDesc::header_size() * HeapWordSize +
1.35 - Klass::layout_helper_offset_in_bytes();
1.36 + int lh_offset = in_bytes(Klass::layout_helper_offset());
1.37 Address klass_lh_addr(tmp, lh_offset);
1.38 jint objArray_lh = Klass::array_layout_helper(T_OBJECT);
1.39 __ cmpl(klass_lh_addr, objArray_lh);
1.40 @@ -3307,9 +3306,9 @@
1.41
1.42 #ifndef _LP64
1.43 __ movptr(tmp, dst_klass_addr);
1.44 - __ movptr(tmp, Address(tmp, objArrayKlass::element_klass_offset_in_bytes() + sizeof(oopDesc)));
1.45 + __ movptr(tmp, Address(tmp, objArrayKlass::element_klass_offset()));
1.46 __ push(tmp);
1.47 - __ movl(tmp, Address(tmp, Klass::super_check_offset_offset_in_bytes() + sizeof(oopDesc)));
1.48 + __ movl(tmp, Address(tmp, Klass::super_check_offset_offset()));
1.49 __ push(tmp);
1.50 __ push(length);
1.51 __ lea(tmp, Address(dst, dst_pos, scale, arrayOopDesc::base_offset_in_bytes(basic_type)));
1.52 @@ -3333,15 +3332,15 @@
1.53 // Allocate abi space for args but be sure to keep stack aligned
1.54 __ subptr(rsp, 6*wordSize);
1.55 __ load_klass(c_rarg3, dst);
1.56 - __ movptr(c_rarg3, Address(c_rarg3, objArrayKlass::element_klass_offset_in_bytes() + sizeof(oopDesc)));
1.57 + __ movptr(c_rarg3, Address(c_rarg3, objArrayKlass::element_klass_offset()));
1.58 store_parameter(c_rarg3, 4);
1.59 - __ movl(c_rarg3, Address(c_rarg3, Klass::super_check_offset_offset_in_bytes() + sizeof(oopDesc)));
1.60 + __ movl(c_rarg3, Address(c_rarg3, Klass::super_check_offset_offset()));
1.61 __ call(RuntimeAddress(copyfunc_addr));
1.62 __ addptr(rsp, 6*wordSize);
1.63 #else
1.64 __ load_klass(c_rarg4, dst);
1.65 - __ movptr(c_rarg4, Address(c_rarg4, objArrayKlass::element_klass_offset_in_bytes() + sizeof(oopDesc)));
1.66 - __ movl(c_rarg3, Address(c_rarg4, Klass::super_check_offset_offset_in_bytes() + sizeof(oopDesc)));
1.67 + __ movptr(c_rarg4, Address(c_rarg4, objArrayKlass::element_klass_offset()));
1.68 + __ movl(c_rarg3, Address(c_rarg4, Klass::super_check_offset_offset()));
1.69 __ call(RuntimeAddress(copyfunc_addr));
1.70 #endif
1.71
