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

*** 29,38 ****
--- 29,44 ----
  #include "oops/method.hpp"
  #include "runtime/frame.inline.hpp"
  #include "utilities/debug.hpp"
  #include "utilities/macros.hpp"
  
+ // Size of interpreter code.  Increase if too small.  Interpreter will
+ // fail with a guarantee ("not enough space for interpreter generation");
+ // if too small.
+ // Run with +PrintInterpreter to get the VM to print out the size.
+ // Max size with JVMTI
+ int TemplateInterpreter::InterpreterCodeSize = 200 * 1024;
  
  int AbstractInterpreter::BasicType_as_index(BasicType type) {
    int i = 0;
    switch (type) {
      case T_BOOLEAN: i = 0; break;

*** 95,105 ****
--- 101,111 ----
                                           int monitors,
                                           int callee_params,
                                           int callee_locals,
                                           bool is_top_frame) {
    // Note: This calculation must exactly parallel the frame setup
!   // in TemplateInterpreterGenerator::generate_method_entry.
  
    // fixed size of an interpreter frame:
    int overhead = frame::sender_sp_offset -
                   frame::interpreter_frame_initial_sp_offset;
    // Our locals were accounted for by the caller (or last_frame_adjust