--- old/src/cpu/aarch64/vm/templateInterpreter_aarch64.cpp	2015-12-17 17:51:53.068748008 -0500
+++ new/src/cpu/aarch64/vm/templateInterpreter_aarch64.cpp	2015-12-17 17:51:52.584998949 -0500
@@ -31,6 +31,12 @@
 #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;
@@ -97,7 +103,7 @@
                                          int callee_locals,
                                          bool is_top_frame) {
   // Note: This calculation must exactly parallel the frame setup
-  // in InterpreterGenerator::generate_method_entry.
+  // in TemplateInterpreterGenerator::generate_method_entry.
 
   // fixed size of an interpreter frame:
   int overhead = frame::sender_sp_offset -