src/cpu/x86/vm/interpreterGenerator_x86.cpp

*** 23,52 ****
   */
  
  #include "precompiled.hpp"
  #include "asm/macroAssembler.hpp"
  #include "interpreter/interpreter.hpp"
- #include "interpreter/interpreterGenerator.hpp"
  #include "interpreter/interpreterRuntime.hpp"
  #include "interpreter/interp_masm.hpp"
  
  #define __ _masm->
  
  // Abstract method entry
  // Attempt to execute abstract method. Throw exception
! address InterpreterGenerator::generate_abstract_entry(void) {
  
    address entry_point = __ pc();
  
    // abstract method entry
  
- #ifndef CC_INTERP
    //  pop return address, reset last_sp to NULL
    __ empty_expression_stack();
    __ restore_bcp();      // rsi must be correct for exception handler   (was destroyed)
    __ restore_locals();   // make sure locals pointer is correct as well (was destroyed)
- #endif
  
    // throw exception
    __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::throw_AbstractMethodError));
    // the call_VM checks for exception, so we should never return here.
    __ should_not_reach_here();
--- 23,50 ----
   */
  
  #include "precompiled.hpp"
  #include "asm/macroAssembler.hpp"
  #include "interpreter/interpreter.hpp"
  #include "interpreter/interpreterRuntime.hpp"
  #include "interpreter/interp_masm.hpp"
+ #include "interpreter/templateInterpreterGenerator.hpp"
  
  #define __ _masm->
  
  // Abstract method entry
  // Attempt to execute abstract method. Throw exception
! address TemplateInterpreterGenerator::generate_abstract_entry(void) {
  
    address entry_point = __ pc();
  
    // abstract method entry
  
    //  pop return address, reset last_sp to NULL
    __ empty_expression_stack();
    __ restore_bcp();      // rsi must be correct for exception handler   (was destroyed)
    __ restore_locals();   // make sure locals pointer is correct as well (was destroyed)
  
    // throw exception
    __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::throw_AbstractMethodError));
    // the call_VM checks for exception, so we should never return here.
    __ should_not_reach_here();