archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8169206: TemplateInterpreter::_continuation_entry is never referenced

Browse source 
TemplateInterpreter::_continuation_entry has been removed.

Reviewed-by: coleenp, dholmes, fparain
This commit is contained in:
Max Ockner 2017-02-13 10:37:33 -05:00
parent 6e88661a89
commit 697bec6baf
10 changed files with 0 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

8
hotspot/src/cpu/aarch64/vm/templateInterpreterGenerator_aarch64.cpp
View file

@ -402,14 +402,6 @@ address TemplateInterpreterGenerator::generate_exception_handler_common(
return entry; 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 TemplateInterpreterGenerator::generate_return_entry_for(TosState state, int step, size_t index_size) {
address entry = __ pc(); address entry = __ pc();

6
hotspot/src/cpu/arm/vm/templateInterpreterGenerator_arm.cpp
View file

@ -270,12 +270,6 @@ address TemplateInterpreterGenerator::generate_exception_handler_common(const ch
return entry; 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 TemplateInterpreterGenerator::generate_return_entry_for(TosState state, int step, size_t index_size) {
address entry = __ pc(); address entry = __ pc();

6
hotspot/src/cpu/ppc/vm/templateInterpreterGenerator_ppc.cpp
View file

@ -646,12 +646,6 @@ address TemplateInterpreterGenerator::generate_exception_handler_common(const ch
return entry; 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. // 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. // 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) { address TemplateInterpreterGenerator::generate_return_entry_for(TosState state, int step, size_t index_size) {

7
hotspot/src/cpu/s390/vm/templateInterpreterGenerator_s390.cpp
View file

@ -642,13 +642,6 @@ address TemplateInterpreterGenerator::generate_exception_handler_common(const ch
return entry; 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 TemplateInterpreterGenerator::generate_return_entry_for (TosState state, int step, size_t index_size) {
address entry = __ pc(); address entry = __ pc();

6
hotspot/src/cpu/sparc/vm/templateInterpreterGenerator_sparc.cpp
View file

@ -466,12 +466,6 @@ address TemplateInterpreterGenerator::generate_safept_entry_for(TosState state,
} }
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. // Helpers for commoning out cases in the various type of method entries.
// //

10
hotspot/src/cpu/x86/vm/templateInterpreterGenerator_x86.cpp
View file

@ -171,16 +171,6 @@ address TemplateInterpreterGenerator::generate_exception_handler_common(
return entry; 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 TemplateInterpreterGenerator::generate_return_entry_for(TosState state, int step, size_t index_size) {
address entry = __ pc(); address entry = __ pc();

1
hotspot/src/share/vm/interpreter/templateInterpreter.cpp
View file

@ -193,7 +193,6 @@ EntryPoint TemplateInterpreter::_trace_code;
EntryPoint TemplateInterpreter::_return_entry[TemplateInterpreter::number_of_return_entries]; EntryPoint TemplateInterpreter::_return_entry[TemplateInterpreter::number_of_return_entries];
EntryPoint TemplateInterpreter::_earlyret_entry; EntryPoint TemplateInterpreter::_earlyret_entry;
EntryPoint TemplateInterpreter::_deopt_entry [TemplateInterpreter::number_of_deopt_entries ]; EntryPoint TemplateInterpreter::_deopt_entry [TemplateInterpreter::number_of_deopt_entries ];
EntryPoint TemplateInterpreter::_continuation_entry;
EntryPoint TemplateInterpreter::_safept_entry; EntryPoint TemplateInterpreter::_safept_entry;
address TemplateInterpreter::_invoke_return_entry[TemplateInterpreter::number_of_return_addrs]; address TemplateInterpreter::_invoke_return_entry[TemplateInterpreter::number_of_return_addrs];

2
hotspot/src/share/vm/interpreter/templateInterpreter.hpp
View file

@ -119,7 +119,6 @@ class TemplateInterpreter: public AbstractInterpreter {
static EntryPoint _return_entry[number_of_return_entries]; // entry points to return to from a call 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 _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 _deopt_entry[number_of_deopt_entries]; // entry points to return to from a deoptimization
static EntryPoint _continuation_entry;
static EntryPoint _safept_entry; static EntryPoint _safept_entry;
static address _invoke_return_entry[number_of_return_addrs]; // for invokestatic, invokespecial, invokevirtual return entries static address _invoke_return_entry[number_of_return_addrs]; // for invokestatic, invokespecial, invokevirtual return entries
@ -158,7 +157,6 @@ class TemplateInterpreter: public AbstractInterpreter {
#ifndef PRODUCT #ifndef PRODUCT
static address trace_code (TosState state) { return _trace_code.entry(state); } static address trace_code (TosState state) { return _trace_code.entry(state); }
#endif // !PRODUCT #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(TosState state) { return _active_table.table_for(state); }
static address* dispatch_table() { return _active_table.table_for(); } static address* dispatch_table() { return _active_table.table_for(); }
static int distance_from_dispatch_table(TosState state){ return _active_table.distance_from(state); } static int distance_from_dispatch_table(TosState state){ return _active_table.distance_from(state); }

15
hotspot/src/share/vm/interpreter/templateInterpreterGenerator.cpp
View file

@ -165,21 +165,6 @@ void TemplateInterpreterGenerator::generate_all() {
} }
} }
{ 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"); { CodeletMark cm(_masm, "safepoint entry points");
Interpreter::_safept_entry = Interpreter::_safept_entry =

1
hotspot/src/share/vm/interpreter/templateInterpreterGenerator.hpp
View file

@ -52,7 +52,6 @@ class TemplateInterpreterGenerator: public AbstractInterpreterGenerator {
address generate_exception_handler_common(const char* name, const char* message, bool pass_oop); address generate_exception_handler_common(const char* name, const char* message, bool pass_oop);
address generate_ClassCastException_handler(); address generate_ClassCastException_handler();
address generate_ArrayIndexOutOfBounds_handler(const char* name); 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_return_entry_for(TosState state, int step, size_t index_size);
address generate_earlyret_entry_for(TosState state); address generate_earlyret_entry_for(TosState state);
address generate_deopt_entry_for(TosState state, int step); address generate_deopt_entry_for(TosState state, int step);