*** old/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp	Tue Dec 13 20:05:39 2011
--- new/src/cpu/sparc/vm/c1_Runtime1_sparc.cpp	Tue Dec 13 20:05:39 2011

*** 396,413 ****
--- 396,413 ----
            // to stomp the real return address.
            __ save_frame(0);
  
            if (id == fast_new_instance_init_check_id) {
              // make sure the klass is initialized
!             __ ld(G5_klass, instanceKlass::init_state_offset_in_bytes() + sizeof(oopDesc), G3_t1);
!             __ ld(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);
            }
  #ifdef ASSERT
            // assert object can be fast path allocated
            {
              Label ok, not_ok;
!           __ ld(G5_klass, Klass::layout_helper_offset_in_bytes() + sizeof(oopDesc), G1_obj_size);
!           __ ld(G5_klass, in_bytes(Klass::layout_helper_offset()), G1_obj_size);
            // make sure it's an instance (LH > 0)
            __ cmp_and_br_short(G1_obj_size, 0, Assembler::lessEqual, Assembler::pn, not_ok);
            __ btst(Klass::_lh_instance_slow_path_bit, G1_obj_size);
            __ br(Assembler::zero, false, Assembler::pn, ok);
            __ delayed()->nop();

*** 423,433 ****
--- 423,433 ----
            __ tlab_refill(retry_tlab, try_eden, slow_path); // preserves G5_klass
  
            __ bind(retry_tlab);
  
            // get the instance size
!           __ ld(G5_klass, klassOopDesc::header_size() * HeapWordSize + Klass::layout_helper_offset_in_bytes(), G1_obj_size);
!           __ ld(G5_klass, in_bytes(Klass::layout_helper_offset()), G1_obj_size);
  
            __ tlab_allocate(O0_obj, G1_obj_size, 0, G3_t1, slow_path);
  
            __ initialize_object(O0_obj, G5_klass, G1_obj_size, 0, G3_t1, G4_t2);
            __ verify_oop(O0_obj);

*** 435,445 ****
--- 435,445 ----
            __ ret();
            __ delayed()->restore();
  
            __ bind(try_eden);
            // get the instance size
!           __ ld(G5_klass, klassOopDesc::header_size() * HeapWordSize + Klass::layout_helper_offset_in_bytes(), G1_obj_size);
!           __ ld(G5_klass, in_bytes(Klass::layout_helper_offset()), G1_obj_size);
            __ eden_allocate(O0_obj, G1_obj_size, 0, G3_t1, G4_t2, slow_path);
            __ incr_allocated_bytes(G1_obj_size, G3_t1, G4_t2);
  
            __ initialize_object(O0_obj, G5_klass, G1_obj_size, 0, G3_t1, G4_t2);
            __ verify_oop(O0_obj);

*** 469,480 ****
--- 469,479 ----
        {
          Register G5_klass = G5; // Incoming
          Register G4_length = G4; // Incoming
          Register O0_obj   = O0; // Outgoing
  
!         Address klass_lh(G5_klass, ((klassOopDesc::header_size() * HeapWordSize)
                                      + Klass::layout_helper_offset_in_bytes()));
!         Address klass_lh(G5_klass, Klass::layout_helper_offset());
          assert(Klass::_lh_header_size_shift % BitsPerByte == 0, "bytewise");
          assert(Klass::_lh_header_size_mask == 0xFF, "bytewise");
          // Use this offset to pick out an individual byte of the layout_helper:
          const int klass_lh_header_size_offset = ((BytesPerInt - 1)  // 3 - 2 selects byte {0,1,0,0}
                                                   - Klass::_lh_header_size_shift / BitsPerByte);

*** 590,600 ****
--- 589,599 ----
  
          // load the klass and check the has finalizer flag
          Label register_finalizer;
          Register t = O1;
          __ load_klass(O0, t);
!         __ ld(t, Klass::access_flags_offset_in_bytes() + sizeof(oopDesc), t);
!         __ ld(t, in_bytes(Klass::access_flags_offset()), t);
          __ set(JVM_ACC_HAS_FINALIZER, G3);
          __ andcc(G3, t, G0);
          __ br(Assembler::notZero, false, Assembler::pt, register_finalizer);
          __ delayed()->nop();