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

*** 886,896 ****
--- 886,896 ----
    __ load_klass(O3, O4); // get array klass
    __ load_klass(Otos_i, O5); // get value klass
  
    // do fast instanceof cache test
  
!   __ ld_ptr(O4,     sizeof(oopDesc) + objArrayKlass::element_klass_offset_in_bytes(),  O4);
!   __ ld_ptr(O4,     in_bytes(objArrayKlass::element_klass_offset()),  O4);
  
    assert(Otos_i == O0, "just checking");
  
    // Otos_i:    value
    // O1:        addr - offset

*** 2029,2039 ****
--- 2029,2039 ----
      assert(state == vtos, "only valid state");
      __ mov(G0, G3_scratch);
      __ access_local_ptr(G3_scratch, Otos_i);
      __ load_klass(Otos_i, O2);
      __ set(JVM_ACC_HAS_FINALIZER, G3);
!     __ ld(O2, Klass::access_flags_offset_in_bytes() + sizeof(oopDesc), O2);
!     __ ld(O2, in_bytes(Klass::access_flags_offset()), O2);
      __ andcc(G3, O2, G0);
      Label skip_register_finalizer;
      __ br(Assembler::zero, false, Assembler::pn, skip_register_finalizer);
      __ delayed()->nop();
  

*** 3348,3364 ****
--- 3348,3364 ----
    //__ sll(Roffset, LogBytesPerWord, Roffset);        // executed in delay slot
    __ add(Roffset, sizeof(constantPoolOopDesc), Roffset);
    __ ld_ptr(Rscratch, Roffset, RinstanceKlass);
  
    // make sure klass is fully initialized:
!   __ ld(RinstanceKlass, instanceKlass::init_state_offset_in_bytes() + sizeof(oopDesc), G3_scratch);
!   __ ld(RinstanceKlass, in_bytes(instanceKlass::init_state_offset()), G3_scratch);
    __ cmp(G3_scratch, instanceKlass::fully_initialized);
    __ br(Assembler::notEqual, false, Assembler::pn, slow_case);
!   __ delayed()->ld(RinstanceKlass, Klass::layout_helper_offset_in_bytes() + sizeof(oopDesc), Roffset);
!   __ delayed()->ld(RinstanceKlass, in_bytes(Klass::layout_helper_offset()), Roffset);
  
    // get instance_size in instanceKlass (already aligned)
!   //__ ld(RinstanceKlass, Klass::layout_helper_offset_in_bytes() + sizeof(oopDesc), Roffset);
!   //__ ld(RinstanceKlass, in_bytes(Klass::layout_helper_offset()), Roffset);
  
    // make sure klass does not have has_finalizer, or is abstract, or interface or java/lang/Class
    __ btst(Klass::_lh_instance_slow_path_bit, Roffset);
    __ br(Assembler::notZero, false, Assembler::pn, slow_case);
    __ delayed()->nop();

*** 3481,3491 ****
--- 3481,3491 ----
  
    // Initialize the header: mark, klass
    __ bind(initialize_header);
  
    if (UseBiasedLocking) {
!     __ ld_ptr(RinstanceKlass, Klass::prototype_header_offset_in_bytes() + sizeof(oopDesc), G4_scratch);
!     __ ld_ptr(RinstanceKlass, in_bytes(Klass::prototype_header_offset()), G4_scratch);
    } else {
      __ set((intptr_t)markOopDesc::prototype(), G4_scratch);
    }
    __ st_ptr(G4_scratch, RallocatedObject, oopDesc::mark_offset_in_bytes());       // mark
    __ store_klass_gap(G0, RallocatedObject);         // klass gap if compressed