*** old/src/cpu/aarch64/vm/interpreter_aarch64.cpp	Thu Dec 17 17:51:52 2015
--- new/src/cpu/aarch64/vm/interpreter_aarch64.cpp	Thu Dec 17 17:51:52 2015

*** 25,37 ****
--- 25,37 ----
  
  #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"

*** 121,131 ****
--- 121,131 ----
  
  //
  // Various method entries
  //
  
! address TemplateInterpreterGenerator::generate_math_entry(AbstractInterpreter::MethodKind kind) {
    // rmethod: Method*
    // r13: sender sp
    // esp: args
  
    if (!InlineIntrinsics) return NULL; // Generate a vanilla entry

*** 200,210 ****
--- 200,210 ----
    // static jdouble dlog(jdouble x);
    // static jdouble dlog10(jdouble x);
    // static jdouble dexp(jdouble x);
    // static jdouble dpow(jdouble x, jdouble y);
  
! void TemplateInterpreterGenerator::generate_transcendental_entry(AbstractInterpreter::MethodKind kind, int fpargs) {
    address fn;
    switch (kind) {
    case Interpreter::java_lang_math_sin :
      fn = CAST_FROM_FN_PTR(address, SharedRuntime::dsin);
      break;

*** 235,245 ****
--- 235,245 ----
    __ blrt(rscratch1, gpargs, fpargs, rtype);
  }
  
  // Abstract method entry
  // Attempt to execute abstract method. Throw exception
! address TemplateInterpreterGenerator::generate_abstract_entry(void) {
    // rmethod: Method*
    // r13: sender SP
  
    address entry_point = __ pc();