src/cpu/x86/vm/stubGenerator_x86_64.cpp

*** 911,921 ****
    //    [tos + 2]: saved r12 (several TemplateTable methods use it)
    //    [tos + 3]: saved flags
    //    [tos + 4]: return address
    //  * [tos + 5]: error message (char*)
    //  * [tos + 6]: object to verify (oop)
!   //  * [tos + 7]: saved rax - saved by caller and bashed
    //  * = popped on exit
    address generate_verify_oop() {
      StubCodeMark mark(this, "StubRoutines", "verify_oop");
      address start = __ pc();
  
--- 911,922 ----
    //    [tos + 2]: saved r12 (several TemplateTable methods use it)
    //    [tos + 3]: saved flags
    //    [tos + 4]: return address
    //  * [tos + 5]: error message (char*)
    //  * [tos + 6]: object to verify (oop)
!   //    [tos + 7]: saved rax - saved by caller
!   //    [tos + 8]: saved r10 (rscratch1) - saved by caller
    //  * = popped on exit
    address generate_verify_oop() {
      StubCodeMark mark(this, "StubRoutines", "verify_oop");
      address start = __ pc();
  
*** 985,995 ****
      __ movptr(rax, Address(rsp, saved_rax));     // get saved rax back
      __ pop(c_rarg3);                             // restore c_rarg3
      __ pop(c_rarg2);                             // restore c_rarg2
      __ pop(r12);                                 // restore r12
      __ popf();                                   // restore flags
!     __ ret(3 * wordSize);                        // pop caller saved stuff
  
      // handle errors
      __ bind(error);
      __ movptr(rax, Address(rsp, saved_rax));     // get saved rax back
      __ pop(c_rarg3);                             // get saved c_rarg3 back
--- 986,996 ----
      __ movptr(rax, Address(rsp, saved_rax));     // get saved rax back
      __ pop(c_rarg3);                             // restore c_rarg3
      __ pop(c_rarg2);                             // restore c_rarg2
      __ pop(r12);                                 // restore r12
      __ popf();                                   // restore flags
!     __ ret(2 * wordSize);                        // pop caller saved stuff
  
      // handle errors
      __ bind(error);
      __ movptr(rax, Address(rsp, saved_rax));     // get saved rax back
      __ pop(c_rarg3);                             // get saved c_rarg3 back
*** 1006,1016 ****
      // pushed all the registers, so now the stack looks like:
      //     [tos +  0] 16 saved registers
      //     [tos + 16] return address
      //   * [tos + 17] error message (char*)
      //   * [tos + 18] object to verify (oop)
!     //   * [tos + 19] saved rax - saved by caller and bashed
      //   * = popped on exit
  
      __ movptr(c_rarg0, Address(rsp, error_msg));    // pass address of error message
      __ movptr(c_rarg1, Address(rsp, return_addr));  // pass return address
      __ movq(c_rarg2, rsp);                          // pass address of regs on stack
--- 1007,1018 ----
      // pushed all the registers, so now the stack looks like:
      //     [tos +  0] 16 saved registers
      //     [tos + 16] return address
      //   * [tos + 17] error message (char*)
      //   * [tos + 18] object to verify (oop)
!     //     [tos + 19] saved rax - saved by caller
!     //     [tos + 20] saved r10 (rscratch1) - saved by caller
      //   * = popped on exit
  
      __ movptr(c_rarg0, Address(rsp, error_msg));    // pass address of error message
      __ movptr(c_rarg1, Address(rsp, return_addr));  // pass return address
      __ movq(c_rarg2, rsp);                          // pass address of regs on stack
*** 1019,1029 ****
      __ andptr(rsp, -16);                            // align stack as required by ABI
      BLOCK_COMMENT("call MacroAssembler::debug");
      __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, MacroAssembler::debug64)));
      __ mov(rsp, r12);                               // restore rsp
      __ popa();                                      // pop registers (includes r12)
!     __ ret(3 * wordSize);                           // pop caller saved stuff
  
      return start;
    }
  
    static address disjoint_byte_copy_entry;
--- 1021,1031 ----
      __ andptr(rsp, -16);                            // align stack as required by ABI
      BLOCK_COMMENT("call MacroAssembler::debug");
      __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, MacroAssembler::debug64)));
      __ mov(rsp, r12);                               // restore rsp
      __ popa();                                      // pop registers (includes r12)
!     __ ret(2 * wordSize);                           // pop caller saved stuff
  
      return start;
    }
  
    static address disjoint_byte_copy_entry;