*** old/src/cpu/x86/vm/templateTable_x86_64.cpp	Wed Dec  7 12:03:22 2011
--- new/src/cpu/x86/vm/templateTable_x86_64.cpp	Wed Dec  7 12:03:22 2011

*** 1002,1012 ****
--- 1002,1011 ----
    // Move subklass into rbx
    __ load_klass(rbx, rax);
    // Move superklass into rax
    __ load_klass(rax, rdx);
    __ movptr(rax, Address(rax,
                           sizeof(oopDesc) +
                           objArrayKlass::element_klass_offset_in_bytes()));
    // Compress array + index*oopSize + 12 into a single register.  Frees rcx.
    __ lea(rdx, element_address);
  
    // Generate subtype check.  Blows rcx, rdi

*** 2065,2075 ****
--- 2064,2074 ----
  
    if (_desc->bytecode() == Bytecodes::_return_register_finalizer) {
      assert(state == vtos, "only valid state");
      __ movptr(c_rarg1, aaddress(0));
      __ load_klass(rdi, c_rarg1);
-     __ movl(rdi, Address(rdi, Klass::access_flags_offset_in_bytes() + sizeof(oopDesc)));
      __ testl(rdi, JVM_ACC_HAS_FINALIZER);
      Label skip_register_finalizer;
      __ jcc(Assembler::zero, skip_register_finalizer);
  
      __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::register_finalizer), c_rarg1);

*** 3234,3252 ****
--- 3233,3250 ----
              Address::times_8, sizeof(constantPoolOopDesc)));
  
    // make sure klass is initialized & doesn't have finalizer
    // make sure klass is fully initialized
    __ cmpl(Address(rsi,
!                   instanceKlass::init_state_offset_in_bytes() +
                    sizeof(oopDesc)),
!                   instanceKlass::init_state_offset_in_bytes()),
            instanceKlass::fully_initialized);
    __ jcc(Assembler::notEqual, slow_case);
  
    // get instance_size in instanceKlass (scaled to a count of bytes)
    __ movl(rdx,
            Address(rsi,
-                   Klass::layout_helper_offset_in_bytes() + sizeof(oopDesc)));
    // test to see if it has a finalizer or is malformed in some way
    __ testl(rdx, Klass::_lh_instance_slow_path_bit);
    __ jcc(Assembler::notZero, slow_case);
  
    // Allocate the instance

*** 3335,3345 ****
--- 3333,3343 ----
      }
  
      // initialize object header only.
      __ bind(initialize_header);
      if (UseBiasedLocking) {
-       __ movptr(rscratch1, Address(rsi, Klass::prototype_header_offset_in_bytes() + klassOopDesc::klass_part_offset_in_bytes()));
        __ movptr(Address(rax, oopDesc::mark_offset_in_bytes()), rscratch1);
      } else {
        __ movptr(Address(rax, oopDesc::mark_offset_in_bytes()),
                 (intptr_t) markOopDesc::prototype()); // header (address 0x1)
      }