src/cpu/x86/vm/sharedRuntime_x86_64.cpp

*** 3019,3051 ****
  
    // Push interpreter frames in a loop
    Label loop;
    __ bind(loop);
    __ movptr(rbx, Address(rsi, 0));      // Load frame size
- #ifdef CC_INTERP
-   __ subptr(rbx, 4*wordSize);           // we'll push pc and ebp by hand and
- #ifdef ASSERT
-   __ push(0xDEADDEAD);                  // Make a recognizable pattern
-   __ push(0xDEADDEAD);
- #else /* ASSERT */
-   __ subptr(rsp, 2*wordSize);           // skip the "static long no_param"
- #endif /* ASSERT */
- #else
    __ subptr(rbx, 2*wordSize);           // We'll push pc and ebp by hand
- #endif // CC_INTERP
    __ pushptr(Address(rcx, 0));          // Save return address
    __ enter();                           // Save old & set new ebp
    __ subptr(rsp, rbx);                  // Prolog
- #ifdef CC_INTERP
-   __ movptr(Address(rbp,
-                   -(sizeof(BytecodeInterpreter)) + in_bytes(byte_offset_of(BytecodeInterpreter, _sender_sp))),
-             sender_sp); // Make it walkable
- #else /* CC_INTERP */
    // This value is corrected by layout_activation_impl
    __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), (int32_t)NULL_WORD );
    __ movptr(Address(rbp, frame::interpreter_frame_sender_sp_offset * wordSize), sender_sp); // Make it walkable
- #endif /* CC_INTERP */
    __ mov(sender_sp, rsp);               // Pass sender_sp to next frame
    __ addptr(rsi, wordSize);             // Bump array pointer (sizes)
    __ addptr(rcx, wordSize);             // Bump array pointer (pcs)
    __ decrementl(rdx);                   // Decrement counter
    __ jcc(Assembler::notZero, loop);
--- 3019,3035 ----
*** 3240,3259 ****
    __ movptr(rbx, Address(rsi, 0)); // Load frame size
    __ subptr(rbx, 2 * wordSize);    // We'll push pc and rbp by hand
    __ pushptr(Address(rcx, 0));     // Save return address
    __ enter();                      // Save old & set new rbp
    __ subptr(rsp, rbx);             // Prolog
- #ifdef CC_INTERP
-   __ movptr(Address(rbp,
-                   -(sizeof(BytecodeInterpreter)) + in_bytes(byte_offset_of(BytecodeInterpreter, _sender_sp))),
-             sender_sp); // Make it walkable
- #else // CC_INTERP
    __ movptr(Address(rbp, frame::interpreter_frame_sender_sp_offset * wordSize),
              sender_sp);            // Make it walkable
    // This value is corrected by layout_activation_impl
    __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), (int32_t)NULL_WORD );
- #endif // CC_INTERP
    __ mov(sender_sp, rsp);          // Pass sender_sp to next frame
    __ addptr(rsi, wordSize);        // Bump array pointer (sizes)
    __ addptr(rcx, wordSize);        // Bump array pointer (pcs)
    __ decrementl(rdx);              // Decrement counter
    __ jcc(Assembler::notZero, loop);
--- 3224,3237 ----