--- a/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp Fri Oct 18 09:36:35 2013 +0000
+++ b/hotspot/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp Fri Oct 18 12:15:32 2013 -0700
@@ -404,7 +404,9 @@
if (id == fast_new_instance_init_check_id) {
// make sure the klass is initialized
__ ldub(G5_klass, in_bytes(InstanceKlass::init_state_offset()), G3_t1);
- __ cmp_and_br_short(G3_t1, InstanceKlass::fully_initialized, Assembler::notEqual, Assembler::pn, slow_path);
+ __ cmp(G3_t1, InstanceKlass::fully_initialized);
+ __ br(Assembler::notEqual, false, Assembler::pn, slow_path);
+ __ delayed()->nop();
}
#ifdef ASSERT
// assert object can be fast path allocated
@@ -515,7 +517,9 @@
// check that array length is small enough for fast path
__ set(C1_MacroAssembler::max_array_allocation_length, G3_t1);
- __ cmp_and_br_short(G4_length, G3_t1, Assembler::greaterUnsigned, Assembler::pn, slow_path);
+ __ cmp(G4_length, G3_t1);
+ __ br(Assembler::greaterUnsigned, false, Assembler::pn, slow_path);
+ __ delayed()->nop();
// if we got here then the TLAB allocation failed, so try
// refilling the TLAB or allocating directly from eden.