src/cpu/x86/vm/templateTable_x86_32.cpp

*** 978,988 ****
  
    // Move subklass into EBX
    __ load_klass(rbx, rax);
    // Move superklass into EAX
    __ load_klass(rax, rdx);
!   __ movptr(rax, Address(rax, sizeof(oopDesc) + objArrayKlass::element_klass_offset_in_bytes()));
    // Compress array+index*wordSize+12 into a single register.  Frees ECX.
    __ lea(rdx, element_address);
  
    // Generate subtype check.  Blows ECX.  Resets EDI to locals.
    // Superklass in EAX.  Subklass in EBX.
--- 978,988 ----
  
    // Move subklass into EBX
    __ load_klass(rbx, rax);
    // Move superklass into EAX
    __ load_klass(rax, rdx);
!   __ movptr(rax, Address(rax, objArrayKlass::element_klass_offset_in_bytes()));
    // Compress array+index*wordSize+12 into a single register.  Frees ECX.
    __ lea(rdx, element_address);
  
    // Generate subtype check.  Blows ECX.  Resets EDI to locals.
    // Superklass in EAX.  Subklass in EBX.
*** 2031,2041 ****
  
    if (_desc->bytecode() == Bytecodes::_return_register_finalizer) {
      assert(state == vtos, "only valid state");
      __ movptr(rax, aaddress(0));
      __ load_klass(rdi, rax);
!     __ 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), rax);
--- 2031,2041 ----
  
    if (_desc->bytecode() == Bytecodes::_return_register_finalizer) {
      assert(state == vtos, "only valid state");
      __ movptr(rax, aaddress(0));
      __ load_klass(rdi, rax);
!     __ movl(rdi, Address(rdi, Klass::access_flags_offset_in_bytes()));
      __ 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), rax);
*** 3186,3200 ****
    __ movptr(rcx, Address(rcx, rdx, Address::times_ptr, sizeof(constantPoolOopDesc)));
    __ push(rcx);  // save the contexts of klass for initializing the header
  
    // make sure klass is initialized & doesn't have finalizer
    // make sure klass is fully initialized
!   __ cmpl(Address(rcx, instanceKlass::init_state_offset_in_bytes() + sizeof(oopDesc)), instanceKlass::fully_initialized);
    __ jcc(Assembler::notEqual, slow_case);
  
    // get instance_size in instanceKlass (scaled to a count of bytes)
!   __ movl(rdx, Address(rcx, 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);
  
    //
--- 3186,3200 ----
    __ movptr(rcx, Address(rcx, rdx, Address::times_ptr, sizeof(constantPoolOopDesc)));
    __ push(rcx);  // save the contexts of klass for initializing the header
  
    // make sure klass is initialized & doesn't have finalizer
    // make sure klass is fully initialized
!   __ cmpl(Address(rcx, 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(rcx, Klass::layout_helper_offset_in_bytes()));
    // 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);
  
    //
*** 3291,3301 ****
  
      // initialize object header only.
      __ bind(initialize_header);
      if (UseBiasedLocking) {
        __ pop(rcx);   // get saved klass back in the register.
!       __ movptr(rbx, Address(rcx, Klass::prototype_header_offset_in_bytes() + klassOopDesc::klass_part_offset_in_bytes()));
        __ movptr(Address(rax, oopDesc::mark_offset_in_bytes ()), rbx);
      } else {
        __ movptr(Address(rax, oopDesc::mark_offset_in_bytes ()),
                  (int32_t)markOopDesc::prototype()); // header
        __ pop(rcx);   // get saved klass back in the register.
--- 3291,3301 ----
  
      // initialize object header only.
      __ bind(initialize_header);
      if (UseBiasedLocking) {
        __ pop(rcx);   // get saved klass back in the register.
!       __ movptr(rbx, Address(rcx, Klass::prototype_header_offset_in_bytes()));
        __ movptr(Address(rax, oopDesc::mark_offset_in_bytes ()), rbx);
      } else {
        __ movptr(Address(rax, oopDesc::mark_offset_in_bytes ()),
                  (int32_t)markOopDesc::prototype()); // header
        __ pop(rcx);   // get saved klass back in the register.