# HG changeset patch
# User mockner
# Date 1487006786 0
# Node ID 6a3bb9853fee58ca5f9e743052bdd19211c192eb
# Parent  03e564780d23bc3e5a9edef2420bb5bfb03c0523# Parent  1d8d6ddcc626c12459e8ff09bf493776dd2c2a74
Merge

diff -r 03e564780d23 -r 6a3bb9853fee hotspot/src/cpu/aarch64/vm/templateInterpreterGenerator_aarch64.cpp
--- a/hotspot/src/cpu/aarch64/vm/templateInterpreterGenerator_aarch64.cpp	Mon Feb 13 12:00:40 2017 -0500
+++ b/hotspot/src/cpu/aarch64/vm/templateInterpreterGenerator_aarch64.cpp	Mon Feb 13 17:26:26 2017 +0000
@@ -402,14 +402,6 @@
   return entry;
 }
 
-address TemplateInterpreterGenerator::generate_continuation_for(TosState state) {
-  address entry = __ pc();
-  // NULL last_sp until next java call
-  __ str(zr, Address(rfp, frame::interpreter_frame_last_sp_offset * wordSize));
-  __ dispatch_next(state);
-  return entry;
-}
-
 address TemplateInterpreterGenerator::generate_return_entry_for(TosState state, int step, size_t index_size) {
   address entry = __ pc();
 
diff -r 03e564780d23 -r 6a3bb9853fee hotspot/src/cpu/arm/vm/templateInterpreterGenerator_arm.cpp
--- a/hotspot/src/cpu/arm/vm/templateInterpreterGenerator_arm.cpp	Mon Feb 13 12:00:40 2017 -0500
+++ b/hotspot/src/cpu/arm/vm/templateInterpreterGenerator_arm.cpp	Mon Feb 13 17:26:26 2017 +0000
@@ -270,12 +270,6 @@
   return entry;
 }
 
-address TemplateInterpreterGenerator::generate_continuation_for(TosState state) {
-  // Not used.
-  STOP("generate_continuation_for");
-  return NULL;
-}
-
 address TemplateInterpreterGenerator::generate_return_entry_for(TosState state, int step, size_t index_size) {
   address entry = __ pc();
 
diff -r 03e564780d23 -r 6a3bb9853fee hotspot/src/cpu/ppc/vm/templateInterpreterGenerator_ppc.cpp
--- a/hotspot/src/cpu/ppc/vm/templateInterpreterGenerator_ppc.cpp	Mon Feb 13 12:00:40 2017 -0500
+++ b/hotspot/src/cpu/ppc/vm/templateInterpreterGenerator_ppc.cpp	Mon Feb 13 17:26:26 2017 +0000
@@ -646,12 +646,6 @@
   return entry;
 }
 
-address TemplateInterpreterGenerator::generate_continuation_for(TosState state) {
-  address entry = __ pc();
-  __ unimplemented("generate_continuation_for");
-  return entry;
-}
-
 // This entry is returned to when a call returns to the interpreter.
 // When we arrive here, we expect that the callee stack frame is already popped.
 address TemplateInterpreterGenerator::generate_return_entry_for(TosState state, int step, size_t index_size) {
diff -r 03e564780d23 -r 6a3bb9853fee hotspot/src/cpu/s390/vm/templateInterpreterGenerator_s390.cpp
--- a/hotspot/src/cpu/s390/vm/templateInterpreterGenerator_s390.cpp	Mon Feb 13 12:00:40 2017 -0500
+++ b/hotspot/src/cpu/s390/vm/templateInterpreterGenerator_s390.cpp	Mon Feb 13 17:26:26 2017 +0000
@@ -642,13 +642,6 @@
   return entry;
 }
 
-// Unused, should never pass by.
-address TemplateInterpreterGenerator::generate_continuation_for (TosState state) {
-  address entry = __ pc();
-  __ should_not_reach_here();
-  return entry;
-}
-
 address TemplateInterpreterGenerator::generate_return_entry_for (TosState state, int step, size_t index_size) {
   address entry = __ pc();
 
diff -r 03e564780d23 -r 6a3bb9853fee hotspot/src/cpu/sparc/vm/templateInterpreterGenerator_sparc.cpp
--- a/hotspot/src/cpu/sparc/vm/templateInterpreterGenerator_sparc.cpp	Mon Feb 13 12:00:40 2017 -0500
+++ b/hotspot/src/cpu/sparc/vm/templateInterpreterGenerator_sparc.cpp	Mon Feb 13 17:26:26 2017 +0000
@@ -466,12 +466,6 @@
 }
 
 
-address TemplateInterpreterGenerator::generate_continuation_for(TosState state) {
-  address entry = __ pc();
-  __ dispatch_next(state);
-  return entry;
-}
-
 //
 // Helpers for commoning out cases in the various type of method entries.
 //
diff -r 03e564780d23 -r 6a3bb9853fee hotspot/src/cpu/x86/vm/templateInterpreterGenerator_x86.cpp
--- a/hotspot/src/cpu/x86/vm/templateInterpreterGenerator_x86.cpp	Mon Feb 13 12:00:40 2017 -0500
+++ b/hotspot/src/cpu/x86/vm/templateInterpreterGenerator_x86.cpp	Mon Feb 13 17:26:26 2017 +0000
@@ -171,16 +171,6 @@
   return entry;
 }
 
-
-address TemplateInterpreterGenerator::generate_continuation_for(TosState state) {
-  address entry = __ pc();
-  // NULL last_sp until next java call
-  __ movptr(Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize), (int32_t)NULL_WORD);
-  __ dispatch_next(state);
-  return entry;
-}
-
-
 address TemplateInterpreterGenerator::generate_return_entry_for(TosState state, int step, size_t index_size) {
   address entry = __ pc();
 
diff -r 03e564780d23 -r 6a3bb9853fee hotspot/src/share/vm/interpreter/templateInterpreter.cpp
--- a/hotspot/src/share/vm/interpreter/templateInterpreter.cpp	Mon Feb 13 12:00:40 2017 -0500
+++ b/hotspot/src/share/vm/interpreter/templateInterpreter.cpp	Mon Feb 13 17:26:26 2017 +0000
@@ -193,7 +193,6 @@
 EntryPoint TemplateInterpreter::_return_entry[TemplateInterpreter::number_of_return_entries];
 EntryPoint TemplateInterpreter::_earlyret_entry;
 EntryPoint TemplateInterpreter::_deopt_entry [TemplateInterpreter::number_of_deopt_entries ];
-EntryPoint TemplateInterpreter::_continuation_entry;
 EntryPoint TemplateInterpreter::_safept_entry;
 
 address TemplateInterpreter::_invoke_return_entry[TemplateInterpreter::number_of_return_addrs];
diff -r 03e564780d23 -r 6a3bb9853fee hotspot/src/share/vm/interpreter/templateInterpreter.hpp
--- a/hotspot/src/share/vm/interpreter/templateInterpreter.hpp	Mon Feb 13 12:00:40 2017 -0500
+++ b/hotspot/src/share/vm/interpreter/templateInterpreter.hpp	Mon Feb 13 17:26:26 2017 +0000
@@ -119,7 +119,6 @@
   static EntryPoint _return_entry[number_of_return_entries];    // entry points to return to from a call
   static EntryPoint _earlyret_entry;                            // entry point to return early from a call
   static EntryPoint _deopt_entry[number_of_deopt_entries];      // entry points to return to from a deoptimization
-  static EntryPoint _continuation_entry;
   static EntryPoint _safept_entry;
 
   static address _invoke_return_entry[number_of_return_addrs];           // for invokestatic, invokespecial, invokevirtual return entries
@@ -158,7 +157,6 @@
 #ifndef PRODUCT
   static address    trace_code    (TosState state)              { return _trace_code.entry(state); }
 #endif // !PRODUCT
-  static address    continuation  (TosState state)              { return _continuation_entry.entry(state); }
   static address*   dispatch_table(TosState state)              { return _active_table.table_for(state); }
   static address*   dispatch_table()                            { return _active_table.table_for(); }
   static int        distance_from_dispatch_table(TosState state){ return _active_table.distance_from(state); }
diff -r 03e564780d23 -r 6a3bb9853fee hotspot/src/share/vm/interpreter/templateInterpreterGenerator.cpp
--- a/hotspot/src/share/vm/interpreter/templateInterpreterGenerator.cpp	Mon Feb 13 12:00:40 2017 -0500
+++ b/hotspot/src/share/vm/interpreter/templateInterpreterGenerator.cpp	Mon Feb 13 17:26:26 2017 +0000
@@ -165,21 +165,6 @@
     }
   }
 
-  { CodeletMark cm(_masm, "continuation entry points");
-    Interpreter::_continuation_entry =
-      EntryPoint(
-                 generate_continuation_for(btos),
-                 generate_continuation_for(ztos),
-                 generate_continuation_for(ctos),
-                 generate_continuation_for(stos),
-                 generate_continuation_for(atos),
-                 generate_continuation_for(itos),
-                 generate_continuation_for(ltos),
-                 generate_continuation_for(ftos),
-                 generate_continuation_for(dtos),
-                 generate_continuation_for(vtos)
-                 );
-  }
 
   { CodeletMark cm(_masm, "safepoint entry points");
     Interpreter::_safept_entry =
diff -r 03e564780d23 -r 6a3bb9853fee hotspot/src/share/vm/interpreter/templateInterpreterGenerator.hpp
--- a/hotspot/src/share/vm/interpreter/templateInterpreterGenerator.hpp	Mon Feb 13 12:00:40 2017 -0500
+++ b/hotspot/src/share/vm/interpreter/templateInterpreterGenerator.hpp	Mon Feb 13 17:26:26 2017 +0000
@@ -52,7 +52,6 @@
   address generate_exception_handler_common(const char* name, const char* message, bool pass_oop);
   address generate_ClassCastException_handler();
   address generate_ArrayIndexOutOfBounds_handler(const char* name);
-  address generate_continuation_for(TosState state);
   address generate_return_entry_for(TosState state, int step, size_t index_size);
   address generate_earlyret_entry_for(TosState state);
   address generate_deopt_entry_for(TosState state, int step);