*** old/src/cpu/x86/vm/frame_x86.hpp	Thu Dec 17 17:52:05 2015
--- new/src/cpu/x86/vm/frame_x86.hpp	Thu Dec 17 17:52:04 2015

*** 99,110 ****
--- 99,108 ----
      link_offset                                      =  0,
      return_addr_offset                               =  1,
      // non-interpreter frames
      sender_sp_offset                                 =  2,
  
  #ifndef CC_INTERP
  
      // Interpreter frames
      interpreter_frame_result_handler_offset          =  3, // for native calls only
      interpreter_frame_oop_temp_offset                =  2, // for native calls only
  
      interpreter_frame_sender_sp_offset               = -1,

*** 118,129 ****
--- 116,125 ----
      interpreter_frame_initial_sp_offset              = interpreter_frame_bcp_offset - 1,
  
      interpreter_frame_monitor_block_top_offset       = interpreter_frame_initial_sp_offset,
      interpreter_frame_monitor_block_bottom_offset    = interpreter_frame_initial_sp_offset,
  
  #endif // CC_INTERP
  
      // Entry frames
  #ifdef AMD64
  #ifdef _WIN64
      entry_frame_after_call_words                     =  60,
      entry_frame_call_wrapper_offset                  =  2,

*** 191,205 ****
--- 187,195 ----
    intptr_t* interpreter_frame_last_sp() const;
  
    // helper to update a map with callee-saved RBP
    static void update_map_with_saved_link(RegisterMap* map, intptr_t** link_addr);
  
  #ifndef CC_INTERP
    // deoptimization support
    void interpreter_frame_set_last_sp(intptr_t* sp);
  #endif // CC_INTERP
  
  #ifdef CC_INTERP
    inline interpreterState get_interpreterState() const;
  #endif // CC_INTERP
  
  #endif // CPU_X86_VM_FRAME_X86_HPP