*** old/src/cpu/sparc/vm/interpreter_sparc.cpp	Thu Dec 17 17:51:58 2015
--- new/src/cpu/sparc/vm/interpreter_sparc.cpp	Thu Dec 17 17:51:58 2015

*** 24,36 ****
--- 24,36 ----
  
  #include "precompiled.hpp"
  #include "asm/macroAssembler.hpp"
  #include "interpreter/bytecodeHistogram.hpp"
  #include "interpreter/interpreter.hpp"
  #include "interpreter/interpreterGenerator.hpp"
  #include "interpreter/interpreterRuntime.hpp"
  #include "interpreter/interp_masm.hpp"
+ #include "interpreter/templateInterpreterGenerator.hpp"
  #include "interpreter/templateTable.hpp"
  #include "oops/arrayOop.hpp"
  #include "oops/methodData.hpp"
  #include "oops/method.hpp"
  #include "oops/oop.inline.hpp"

*** 51,61 ****
--- 51,61 ----
  
  
  
  // Generation of Interpreter
  //
! // The TemplateInterpreterGenerator generates the interpreter into Interpreter::_code.
  
  
  #define __ _masm->
  
  

*** 192,202 ****
--- 192,202 ----
       restore(O0, 0, Lscratch);  // caller's Lscratch gets the result handler
    return entry;
  }
  #endif
  
! void TemplateInterpreterGenerator::generate_counter_overflow(Label& Lcontinue) {
  
    // Generate code to initiate compilation on the counter overflow.
  
    // InterpreterRuntime::frequency_counter_overflow takes two arguments,
    // the first indicates if the counter overflow occurs at a backwards branch (NULL bcp)

*** 217,227 ****
--- 217,227 ----
  // Various method entries
  
  // Abstract method entry
  // Attempt to execute abstract method. Throw exception
  //
! address TemplateInterpreterGenerator::generate_abstract_entry(void) {
    address entry = __ pc();
    // abstract method entry
    // 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.