comparison src/cpu/sparc/vm/c1_LIRAssembler_sparc.cpp @ 6831:d8ce2825b193

8000213: NPG: Should have renamed arrayKlass and typeArrayKlass Summary: Capitalize these metadata types (and objArrayKlass) Reviewed-by: stefank, twisti, kvn
author coleenp
date Sat, 29 Sep 2012 06:40:00 -0400
parents 7eca5de9e0b6
children d804e148cff8
comparison
equal deleted inserted replaced
6811:1b582b1bf7cb 6831:d8ce2825b193
2288 __ add(dst_ptr, tmp, dst_ptr); 2288 __ add(dst_ptr, tmp, dst_ptr);
2289 } 2289 }
2290 __ mov(length, len); 2290 __ mov(length, len);
2291 __ load_klass(dst, tmp); 2291 __ load_klass(dst, tmp);
2292 2292
2293 int ek_offset = in_bytes(objArrayKlass::element_klass_offset()); 2293 int ek_offset = in_bytes(ObjArrayKlass::element_klass_offset());
2294 __ ld_ptr(tmp, ek_offset, super_k); 2294 __ ld_ptr(tmp, ek_offset, super_k);
2295 2295
2296 int sco_offset = in_bytes(Klass::super_check_offset_offset()); 2296 int sco_offset = in_bytes(Klass::super_check_offset_offset());
2297 __ lduw(super_k, sco_offset, chk_off); 2297 __ lduw(super_k, sco_offset, chk_off);
2298 2298
2779 add_debug_info_for_null_check_here(op->info_for_exception()); 2779 add_debug_info_for_null_check_here(op->info_for_exception());
2780 __ load_klass(array, k_RInfo); 2780 __ load_klass(array, k_RInfo);
2781 __ load_klass(value, klass_RInfo); 2781 __ load_klass(value, klass_RInfo);
2782 2782
2783 // get instance klass 2783 // get instance klass
2784 __ ld_ptr(Address(k_RInfo, objArrayKlass::element_klass_offset()), k_RInfo); 2784 __ ld_ptr(Address(k_RInfo, ObjArrayKlass::element_klass_offset()), k_RInfo);
2785 // perform the fast part of the checking logic 2785 // perform the fast part of the checking logic
2786 __ check_klass_subtype_fast_path(klass_RInfo, k_RInfo, Rtmp1, O7, success_target, failure_target, NULL); 2786 __ check_klass_subtype_fast_path(klass_RInfo, k_RInfo, Rtmp1, O7, success_target, failure_target, NULL);
2787 2787
2788 // call out-of-line instance of __ check_klass_subtype_slow_path(...): 2788 // call out-of-line instance of __ check_klass_subtype_slow_path(...):
2789 assert(klass_RInfo == G3 && k_RInfo == G1, "incorrect call setup"); 2789 assert(klass_RInfo == G3 && k_RInfo == G1, "incorrect call setup");