diff --git a/src/hotspot/cpu/aarch64/universalNativeInvoker_aarch64.cpp b/src/hotspot/cpu/aarch64/downcallLinker_aarch64.cpp
similarity index 91%
rename from src/hotspot/cpu/aarch64/universalNativeInvoker_aarch64.cpp
rename to src/hotspot/cpu/aarch64/downcallLinker_aarch64.cpp
index 3e973c9a22773..4266409cebb7c 100644
--- a/src/hotspot/cpu/aarch64/universalNativeInvoker_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/downcallLinker_aarch64.cpp
@@ -30,12 +30,12 @@
#include "compiler/oopMap.hpp"
#include "logging/logStream.hpp"
#include "memory/resourceArea.hpp"
-#include "prims/universalNativeInvoker.hpp"
+#include "prims/downcallLinker.hpp"
#include "runtime/stubCodeGenerator.hpp"
#define __ _masm->
-class NativeInvokerGenerator : public StubCodeGenerator {
+class DowncallStubGenerator : public StubCodeGenerator {
BasicType* _signature;
int _num_args;
BasicType _ret_bt;
@@ -50,7 +50,7 @@ class NativeInvokerGenerator : public StubCodeGenerator {
int _framesize;
OopMapSet* _oop_maps;
public:
- NativeInvokerGenerator(CodeBuffer* buffer,
+ DowncallStubGenerator(CodeBuffer* buffer,
BasicType* signature,
int num_args,
BasicType ret_bt,
@@ -88,16 +88,16 @@ class NativeInvokerGenerator : public StubCodeGenerator {
static const int native_invoker_code_size = 1024;
-RuntimeStub* ProgrammableInvoker::make_native_invoker(BasicType* signature,
- int num_args,
- BasicType ret_bt,
- const ABIDescriptor& abi,
- const GrowableArray<VMReg>& input_registers,
- const GrowableArray<VMReg>& output_registers,
- bool needs_return_buffer) {
+RuntimeStub* DowncallLinker::make_downcall_stub(BasicType* signature,
+ int num_args,
+ BasicType ret_bt,
+ const ABIDescriptor& abi,
+ const GrowableArray<VMReg>& input_registers,
+ const GrowableArray<VMReg>& output_registers,
+ bool needs_return_buffer) {
int locs_size = 64;
CodeBuffer code("nep_invoker_blob", native_invoker_code_size, locs_size);
- NativeInvokerGenerator g(&code, signature, num_args, ret_bt, abi, input_registers, output_registers, needs_return_buffer);
+ DowncallStubGenerator g(&code, signature, num_args, ret_bt, abi, input_registers, output_registers, needs_return_buffer);
g.generate();
code.log_section_sizes("nep_invoker_blob");
@@ -120,7 +120,7 @@ RuntimeStub* ProgrammableInvoker::make_native_invoker(BasicType* signature,
return stub;
}
-void NativeInvokerGenerator::generate() {
+void DowncallStubGenerator::generate() {
enum layout {
rfp_off,
rfp_off2,
diff --git a/src/hotspot/cpu/aarch64/foreign_globals_aarch64.cpp b/src/hotspot/cpu/aarch64/foreignGlobals_aarch64.cpp
similarity index 98%
rename from src/hotspot/cpu/aarch64/foreign_globals_aarch64.cpp
rename to src/hotspot/cpu/aarch64/foreignGlobals_aarch64.cpp
index 549d39f6d46b1..86d6a4dca877b 100644
--- a/src/hotspot/cpu/aarch64/foreign_globals_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/foreignGlobals_aarch64.cpp
@@ -29,8 +29,8 @@
#include "oops/typeArrayOop.inline.hpp"
#include "oops/oopCast.inline.hpp"
#include "opto/matcher.hpp"
-#include "prims/foreign_globals.hpp"
-#include "prims/foreign_globals.inline.hpp"
+#include "prims/foreignGlobals.hpp"
+#include "prims/foreignGlobals.inline.hpp"
#include "utilities/formatBuffer.hpp"
bool ABIDescriptor::is_volatile_reg(Register reg) const {
diff --git a/src/hotspot/cpu/aarch64/foreign_globals_aarch64.hpp b/src/hotspot/cpu/aarch64/foreignGlobals_aarch64.hpp
similarity index 100%
rename from src/hotspot/cpu/aarch64/foreign_globals_aarch64.hpp
rename to src/hotspot/cpu/aarch64/foreignGlobals_aarch64.hpp
diff --git a/src/hotspot/cpu/aarch64/frame_aarch64.cpp b/src/hotspot/cpu/aarch64/frame_aarch64.cpp
index 71e056e0ea4e2..cbde4e81688b4 100644
--- a/src/hotspot/cpu/aarch64/frame_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/frame_aarch64.cpp
@@ -118,7 +118,7 @@ bool frame::safe_for_sender(JavaThread *thread) {
if (is_entry_frame()) {
// an entry frame must have a valid fp.
return fp_safe && is_entry_frame_valid(thread);
- } else if (is_optimized_entry_frame()) {
+ } else if (is_upcall_stub_frame()) {
return fp_safe;
}
@@ -222,7 +222,7 @@ bool frame::safe_for_sender(JavaThread *thread) {
address jcw = (address)sender.entry_frame_call_wrapper();
return thread->is_in_stack_range_excl(jcw, (address)sender.fp());
- } else if (sender_blob->is_optimized_entry_blob()) {
+ } else if (sender_blob->is_upcall_stub()) {
return false;
}
@@ -372,27 +372,27 @@ frame frame::sender_for_entry_frame(RegisterMap* map) const {
return fr;
}
-OptimizedEntryBlob::FrameData* OptimizedEntryBlob::frame_data_for_frame(const frame& frame) const {
- assert(frame.is_optimized_entry_frame(), "wrong frame");
+UpcallStub::FrameData* UpcallStub::frame_data_for_frame(const frame& frame) const {
+ assert(frame.is_upcall_stub_frame(), "wrong frame");
// need unextended_sp here, since normal sp is wrong for interpreter callees
- return reinterpret_cast<OptimizedEntryBlob::FrameData*>(
+ return reinterpret_cast<UpcallStub::FrameData*>(
reinterpret_cast<address>(frame.unextended_sp()) + in_bytes(_frame_data_offset));
}
-bool frame::optimized_entry_frame_is_first() const {
- assert(is_optimized_entry_frame(), "must be optimzed entry frame");
- OptimizedEntryBlob* blob = _cb->as_optimized_entry_blob();
+bool frame::upcall_stub_frame_is_first() const {
+ assert(is_upcall_stub_frame(), "must be optimzed entry frame");
+ UpcallStub* blob = _cb->as_upcall_stub();
JavaFrameAnchor* jfa = blob->jfa_for_frame(*this);
return jfa->last_Java_sp() == NULL;
}
-frame frame::sender_for_optimized_entry_frame(RegisterMap* map) const {
+frame frame::sender_for_upcall_stub_frame(RegisterMap* map) const {
assert(map != NULL, "map must be set");
- OptimizedEntryBlob* blob = _cb->as_optimized_entry_blob();
+ UpcallStub* blob = _cb->as_upcall_stub();
// Java frame called from C; skip all C frames and return top C
// frame of that chunk as the sender
JavaFrameAnchor* jfa = blob->jfa_for_frame(*this);
- assert(!optimized_entry_frame_is_first(), "must have a frame anchor to go back to");
+ assert(!upcall_stub_frame_is_first(), "must have a frame anchor to go back to");
assert(jfa->last_Java_sp() > sp(), "must be above this frame on stack");
// Since we are walking the stack now this nested anchor is obviously walkable
// even if it wasn't when it was stacked.
diff --git a/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp b/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp
index 1d9e98d2e5180..f6d880fd7fd37 100644
--- a/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp
+++ b/src/hotspot/cpu/aarch64/frame_aarch64.inline.hpp
@@ -397,9 +397,9 @@ inline frame frame::sender_raw(RegisterMap* map) const {
return map->stack_chunk()->sender(*this, map);
}
- if (is_entry_frame()) return sender_for_entry_frame(map);
- if (is_optimized_entry_frame()) return sender_for_optimized_entry_frame(map);
- if (is_interpreted_frame()) return sender_for_interpreter_frame(map);
+ if (is_entry_frame()) return sender_for_entry_frame(map);
+ if (is_upcall_stub_frame()) return sender_for_upcall_stub_frame(map);
+ if (is_interpreted_frame()) return sender_for_interpreter_frame(map);
assert(_cb == CodeCache::find_blob(pc()), "Must be the same");
if (_cb != NULL) return sender_for_compiled_frame(map);
diff --git a/src/hotspot/cpu/aarch64/methodHandles_aarch64.cpp b/src/hotspot/cpu/aarch64/methodHandles_aarch64.cpp
index b17bc69a5f0b3..093d4bb030990 100644
--- a/src/hotspot/cpu/aarch64/methodHandles_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/methodHandles_aarch64.cpp
@@ -266,7 +266,7 @@ void MethodHandles::jump_to_native_invoker(MacroAssembler* _masm, Register nep_r
// Load the invoker, as NEP -> .invoker
__ verify_oop(nep_reg);
__ access_load_at(T_ADDRESS, IN_HEAP, temp_target,
- Address(nep_reg, NONZERO(jdk_internal_foreign_abi_NativeEntryPoint::invoker_offset_in_bytes())),
+ Address(nep_reg, NONZERO(jdk_internal_foreign_abi_NativeEntryPoint::downcall_stub_address_offset_in_bytes())),
noreg, noreg);
__ br(temp_target);
diff --git a/src/hotspot/cpu/aarch64/universalUpcallHandler_aarch64.cpp b/src/hotspot/cpu/aarch64/upcallLinker_aarch64.cpp
similarity index 87%
rename from src/hotspot/cpu/aarch64/universalUpcallHandler_aarch64.cpp
rename to src/hotspot/cpu/aarch64/upcallLinker_aarch64.cpp
index 55f95a0752227..efce9001f27a5 100644
--- a/src/hotspot/cpu/aarch64/universalUpcallHandler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/upcallLinker_aarch64.cpp
@@ -26,7 +26,7 @@
#include "asm/macroAssembler.hpp"
#include "logging/logStream.hpp"
#include "memory/resourceArea.hpp"
-#include "prims/universalUpcallHandler.hpp"
+#include "prims/upcallLinker.hpp"
#include "runtime/sharedRuntime.hpp"
#include "runtime/signature.hpp"
#include "runtime/signature.hpp"
@@ -115,16 +115,16 @@ static void restore_callee_saved_registers(MacroAssembler* _masm, const ABIDescr
__ block_comment("} restore_callee_saved_regs ");
}
-address ProgrammableUpcallHandler::generate_optimized_upcall_stub(jobject receiver, Method* entry,
- BasicType* in_sig_bt, int total_in_args,
- BasicType* out_sig_bt, int total_out_args,
- BasicType ret_type,
- jobject jabi, jobject jconv,
- bool needs_return_buffer, int ret_buf_size) {
+address UpcallLinker::make_upcall_stub(jobject receiver, Method* entry,
+ BasicType* in_sig_bt, int total_in_args,
+ BasicType* out_sig_bt, int total_out_args,
+ BasicType ret_type,
+ jobject jabi, jobject jconv,
+ bool needs_return_buffer, int ret_buf_size) {
ResourceMark rm;
const ABIDescriptor abi = ForeignGlobals::parse_abi_descriptor(jabi);
const CallRegs call_regs = ForeignGlobals::parse_call_regs(jconv);
- CodeBuffer buffer("upcall_stub_linkToNative", /* code_size = */ 2048, /* locs_size = */ 1024);
+ CodeBuffer buffer("upcall_stub", /* code_size = */ 2048, /* locs_size = */ 1024);
Register shuffle_reg = r19;
JavaCallingConvention out_conv;
@@ -157,7 +157,7 @@ address ProgrammableUpcallHandler::generate_optimized_upcall_stub(jobject receiv
int arg_save_area_offset = res_save_area_offset + result_spiller.spill_size_bytes();
int reg_save_area_offset = arg_save_area_offset + arg_spilller.spill_size_bytes();
int frame_data_offset = reg_save_area_offset + reg_save_area_size;
- int frame_bottom_offset = frame_data_offset + sizeof(OptimizedEntryBlob::FrameData);
+ int frame_bottom_offset = frame_data_offset + sizeof(UpcallStub::FrameData);
int ret_buf_offset = -1;
if (needs_return_buffer) {
@@ -209,7 +209,7 @@ address ProgrammableUpcallHandler::generate_optimized_upcall_stub(jobject receiv
__ block_comment("{ on_entry");
__ lea(c_rarg0, Address(sp, frame_data_offset));
- __ movptr(rscratch1, CAST_FROM_FN_PTR(uint64_t, ProgrammableUpcallHandler::on_entry));
+ __ movptr(rscratch1, CAST_FROM_FN_PTR(uint64_t, UpcallLinker::on_entry));
__ blr(rscratch1);
__ mov(rthread, r0);
__ reinit_heapbase();
@@ -286,7 +286,7 @@ address ProgrammableUpcallHandler::generate_optimized_upcall_stub(jobject receiv
__ block_comment("{ on_exit");
__ lea(c_rarg0, Address(sp, frame_data_offset));
// stack already aligned
- __ movptr(rscratch1, CAST_FROM_FN_PTR(uint64_t, ProgrammableUpcallHandler::on_exit));
+ __ movptr(rscratch1, CAST_FROM_FN_PTR(uint64_t, UpcallLinker::on_exit));
__ blr(rscratch1);
__ block_comment("} on_exit");
@@ -306,7 +306,7 @@ address ProgrammableUpcallHandler::generate_optimized_upcall_stub(jobject receiv
// Native caller has no idea how to handle exceptions,
// so we just crash here. Up to callee to catch exceptions.
__ verify_oop(r0);
- __ movptr(rscratch1, CAST_FROM_FN_PTR(uint64_t, ProgrammableUpcallHandler::handle_uncaught_exception));
+ __ movptr(rscratch1, CAST_FROM_FN_PTR(uint64_t, UpcallLinker::handle_uncaught_exception));
__ blr(rscratch1);
__ should_not_reach_here();
@@ -316,18 +316,18 @@ address ProgrammableUpcallHandler::generate_optimized_upcall_stub(jobject receiv
#ifndef PRODUCT
stringStream ss;
- ss.print("optimized_upcall_stub_%s", entry->signature()->as_C_string());
+ ss.print("upcall_stub_%s", entry->signature()->as_C_string());
const char* name = _masm->code_string(ss.as_string());
#else // PRODUCT
- const char* name = "optimized_upcall_stub";
+ const char* name = "upcall_stub";
#endif // PRODUCT
- OptimizedEntryBlob* blob
- = OptimizedEntryBlob::create(name,
- &buffer,
- exception_handler_offset,
- receiver,
- in_ByteSize(frame_data_offset));
+ UpcallStub* blob
+ = UpcallStub::create(name,
+ &buffer,
+ exception_handler_offset,
+ receiver,
+ in_ByteSize(frame_data_offset));
if (TraceOptimizedUpcallStubs) {
blob->print_on(tty);
diff --git a/src/hotspot/cpu/arm/universalNativeInvoker_arm.cpp b/src/hotspot/cpu/arm/downcallLinker_arm.cpp
similarity index 64%
rename from src/hotspot/cpu/arm/universalNativeInvoker_arm.cpp
rename to src/hotspot/cpu/arm/downcallLinker_arm.cpp
index aa05a1230bf07..af69f2a58a684 100644
--- a/src/hotspot/cpu/arm/universalNativeInvoker_arm.cpp
+++ b/src/hotspot/cpu/arm/downcallLinker_arm.cpp
@@ -22,16 +22,16 @@
*/
#include "precompiled.hpp"
-#include "prims/universalNativeInvoker.hpp"
+#include "prims/downcallLinker.hpp"
#include "utilities/debug.hpp"
-RuntimeStub* ProgrammableInvoker::make_native_invoker(BasicType* signature,
- int num_args,
- BasicType ret_bt,
- const ABIDescriptor& abi,
- const GrowableArray<VMReg>& input_registers,
- const GrowableArray<VMReg>& output_registers,
- bool needs_return_buffer) {
+RuntimeStub* DowncallLinker::make_downcall_stub(BasicType* signature,
+ int num_args,
+ BasicType ret_bt,
+ const ABIDescriptor& abi,
+ const GrowableArray<VMReg>& input_registers,
+ const GrowableArray<VMReg>& output_registers,
+ bool needs_return_buffer) {
Unimplemented();
return nullptr;
}
diff --git a/src/hotspot/cpu/s390/foreign_globals_s390.cpp b/src/hotspot/cpu/arm/foreignGlobals_arm.cpp
similarity index 97%
rename from src/hotspot/cpu/s390/foreign_globals_s390.cpp
rename to src/hotspot/cpu/arm/foreignGlobals_arm.cpp
index c3b01ea56d579..918e89f3ee6af 100644
--- a/src/hotspot/cpu/s390/foreign_globals_s390.cpp
+++ b/src/hotspot/cpu/arm/foreignGlobals_arm.cpp
@@ -23,7 +23,7 @@
#include "precompiled.hpp"
#include "code/vmreg.hpp"
-#include "prims/foreign_globals.hpp"
+#include "prims/foreignGlobals.hpp"
#include "utilities/debug.hpp"
class MacroAssembler;
diff --git a/src/hotspot/cpu/arm/foreign_globals_arm.hpp b/src/hotspot/cpu/arm/foreignGlobals_arm.hpp
similarity index 100%
rename from src/hotspot/cpu/arm/foreign_globals_arm.hpp
rename to src/hotspot/cpu/arm/foreignGlobals_arm.hpp
diff --git a/src/hotspot/cpu/arm/frame_arm.cpp b/src/hotspot/cpu/arm/frame_arm.cpp
index 2b97da814de60..863c1fce4a82e 100644
--- a/src/hotspot/cpu/arm/frame_arm.cpp
+++ b/src/hotspot/cpu/arm/frame_arm.cpp
@@ -311,12 +311,12 @@ frame frame::sender_for_entry_frame(RegisterMap* map) const {
return fr;
}
-OptimizedEntryBlob::FrameData* OptimizedEntryBlob::frame_data_for_frame(const frame& frame) const {
+UpcallStub::FrameData* UpcallStub::frame_data_for_frame(const frame& frame) const {
ShouldNotCallThis();
return nullptr;
}
-bool frame::optimized_entry_frame_is_first() const {
+bool frame::upcall_stub_frame_is_first() const {
ShouldNotCallThis();
return false;
}
diff --git a/src/hotspot/cpu/arm/universalUpcallHandle_arm.cpp b/src/hotspot/cpu/arm/upcallLinker_arm.cpp
similarity index 63%
rename from src/hotspot/cpu/arm/universalUpcallHandle_arm.cpp
rename to src/hotspot/cpu/arm/upcallLinker_arm.cpp
index 5b54ee0b1c136..3e1fb04218b51 100644
--- a/src/hotspot/cpu/arm/universalUpcallHandle_arm.cpp
+++ b/src/hotspot/cpu/arm/upcallLinker_arm.cpp
@@ -22,15 +22,15 @@
*/
#include "precompiled.hpp"
-#include "prims/universalUpcallHandler.hpp"
+#include "prims/upcallLinker.hpp"
#include "utilities/debug.hpp"
-address ProgrammableUpcallHandler::generate_optimized_upcall_stub(jobject receiver, Method* entry,
- BasicType* in_sig_bt, int total_in_args,
- BasicType* out_sig_bt, int total_out_args,
- BasicType ret_type,
- jobject jabi, jobject jconv,
- bool needs_return_buffer, int ret_buf_size) {
+address UpcallLinker::make_upcall_stub(jobject receiver, Method* entry,
+ BasicType* in_sig_bt, int total_in_args,
+ BasicType* out_sig_bt, int total_out_args,
+ BasicType ret_type,
+ jobject jabi, jobject jconv,
+ bool needs_return_buffer, int ret_buf_size) {
ShouldNotCallThis();
return nullptr;
}
diff --git a/src/hotspot/cpu/ppc/universalNativeInvoker_ppc.cpp b/src/hotspot/cpu/ppc/downcallLinker_ppc.cpp
similarity index 66%
rename from src/hotspot/cpu/ppc/universalNativeInvoker_ppc.cpp
rename to src/hotspot/cpu/ppc/downcallLinker_ppc.cpp
index 3f35af95349aa..86afc73e2868d 100644
--- a/src/hotspot/cpu/ppc/universalNativeInvoker_ppc.cpp
+++ b/src/hotspot/cpu/ppc/downcallLinker_ppc.cpp
@@ -23,16 +23,16 @@
*/
#include "precompiled.hpp"
-#include "prims/universalNativeInvoker.hpp"
+#include "prims/downcallLinker.hpp"
#include "utilities/debug.hpp"
-RuntimeStub* ProgrammableInvoker::make_native_invoker(BasicType* signature,
- int num_args,
- BasicType ret_bt,
- const ABIDescriptor& abi,
- const GrowableArray<VMReg>& input_registers,
- const GrowableArray<VMReg>& output_registers,
- bool needs_return_buffer) {
+RuntimeStub* DowncallLinker::make_downcall_stub(BasicType* signature,
+ int num_args,
+ BasicType ret_bt,
+ const ABIDescriptor& abi,
+ const GrowableArray<VMReg>& input_registers,
+ const GrowableArray<VMReg>& output_registers,
+ bool needs_return_buffer) {
Unimplemented();
return nullptr;
}
diff --git a/src/hotspot/cpu/ppc/foreign_globals_ppc.cpp b/src/hotspot/cpu/ppc/foreignGlobals_ppc.cpp
similarity index 98%
rename from src/hotspot/cpu/ppc/foreign_globals_ppc.cpp
rename to src/hotspot/cpu/ppc/foreignGlobals_ppc.cpp
index ae06d4dc55bdb..53eb53ec7cbac 100644
--- a/src/hotspot/cpu/ppc/foreign_globals_ppc.cpp
+++ b/src/hotspot/cpu/ppc/foreignGlobals_ppc.cpp
@@ -24,7 +24,7 @@
#include "precompiled.hpp"
#include "code/vmreg.hpp"
-#include "prims/foreign_globals.hpp"
+#include "prims/foreignGlobals.hpp"
#include "utilities/debug.hpp"
class MacroAssembler;
diff --git a/src/hotspot/cpu/ppc/foreign_globals_ppc.hpp b/src/hotspot/cpu/ppc/foreignGlobals_ppc.hpp
similarity index 100%
rename from src/hotspot/cpu/ppc/foreign_globals_ppc.hpp
rename to src/hotspot/cpu/ppc/foreignGlobals_ppc.hpp
diff --git a/src/hotspot/cpu/ppc/frame_ppc.cpp b/src/hotspot/cpu/ppc/frame_ppc.cpp
index 291d8eb298dd7..c090d50337c39 100644
--- a/src/hotspot/cpu/ppc/frame_ppc.cpp
+++ b/src/hotspot/cpu/ppc/frame_ppc.cpp
@@ -204,12 +204,12 @@ frame frame::sender_for_entry_frame(RegisterMap *map) const {
return fr;
}
-OptimizedEntryBlob::FrameData* OptimizedEntryBlob::frame_data_for_frame(const frame& frame) const {
+UpcallStub::FrameData* UpcallStub::frame_data_for_frame(const frame& frame) const {
ShouldNotCallThis();
return nullptr;
}
-bool frame::optimized_entry_frame_is_first() const {
+bool frame::upcall_stub_frame_is_first() const {
ShouldNotCallThis();
return false;
}
diff --git a/src/hotspot/cpu/ppc/universalUpcallHandle_ppc.cpp b/src/hotspot/cpu/ppc/upcallLinker_ppc.cpp
similarity index 65%
rename from src/hotspot/cpu/ppc/universalUpcallHandle_ppc.cpp
rename to src/hotspot/cpu/ppc/upcallLinker_ppc.cpp
index eb3b7567ced6a..914ea56851e4c 100644
--- a/src/hotspot/cpu/ppc/universalUpcallHandle_ppc.cpp
+++ b/src/hotspot/cpu/ppc/upcallLinker_ppc.cpp
@@ -23,15 +23,15 @@
*/
#include "precompiled.hpp"
-#include "prims/universalUpcallHandler.hpp"
+#include "prims/upcallLinker.hpp"
#include "utilities/debug.hpp"
-address ProgrammableUpcallHandler::generate_optimized_upcall_stub(jobject receiver, Method* entry,
- BasicType* in_sig_bt, int total_in_args,
- BasicType* out_sig_bt, int total_out_args,
- BasicType ret_type,
- jobject jabi, jobject jconv,
- bool needs_return_buffer, int ret_buf_size) {
+address UpcallLinker::make_upcall_stub(jobject receiver, Method* entry,
+ BasicType* in_sig_bt, int total_in_args,
+ BasicType* out_sig_bt, int total_out_args,
+ BasicType ret_type,
+ jobject jabi, jobject jconv,
+ bool needs_return_buffer, int ret_buf_size) {
ShouldNotCallThis();
return nullptr;
}
diff --git a/src/hotspot/cpu/riscv/universalNativeInvoker_riscv.cpp b/src/hotspot/cpu/riscv/downcallLinker_riscv.cpp
similarity index 68%
rename from src/hotspot/cpu/riscv/universalNativeInvoker_riscv.cpp
rename to src/hotspot/cpu/riscv/downcallLinker_riscv.cpp
index ffb1f55941870..8f798b2e5b768 100644
--- a/src/hotspot/cpu/riscv/universalNativeInvoker_riscv.cpp
+++ b/src/hotspot/cpu/riscv/downcallLinker_riscv.cpp
@@ -27,13 +27,13 @@
#include "prims/universalNativeInvoker.hpp"
#include "utilities/debug.hpp"
-RuntimeStub* ProgrammableInvoker::make_native_invoker(BasicType* signature,
- int num_args,
- BasicType ret_bt,
- const ABIDescriptor& abi,
- const GrowableArray<VMReg>& input_registers,
- const GrowableArray<VMReg>& output_registers,
- bool needs_return_buffer) {
+RuntimeStub* DowncallLinker::make_native_invoker(BasicType* signature,
+ int num_args,
+ BasicType ret_bt,
+ const ABIDescriptor& abi,
+ const GrowableArray<VMReg>& input_registers,
+ const GrowableArray<VMReg>& output_registers,
+ bool needs_return_buffer) {
Unimplemented();
return nullptr;
}
diff --git a/src/hotspot/cpu/riscv/foreign_globals_riscv.cpp b/src/hotspot/cpu/riscv/foreignGlobals_riscv.cpp
similarity index 98%
rename from src/hotspot/cpu/riscv/foreign_globals_riscv.cpp
rename to src/hotspot/cpu/riscv/foreignGlobals_riscv.cpp
index 2e9ce65742183..a239ed40df334 100644
--- a/src/hotspot/cpu/riscv/foreign_globals_riscv.cpp
+++ b/src/hotspot/cpu/riscv/foreignGlobals_riscv.cpp
@@ -25,7 +25,7 @@
#include "precompiled.hpp"
#include "code/vmreg.hpp"
-#include "prims/foreign_globals.hpp"
+#include "prims/foreignGlobals.hpp"
#include "utilities/debug.hpp"
class MacroAssembler;
diff --git a/src/hotspot/cpu/riscv/foreign_globals_riscv.hpp b/src/hotspot/cpu/riscv/foreignGlobals_riscv.hpp
similarity index 100%
rename from src/hotspot/cpu/riscv/foreign_globals_riscv.hpp
rename to src/hotspot/cpu/riscv/foreignGlobals_riscv.hpp
diff --git a/src/hotspot/cpu/riscv/frame_riscv.cpp b/src/hotspot/cpu/riscv/frame_riscv.cpp
index 1b8ab135d1060..d545571806937 100644
--- a/src/hotspot/cpu/riscv/frame_riscv.cpp
+++ b/src/hotspot/cpu/riscv/frame_riscv.cpp
@@ -343,17 +343,17 @@ frame frame::sender_for_entry_frame(RegisterMap* map) const {
return fr;
}
-OptimizedEntryBlob::FrameData* OptimizedEntryBlob::frame_data_for_frame(const frame& frame) const {
+UpcallStub::FrameData* UpcallStub::frame_data_for_frame(const frame& frame) const {
ShouldNotCallThis();
return nullptr;
}
-bool frame::optimized_entry_frame_is_first() const {
+bool frame::upcall_stub_frame_is_first() const {
ShouldNotCallThis();
return false;
}
-frame frame::sender_for_optimized_entry_frame(RegisterMap* map) const {
+frame frame::sender_for_upcall_stub_frame(RegisterMap* map) const {
ShouldNotCallThis();
return {};
}
diff --git a/src/hotspot/cpu/riscv/universalUpcallHandle_riscv.cpp b/src/hotspot/cpu/riscv/upcallLinker_riscv.cpp
similarity index 65%
rename from src/hotspot/cpu/riscv/universalUpcallHandle_riscv.cpp
rename to src/hotspot/cpu/riscv/upcallLinker_riscv.cpp
index e7f187de58581..91cabc8b6a043 100644
--- a/src/hotspot/cpu/riscv/universalUpcallHandle_riscv.cpp
+++ b/src/hotspot/cpu/riscv/upcallLinker_riscv.cpp
@@ -24,15 +24,15 @@
*/
#include "precompiled.hpp"
-#include "prims/universalUpcallHandler.hpp"
+#include "prims/upcallLinker.hpp"
#include "utilities/debug.hpp"
-address ProgrammableUpcallHandler::generate_optimized_upcall_stub(jobject receiver, Method* entry,
- BasicType* in_sig_bt, int total_in_args,
- BasicType* out_sig_bt, int total_out_args,
- BasicType ret_type,
- jobject jabi, jobject jconv,
- bool needs_return_buffer, int ret_buf_size) {
+address UpcallLinker::make_upcall_stub(jobject receiver, Method* entry,
+ BasicType* in_sig_bt, int total_in_args,
+ BasicType* out_sig_bt, int total_out_args,
+ BasicType ret_type,
+ jobject jabi, jobject jconv,
+ bool needs_return_buffer, int ret_buf_size) {
ShouldNotCallThis();
return nullptr;
-}
\ No newline at end of file
+}
diff --git a/src/hotspot/cpu/s390/universalNativeInvoker_s390.cpp b/src/hotspot/cpu/s390/downcallLinker_s390.cpp
similarity index 64%
rename from src/hotspot/cpu/s390/universalNativeInvoker_s390.cpp
rename to src/hotspot/cpu/s390/downcallLinker_s390.cpp
index aa05a1230bf07..af69f2a58a684 100644
--- a/src/hotspot/cpu/s390/universalNativeInvoker_s390.cpp
+++ b/src/hotspot/cpu/s390/downcallLinker_s390.cpp
@@ -22,16 +22,16 @@
*/
#include "precompiled.hpp"
-#include "prims/universalNativeInvoker.hpp"
+#include "prims/downcallLinker.hpp"
#include "utilities/debug.hpp"
-RuntimeStub* ProgrammableInvoker::make_native_invoker(BasicType* signature,
- int num_args,
- BasicType ret_bt,
- const ABIDescriptor& abi,
- const GrowableArray<VMReg>& input_registers,
- const GrowableArray<VMReg>& output_registers,
- bool needs_return_buffer) {
+RuntimeStub* DowncallLinker::make_downcall_stub(BasicType* signature,
+ int num_args,
+ BasicType ret_bt,
+ const ABIDescriptor& abi,
+ const GrowableArray<VMReg>& input_registers,
+ const GrowableArray<VMReg>& output_registers,
+ bool needs_return_buffer) {
Unimplemented();
return nullptr;
}
diff --git a/src/hotspot/cpu/arm/foreign_globals_arm.cpp b/src/hotspot/cpu/s390/foreignGlobals_s390.cpp
similarity index 97%
rename from src/hotspot/cpu/arm/foreign_globals_arm.cpp
rename to src/hotspot/cpu/s390/foreignGlobals_s390.cpp
index c3b01ea56d579..918e89f3ee6af 100644
--- a/src/hotspot/cpu/arm/foreign_globals_arm.cpp
+++ b/src/hotspot/cpu/s390/foreignGlobals_s390.cpp
@@ -23,7 +23,7 @@
#include "precompiled.hpp"
#include "code/vmreg.hpp"
-#include "prims/foreign_globals.hpp"
+#include "prims/foreignGlobals.hpp"
#include "utilities/debug.hpp"
class MacroAssembler;
diff --git a/src/hotspot/cpu/s390/foreign_globals_s390.hpp b/src/hotspot/cpu/s390/foreignGlobals_s390.hpp
similarity index 100%
rename from src/hotspot/cpu/s390/foreign_globals_s390.hpp
rename to src/hotspot/cpu/s390/foreignGlobals_s390.hpp
diff --git a/src/hotspot/cpu/s390/frame_s390.cpp b/src/hotspot/cpu/s390/frame_s390.cpp
index dc964f8dc7803..84b4cb08fbe1e 100644
--- a/src/hotspot/cpu/s390/frame_s390.cpp
+++ b/src/hotspot/cpu/s390/frame_s390.cpp
@@ -215,12 +215,12 @@ frame frame::sender_for_entry_frame(RegisterMap *map) const {
return fr;
}
-OptimizedEntryBlob::FrameData* OptimizedEntryBlob::frame_data_for_frame(const frame& frame) const {
+UpcallStub::FrameData* UpcallStub::frame_data_for_frame(const frame& frame) const {
ShouldNotCallThis();
return nullptr;
}
-bool frame::optimized_entry_frame_is_first() const {
+bool frame::upcall_stub_frame_is_first() const {
ShouldNotCallThis();
return false;
}
diff --git a/src/hotspot/cpu/s390/universalUpcallHandle_s390.cpp b/src/hotspot/cpu/s390/upcallLinker_s390.cpp
similarity index 63%
rename from src/hotspot/cpu/s390/universalUpcallHandle_s390.cpp
rename to src/hotspot/cpu/s390/upcallLinker_s390.cpp
index 5b54ee0b1c136..3e1fb04218b51 100644
--- a/src/hotspot/cpu/s390/universalUpcallHandle_s390.cpp
+++ b/src/hotspot/cpu/s390/upcallLinker_s390.cpp
@@ -22,15 +22,15 @@
*/
#include "precompiled.hpp"
-#include "prims/universalUpcallHandler.hpp"
+#include "prims/upcallLinker.hpp"
#include "utilities/debug.hpp"
-address ProgrammableUpcallHandler::generate_optimized_upcall_stub(jobject receiver, Method* entry,
- BasicType* in_sig_bt, int total_in_args,
- BasicType* out_sig_bt, int total_out_args,
- BasicType ret_type,
- jobject jabi, jobject jconv,
- bool needs_return_buffer, int ret_buf_size) {
+address UpcallLinker::make_upcall_stub(jobject receiver, Method* entry,
+ BasicType* in_sig_bt, int total_in_args,
+ BasicType* out_sig_bt, int total_out_args,
+ BasicType ret_type,
+ jobject jabi, jobject jconv,
+ bool needs_return_buffer, int ret_buf_size) {
ShouldNotCallThis();
return nullptr;
}
diff --git a/src/hotspot/cpu/x86/universalNativeInvoker_x86_32.cpp b/src/hotspot/cpu/x86/downcallLinker_x86_32.cpp
similarity index 64%
rename from src/hotspot/cpu/x86/universalNativeInvoker_x86_32.cpp
rename to src/hotspot/cpu/x86/downcallLinker_x86_32.cpp
index fec2142f9584f..3fc43c5031ee1 100644
--- a/src/hotspot/cpu/x86/universalNativeInvoker_x86_32.cpp
+++ b/src/hotspot/cpu/x86/downcallLinker_x86_32.cpp
@@ -22,15 +22,15 @@
*/
#include "precompiled.hpp"
-#include "prims/universalNativeInvoker.hpp"
+#include "prims/downcallLinker.hpp"
-RuntimeStub* ProgrammableInvoker::make_native_invoker(BasicType* signature,
- int num_args,
- BasicType ret_bt,
- const ABIDescriptor& abi,
- const GrowableArray<VMReg>& input_registers,
- const GrowableArray<VMReg>& output_registers,
- bool needs_return_buffer) {
+RuntimeStub* DowncallLinker::make_downcall_stub(BasicType* signature,
+ int num_args,
+ BasicType ret_bt,
+ const ABIDescriptor& abi,
+ const GrowableArray<VMReg>& input_registers,
+ const GrowableArray<VMReg>& output_registers,
+ bool needs_return_buffer) {
Unimplemented();
return nullptr;
}
diff --git a/src/hotspot/cpu/x86/universalNativeInvoker_x86_64.cpp b/src/hotspot/cpu/x86/downcallLinker_x86_64.cpp
similarity index 91%
rename from src/hotspot/cpu/x86/universalNativeInvoker_x86_64.cpp
rename to src/hotspot/cpu/x86/downcallLinker_x86_64.cpp
index 474b91d4b3bdf..d2fab74c2884e 100644
--- a/src/hotspot/cpu/x86/universalNativeInvoker_x86_64.cpp
+++ b/src/hotspot/cpu/x86/downcallLinker_x86_64.cpp
@@ -26,15 +26,15 @@
#include "code/codeBlob.hpp"
#include "logging/logStream.hpp"
#include "memory/resourceArea.hpp"
-#include "prims/foreign_globals.inline.hpp"
-#include "prims/universalNativeInvoker.hpp"
+#include "prims/foreignGlobals.inline.hpp"
+#include "prims/downcallLinker.hpp"
#include "runtime/sharedRuntime.hpp"
#include "runtime/stubCodeGenerator.hpp"
#include "utilities/formatBuffer.hpp"
#define __ _masm->
-class NativeInvokerGenerator : public StubCodeGenerator {
+class DowncallStubGenerator : public StubCodeGenerator {
BasicType* _signature;
int _num_args;
BasicType _ret_bt;
@@ -49,7 +49,7 @@ class NativeInvokerGenerator : public StubCodeGenerator {
int _framesize;
OopMapSet* _oop_maps;
public:
- NativeInvokerGenerator(CodeBuffer* buffer,
+ DowncallStubGenerator(CodeBuffer* buffer,
BasicType* signature,
int num_args,
BasicType ret_bt,
@@ -87,16 +87,16 @@ class NativeInvokerGenerator : public StubCodeGenerator {
static const int native_invoker_code_size = 1024;
-RuntimeStub* ProgrammableInvoker::make_native_invoker(BasicType* signature,
- int num_args,
- BasicType ret_bt,
- const ABIDescriptor& abi,
- const GrowableArray<VMReg>& input_registers,
- const GrowableArray<VMReg>& output_registers,
- bool needs_return_buffer) {
+RuntimeStub* DowncallLinker::make_downcall_stub(BasicType* signature,
+ int num_args,
+ BasicType ret_bt,
+ const ABIDescriptor& abi,
+ const GrowableArray<VMReg>& input_registers,
+ const GrowableArray<VMReg>& output_registers,
+ bool needs_return_buffer) {
int locs_size = 64;
CodeBuffer code("nep_invoker_blob", native_invoker_code_size, locs_size);
- NativeInvokerGenerator g(&code, signature, num_args, ret_bt, abi, input_registers, output_registers, needs_return_buffer);
+ DowncallStubGenerator g(&code, signature, num_args, ret_bt, abi, input_registers, output_registers, needs_return_buffer);
g.generate();
code.log_section_sizes("nep_invoker_blob");
@@ -119,7 +119,7 @@ RuntimeStub* ProgrammableInvoker::make_native_invoker(BasicType* signature,
return stub;
}
-void NativeInvokerGenerator::generate() {
+void DowncallStubGenerator::generate() {
enum layout {
rbp_off,
rbp_off2,
diff --git a/src/hotspot/cpu/x86/foreign_globals_x86.hpp b/src/hotspot/cpu/x86/foreignGlobals_x86.hpp
similarity index 100%
rename from src/hotspot/cpu/x86/foreign_globals_x86.hpp
rename to src/hotspot/cpu/x86/foreignGlobals_x86.hpp
diff --git a/src/hotspot/cpu/x86/foreign_globals_x86_32.cpp b/src/hotspot/cpu/x86/foreignGlobals_x86_32.cpp
similarity index 97%
rename from src/hotspot/cpu/x86/foreign_globals_x86_32.cpp
rename to src/hotspot/cpu/x86/foreignGlobals_x86_32.cpp
index 2c22c3a302012..e196727674d1b 100644
--- a/src/hotspot/cpu/x86/foreign_globals_x86_32.cpp
+++ b/src/hotspot/cpu/x86/foreignGlobals_x86_32.cpp
@@ -23,7 +23,7 @@
#include "precompiled.hpp"
#include "code/vmreg.hpp"
-#include "prims/foreign_globals.hpp"
+#include "prims/foreignGlobals.hpp"
#include "utilities/debug.hpp"
class MacroAssembler;
diff --git a/src/hotspot/cpu/x86/foreign_globals_x86_64.cpp b/src/hotspot/cpu/x86/foreignGlobals_x86_64.cpp
similarity index 99%
rename from src/hotspot/cpu/x86/foreign_globals_x86_64.cpp
rename to src/hotspot/cpu/x86/foreignGlobals_x86_64.cpp
index e974a8a193070..3b3d5ff00df24 100644
--- a/src/hotspot/cpu/x86/foreign_globals_x86_64.cpp
+++ b/src/hotspot/cpu/x86/foreignGlobals_x86_64.cpp
@@ -26,7 +26,7 @@
#include "runtime/jniHandles.inline.hpp"
#include "oops/typeArrayOop.inline.hpp"
#include "oops/oopCast.inline.hpp"
-#include "prims/foreign_globals.inline.hpp"
+#include "prims/foreignGlobals.inline.hpp"
#include "runtime/sharedRuntime.hpp"
#include "utilities/formatBuffer.hpp"
diff --git a/src/hotspot/cpu/x86/frame_x86.cpp b/src/hotspot/cpu/x86/frame_x86.cpp
index 4037b01557dbd..888a273e7b424 100644
--- a/src/hotspot/cpu/x86/frame_x86.cpp
+++ b/src/hotspot/cpu/x86/frame_x86.cpp
@@ -106,7 +106,7 @@ bool frame::safe_for_sender(JavaThread *thread) {
if (is_entry_frame()) {
// an entry frame must have a valid fp.
return fp_safe && is_entry_frame_valid(thread);
- } else if (is_optimized_entry_frame()) {
+ } else if (is_upcall_stub_frame()) {
return fp_safe;
}
@@ -211,7 +211,7 @@ bool frame::safe_for_sender(JavaThread *thread) {
address jcw = (address)sender.entry_frame_call_wrapper();
return thread->is_in_stack_range_excl(jcw, (address)sender.fp());
- } else if (sender_blob->is_optimized_entry_blob()) {
+ } else if (sender_blob->is_upcall_stub()) {
return false;
}
@@ -366,27 +366,27 @@ frame frame::sender_for_entry_frame(RegisterMap* map) const {
return fr;
}
-OptimizedEntryBlob::FrameData* OptimizedEntryBlob::frame_data_for_frame(const frame& frame) const {
- assert(frame.is_optimized_entry_frame(), "wrong frame");
+UpcallStub::FrameData* UpcallStub::frame_data_for_frame(const frame& frame) const {
+ assert(frame.is_upcall_stub_frame(), "wrong frame");
// need unextended_sp here, since normal sp is wrong for interpreter callees
- return reinterpret_cast<OptimizedEntryBlob::FrameData*>(
+ return reinterpret_cast<UpcallStub::FrameData*>(
reinterpret_cast<address>(frame.unextended_sp()) + in_bytes(_frame_data_offset));
}
-bool frame::optimized_entry_frame_is_first() const {
- assert(is_optimized_entry_frame(), "must be optimzed entry frame");
- OptimizedEntryBlob* blob = _cb->as_optimized_entry_blob();
+bool frame::upcall_stub_frame_is_first() const {
+ assert(is_upcall_stub_frame(), "must be optimzed entry frame");
+ UpcallStub* blob = _cb->as_upcall_stub();
JavaFrameAnchor* jfa = blob->jfa_for_frame(*this);
return jfa->last_Java_sp() == NULL;
}
-frame frame::sender_for_optimized_entry_frame(RegisterMap* map) const {
+frame frame::sender_for_upcall_stub_frame(RegisterMap* map) const {
assert(map != NULL, "map must be set");
- OptimizedEntryBlob* blob = _cb->as_optimized_entry_blob();
+ UpcallStub* blob = _cb->as_upcall_stub();
// Java frame called from C; skip all C frames and return top C
// frame of that chunk as the sender
JavaFrameAnchor* jfa = blob->jfa_for_frame(*this);
- assert(!optimized_entry_frame_is_first(), "must have a frame anchor to go back to");
+ assert(!upcall_stub_frame_is_first(), "must have a frame anchor to go back to");
assert(jfa->last_Java_sp() > sp(), "must be above this frame on stack");
// Since we are walking the stack now this nested anchor is obviously walkable
// even if it wasn't when it was stacked.
diff --git a/src/hotspot/cpu/x86/frame_x86.inline.hpp b/src/hotspot/cpu/x86/frame_x86.inline.hpp
index cc36af291527d..bf298011b4ed1 100644
--- a/src/hotspot/cpu/x86/frame_x86.inline.hpp
+++ b/src/hotspot/cpu/x86/frame_x86.inline.hpp
@@ -384,9 +384,9 @@ inline frame frame::sender_raw(RegisterMap* map) const {
return map->stack_chunk()->sender(*this, map);
}
- if (is_entry_frame()) return sender_for_entry_frame(map);
- if (is_optimized_entry_frame()) return sender_for_optimized_entry_frame(map);
- if (is_interpreted_frame()) return sender_for_interpreter_frame(map);
+ if (is_entry_frame()) return sender_for_entry_frame(map);
+ if (is_upcall_stub_frame()) return sender_for_upcall_stub_frame(map);
+ if (is_interpreted_frame()) return sender_for_interpreter_frame(map);
assert(_cb == CodeCache::find_blob(pc()), "Must be the same");
if (_cb != NULL) return sender_for_compiled_frame(map);
diff --git a/src/hotspot/cpu/x86/methodHandles_x86.cpp b/src/hotspot/cpu/x86/methodHandles_x86.cpp
index 95e83dc39e15a..e3f925cf110ee 100644
--- a/src/hotspot/cpu/x86/methodHandles_x86.cpp
+++ b/src/hotspot/cpu/x86/methodHandles_x86.cpp
@@ -211,7 +211,7 @@ void MethodHandles::jump_to_native_invoker(MacroAssembler* _masm, Register nep_r
// Load the invoker, as NEP -> .invoker
__ verify_oop(nep_reg);
__ access_load_at(T_ADDRESS, IN_HEAP, temp_target,
- Address(nep_reg, NONZERO(jdk_internal_foreign_abi_NativeEntryPoint::invoker_offset_in_bytes())),
+ Address(nep_reg, NONZERO(jdk_internal_foreign_abi_NativeEntryPoint::downcall_stub_address_offset_in_bytes())),
noreg, noreg);
__ jmp(temp_target);
diff --git a/src/hotspot/cpu/x86/universalUpcallHandler_x86_32.cpp b/src/hotspot/cpu/x86/upcallLinker_x86_32.cpp
similarity index 63%
rename from src/hotspot/cpu/x86/universalUpcallHandler_x86_32.cpp
rename to src/hotspot/cpu/x86/upcallLinker_x86_32.cpp
index 93308d53f48ab..cb9702f3449dd 100644
--- a/src/hotspot/cpu/x86/universalUpcallHandler_x86_32.cpp
+++ b/src/hotspot/cpu/x86/upcallLinker_x86_32.cpp
@@ -22,14 +22,14 @@
*/
#include "precompiled.hpp"
-#include "prims/universalUpcallHandler.hpp"
+#include "prims/upcallLinker.hpp"
-address ProgrammableUpcallHandler::generate_optimized_upcall_stub(jobject receiver, Method* entry,
- BasicType* in_sig_bt, int total_in_args,
- BasicType* out_sig_bt, int total_out_args,
- BasicType ret_type,
- jobject jabi, jobject jconv,
- bool needs_return_buffer, int ret_buf_size) {
+address UpcallLinker::make_upcall_stub(jobject receiver, Method* entry,
+ BasicType* in_sig_bt, int total_in_args,
+ BasicType* out_sig_bt, int total_out_args,
+ BasicType ret_type,
+ jobject jabi, jobject jconv,
+ bool needs_return_buffer, int ret_buf_size) {
ShouldNotCallThis();
return nullptr;
}
diff --git a/src/hotspot/cpu/x86/universalUpcallHandler_x86_64.cpp b/src/hotspot/cpu/x86/upcallLinker_x86_64.cpp
similarity index 89%
rename from src/hotspot/cpu/x86/universalUpcallHandler_x86_64.cpp
rename to src/hotspot/cpu/x86/upcallLinker_x86_64.cpp
index 862dec6661e7e..850668f3129d7 100644
--- a/src/hotspot/cpu/x86/universalUpcallHandler_x86_64.cpp
+++ b/src/hotspot/cpu/x86/upcallLinker_x86_64.cpp
@@ -29,8 +29,8 @@
#include "compiler/disassembler.hpp"
#include "logging/logStream.hpp"
#include "memory/resourceArea.hpp"
-#include "prims/foreign_globals.inline.hpp"
-#include "prims/universalUpcallHandler.hpp"
+#include "prims/foreignGlobals.inline.hpp"
+#include "prims/upcallLinker.hpp"
#include "runtime/sharedRuntime.hpp"
#include "runtime/signature.hpp"
#include "runtime/stubRoutines.hpp"
@@ -168,15 +168,15 @@ static void restore_callee_saved_registers(MacroAssembler* _masm, const ABIDescr
// "0" is assigned for rax and for xmm0. Thus we need to ignore -Wnonnull.
PRAGMA_DIAG_PUSH
PRAGMA_NONNULL_IGNORED
-address ProgrammableUpcallHandler::generate_optimized_upcall_stub(jobject receiver, Method* entry,
- BasicType* in_sig_bt, int total_in_args,
- BasicType* out_sig_bt, int total_out_args,
- BasicType ret_type,
- jobject jabi, jobject jconv,
- bool needs_return_buffer, int ret_buf_size) {
+address UpcallLinker::make_upcall_stub(jobject receiver, Method* entry,
+ BasicType* in_sig_bt, int total_in_args,
+ BasicType* out_sig_bt, int total_out_args,
+ BasicType ret_type,
+ jobject jabi, jobject jconv,
+ bool needs_return_buffer, int ret_buf_size) {
const ABIDescriptor abi = ForeignGlobals::parse_abi_descriptor(jabi);
const CallRegs call_regs = ForeignGlobals::parse_call_regs(jconv);
- CodeBuffer buffer("upcall_stub_linkToNative", /* code_size = */ 2048, /* locs_size = */ 1024);
+ CodeBuffer buffer("upcall_stub", /* code_size = */ 2048, /* locs_size = */ 1024);
Register shuffle_reg = rbx;
JavaCallingConvention out_conv;
@@ -209,7 +209,7 @@ address ProgrammableUpcallHandler::generate_optimized_upcall_stub(jobject receiv
int arg_save_area_offset = res_save_area_offset + result_spiller.spill_size_bytes();
int reg_save_area_offset = arg_save_area_offset + arg_spilller.spill_size_bytes();
int frame_data_offset = reg_save_area_offset + reg_save_area_size;
- int frame_bottom_offset = frame_data_offset + sizeof(OptimizedEntryBlob::FrameData);
+ int frame_bottom_offset = frame_data_offset + sizeof(UpcallStub::FrameData);
int ret_buf_offset = -1;
if (needs_return_buffer) {
@@ -267,7 +267,7 @@ address ProgrammableUpcallHandler::generate_optimized_upcall_stub(jobject receiv
__ vzeroupper();
__ lea(c_rarg0, Address(rsp, frame_data_offset));
// stack already aligned
- __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, ProgrammableUpcallHandler::on_entry)));
+ __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, UpcallLinker::on_entry)));
__ movptr(r15_thread, rax);
__ reinit_heapbase();
__ block_comment("} on_entry");
@@ -343,7 +343,7 @@ address ProgrammableUpcallHandler::generate_optimized_upcall_stub(jobject receiv
__ vzeroupper();
__ lea(c_rarg0, Address(rsp, frame_data_offset));
// stack already aligned
- __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, ProgrammableUpcallHandler::on_exit)));
+ __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, UpcallLinker::on_exit)));
__ reinit_heapbase();
__ block_comment("} on_exit");
@@ -369,7 +369,7 @@ address ProgrammableUpcallHandler::generate_optimized_upcall_stub(jobject receiv
__ mov(c_rarg0, rax);
__ andptr(rsp, -StackAlignmentInBytes); // align stack as required by ABI
__ subptr(rsp, frame::arg_reg_save_area_bytes); // windows (not really needed)
- __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, ProgrammableUpcallHandler::handle_uncaught_exception)));
+ __ call(RuntimeAddress(CAST_FROM_FN_PTR(address, UpcallLinker::handle_uncaught_exception)));
__ should_not_reach_here();
__ block_comment("} exception handler");
@@ -379,18 +379,18 @@ address ProgrammableUpcallHandler::generate_optimized_upcall_stub(jobject receiv
#ifndef PRODUCT
stringStream ss;
- ss.print("optimized_upcall_stub_%s", entry->signature()->as_C_string());
+ ss.print("upcall_stub_%s", entry->signature()->as_C_string());
const char* name = _masm->code_string(ss.as_string());
#else // PRODUCT
- const char* name = "optimized_upcall_stub";
+ const char* name = "upcall_stub";
#endif // PRODUCT
- OptimizedEntryBlob* blob
- = OptimizedEntryBlob::create(name,
- &buffer,
- exception_handler_offset,
- receiver,
- in_ByteSize(frame_data_offset));
+ UpcallStub* blob
+ = UpcallStub::create(name,
+ &buffer,
+ exception_handler_offset,
+ receiver,
+ in_ByteSize(frame_data_offset));
if (TraceOptimizedUpcallStubs) {
blob->print_on(tty);
diff --git a/src/hotspot/cpu/zero/universalNativeInvoker_zero.cpp b/src/hotspot/cpu/zero/downcallLinker_zero.cpp
similarity index 64%
rename from src/hotspot/cpu/zero/universalNativeInvoker_zero.cpp
rename to src/hotspot/cpu/zero/downcallLinker_zero.cpp
index fec2142f9584f..3fc43c5031ee1 100644
--- a/src/hotspot/cpu/zero/universalNativeInvoker_zero.cpp
+++ b/src/hotspot/cpu/zero/downcallLinker_zero.cpp
@@ -22,15 +22,15 @@
*/
#include "precompiled.hpp"
-#include "prims/universalNativeInvoker.hpp"
+#include "prims/downcallLinker.hpp"
-RuntimeStub* ProgrammableInvoker::make_native_invoker(BasicType* signature,
- int num_args,
- BasicType ret_bt,
- const ABIDescriptor& abi,
- const GrowableArray<VMReg>& input_registers,
- const GrowableArray<VMReg>& output_registers,
- bool needs_return_buffer) {
+RuntimeStub* DowncallLinker::make_downcall_stub(BasicType* signature,
+ int num_args,
+ BasicType ret_bt,
+ const ABIDescriptor& abi,
+ const GrowableArray<VMReg>& input_registers,
+ const GrowableArray<VMReg>& output_registers,
+ bool needs_return_buffer) {
Unimplemented();
return nullptr;
}
diff --git a/src/hotspot/cpu/zero/foreign_globals_zero.cpp b/src/hotspot/cpu/zero/foreignGlobals_zero.cpp
similarity index 97%
rename from src/hotspot/cpu/zero/foreign_globals_zero.cpp
rename to src/hotspot/cpu/zero/foreignGlobals_zero.cpp
index ecdb110ee0eab..21f6e9fd46481 100644
--- a/src/hotspot/cpu/zero/foreign_globals_zero.cpp
+++ b/src/hotspot/cpu/zero/foreignGlobals_zero.cpp
@@ -23,7 +23,7 @@
#include "precompiled.hpp"
#include "code/vmreg.hpp"
-#include "prims/foreign_globals.hpp"
+#include "prims/foreignGlobals.hpp"
#include "utilities/debug.hpp"
class MacroAssembler;
diff --git a/src/hotspot/cpu/zero/foreign_globals_zero.hpp b/src/hotspot/cpu/zero/foreignGlobals_zero.hpp
similarity index 100%
rename from src/hotspot/cpu/zero/foreign_globals_zero.hpp
rename to src/hotspot/cpu/zero/foreignGlobals_zero.hpp
diff --git a/src/hotspot/cpu/zero/frame_zero.cpp b/src/hotspot/cpu/zero/frame_zero.cpp
index 6956c3e685ed1..2792f403497a1 100644
--- a/src/hotspot/cpu/zero/frame_zero.cpp
+++ b/src/hotspot/cpu/zero/frame_zero.cpp
@@ -62,12 +62,12 @@ frame frame::sender_for_entry_frame(RegisterMap *map) const {
return frame(zeroframe()->next(), sender_sp());
}
-OptimizedEntryBlob::FrameData* OptimizedEntryBlob::frame_data_for_frame(const frame& frame) const {
+UpcallStub::FrameData* UpcallStub::frame_data_for_frame(const frame& frame) const {
ShouldNotCallThis();
return nullptr;
}
-bool frame::optimized_entry_frame_is_first() const {
+bool frame::upcall_stub_frame_is_first() const {
ShouldNotCallThis();
return false;
}
diff --git a/src/hotspot/cpu/zero/universalUpcallHandle_zero.cpp b/src/hotspot/cpu/zero/upcallLinker_zero.cpp
similarity index 63%
rename from src/hotspot/cpu/zero/universalUpcallHandle_zero.cpp
rename to src/hotspot/cpu/zero/upcallLinker_zero.cpp
index 93308d53f48ab..cb9702f3449dd 100644
--- a/src/hotspot/cpu/zero/universalUpcallHandle_zero.cpp
+++ b/src/hotspot/cpu/zero/upcallLinker_zero.cpp
@@ -22,14 +22,14 @@
*/
#include "precompiled.hpp"
-#include "prims/universalUpcallHandler.hpp"
+#include "prims/upcallLinker.hpp"
-address ProgrammableUpcallHandler::generate_optimized_upcall_stub(jobject receiver, Method* entry,
- BasicType* in_sig_bt, int total_in_args,
- BasicType* out_sig_bt, int total_out_args,
- BasicType ret_type,
- jobject jabi, jobject jconv,
- bool needs_return_buffer, int ret_buf_size) {
+address UpcallLinker::make_upcall_stub(jobject receiver, Method* entry,
+ BasicType* in_sig_bt, int total_in_args,
+ BasicType* out_sig_bt, int total_out_args,
+ BasicType ret_type,
+ jobject jabi, jobject jconv,
+ bool needs_return_buffer, int ret_buf_size) {
ShouldNotCallThis();
return nullptr;
}
diff --git a/src/hotspot/share/classfile/javaClasses.cpp b/src/hotspot/share/classfile/javaClasses.cpp
index 8c9b195d0fcb5..e96bbc5e0e88f 100644
--- a/src/hotspot/share/classfile/javaClasses.cpp
+++ b/src/hotspot/share/classfile/javaClasses.cpp
@@ -4238,11 +4238,11 @@ bool java_lang_invoke_LambdaForm::is_instance(oop obj) {
}
int jdk_internal_foreign_abi_NativeEntryPoint::_method_type_offset;
-int jdk_internal_foreign_abi_NativeEntryPoint::_invoker_offset;
+int jdk_internal_foreign_abi_NativeEntryPoint::_downcall_stub_address_offset;
#define NEP_FIELDS_DO(macro) \
- macro(_method_type_offset, k, "methodType", java_lang_invoke_MethodType_signature, false); \
- macro(_invoker_offset, k, "invoker", long_signature, false);
+ macro(_method_type_offset, k, "methodType", java_lang_invoke_MethodType_signature, false); \
+ macro(_downcall_stub_address_offset, k, "downcallStubAddress", long_signature, false);
bool jdk_internal_foreign_abi_NativeEntryPoint::is_instance(oop obj) {
return obj != NULL && is_subclass(obj->klass());
@@ -4263,8 +4263,8 @@ oop jdk_internal_foreign_abi_NativeEntryPoint::method_type(oop entry) {
return entry->obj_field(_method_type_offset);
}
-jlong jdk_internal_foreign_abi_NativeEntryPoint::invoker(oop entry) {
- return entry->long_field(_invoker_offset);
+jlong jdk_internal_foreign_abi_NativeEntryPoint::downcall_stub_address(oop entry) {
+ return entry->long_field(_downcall_stub_address_offset);
}
int jdk_internal_foreign_abi_ABIDescriptor::_inputStorage_offset;
diff --git a/src/hotspot/share/classfile/javaClasses.hpp b/src/hotspot/share/classfile/javaClasses.hpp
index bcf39ef0a7d11..eac80adb6488c 100644
--- a/src/hotspot/share/classfile/javaClasses.hpp
+++ b/src/hotspot/share/classfile/javaClasses.hpp
@@ -1284,7 +1284,7 @@ class jdk_internal_foreign_abi_NativeEntryPoint: AllStatic {
private:
static int _method_type_offset;
- static int _invoker_offset;
+ static int _downcall_stub_address_offset;
static void compute_offsets();
@@ -1293,7 +1293,7 @@ class jdk_internal_foreign_abi_NativeEntryPoint: AllStatic {
// Accessors
static oop method_type(oop entry);
- static jlong invoker(oop entry);
+ static jlong downcall_stub_address(oop entry);
// Testers
static bool is_subclass(Klass* klass) {
@@ -1303,8 +1303,8 @@ class jdk_internal_foreign_abi_NativeEntryPoint: AllStatic {
static bool is_instance(oop obj);
// Accessors for code generation:
- static int method_type_offset_in_bytes() { return _method_type_offset; }
- static int invoker_offset_in_bytes() { return _invoker_offset; }
+ static int method_type_offset_in_bytes() { return _method_type_offset; }
+ static int downcall_stub_address_offset_in_bytes() { return _downcall_stub_address_offset; }
};
class jdk_internal_foreign_abi_ABIDescriptor: AllStatic {
diff --git a/src/hotspot/share/classfile/vmSymbols.hpp b/src/hotspot/share/classfile/vmSymbols.hpp
index 8025fa2992e50..988bc8bdb2e3c 100644
--- a/src/hotspot/share/classfile/vmSymbols.hpp
+++ b/src/hotspot/share/classfile/vmSymbols.hpp
@@ -370,7 +370,7 @@
template(jdk_internal_foreign_abi_VMStorage_signature, "Ljdk/internal/foreign/abi/VMStorage;") \
template(jdk_internal_foreign_abi_VMStorage_array_signature, "[Ljdk/internal/foreign/abi/VMStorage;") \
template(jdk_internal_foreign_abi_VMStorage_array_array_signature, "[[Ljdk/internal/foreign/abi/VMStorage;") \
- template(jdk_internal_foreign_abi_CallConv, "jdk/internal/foreign/abi/ProgrammableUpcallHandler$CallRegs") \
+ template(jdk_internal_foreign_abi_CallConv, "jdk/internal/foreign/abi/UpcallLinker$CallRegs") \
\
/* Support for JVMCI */ \
JVMCI_VM_SYMBOLS_DO(template, do_alias) \
diff --git a/src/hotspot/share/code/codeBlob.cpp b/src/hotspot/share/code/codeBlob.cpp
index 8107113f263bd..140729e31922e 100644
--- a/src/hotspot/share/code/codeBlob.cpp
+++ b/src/hotspot/share/code/codeBlob.cpp
@@ -723,12 +723,12 @@ void DeoptimizationBlob::print_value_on(outputStream* st) const {
st->print_cr("Deoptimization (frame not available)");
}
-// Implementation of OptimizedEntryBlob
+// Implementation of UpcallStub
-OptimizedEntryBlob::OptimizedEntryBlob(const char* name, CodeBuffer* cb, int size,
- intptr_t exception_handler_offset,
- jobject receiver, ByteSize frame_data_offset) :
- RuntimeBlob(name, cb, sizeof(OptimizedEntryBlob), size, CodeOffsets::frame_never_safe, 0 /* no frame size */,
+UpcallStub::UpcallStub(const char* name, CodeBuffer* cb, int size,
+ intptr_t exception_handler_offset,
+ jobject receiver, ByteSize frame_data_offset) :
+ RuntimeBlob(name, cb, sizeof(UpcallStub), size, CodeOffsets::frame_never_safe, 0 /* no frame size */,
/* oop maps = */ nullptr, /* caller must gc arguments = */ false),
_exception_handler_offset(exception_handler_offset),
_receiver(receiver),
@@ -736,58 +736,58 @@ OptimizedEntryBlob::OptimizedEntryBlob(const char* name, CodeBuffer* cb, int siz
CodeCache::commit(this);
}
-void* OptimizedEntryBlob::operator new(size_t s, unsigned size) throw() {
+void* UpcallStub::operator new(size_t s, unsigned size) throw() {
return CodeCache::allocate(size, CodeBlobType::NonNMethod);
}
-OptimizedEntryBlob* OptimizedEntryBlob::create(const char* name, CodeBuffer* cb,
- intptr_t exception_handler_offset,
- jobject receiver, ByteSize frame_data_offset) {
+UpcallStub* UpcallStub::create(const char* name, CodeBuffer* cb,
+ intptr_t exception_handler_offset,
+ jobject receiver, ByteSize frame_data_offset) {
ThreadInVMfromUnknown __tiv; // get to VM state in case we block on CodeCache_lock
- OptimizedEntryBlob* blob = nullptr;
- unsigned int size = CodeBlob::allocation_size(cb, sizeof(OptimizedEntryBlob));
+ UpcallStub* blob = nullptr;
+ unsigned int size = CodeBlob::allocation_size(cb, sizeof(UpcallStub));
{
MutexLocker mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
- blob = new (size) OptimizedEntryBlob(name, cb, size,
+ blob = new (size) UpcallStub(name, cb, size,
exception_handler_offset, receiver, frame_data_offset);
}
// Track memory usage statistic after releasing CodeCache_lock
MemoryService::track_code_cache_memory_usage();
- trace_new_stub(blob, "OptimizedEntryBlob");
+ trace_new_stub(blob, "UpcallStub");
return blob;
}
-void OptimizedEntryBlob::oops_do(OopClosure* f, const frame& frame) {
+void UpcallStub::oops_do(OopClosure* f, const frame& frame) {
frame_data_for_frame(frame)->old_handles->oops_do(f);
}
-JavaFrameAnchor* OptimizedEntryBlob::jfa_for_frame(const frame& frame) const {
+JavaFrameAnchor* UpcallStub::jfa_for_frame(const frame& frame) const {
return &frame_data_for_frame(frame)->jfa;
}
-void OptimizedEntryBlob::free(OptimizedEntryBlob* blob) {
+void UpcallStub::free(UpcallStub* blob) {
assert(blob != nullptr, "caller must check for NULL");
JNIHandles::destroy_global(blob->receiver());
RuntimeBlob::free(blob);
}
-void OptimizedEntryBlob::preserve_callee_argument_oops(frame fr, const RegisterMap* reg_map, OopClosure* f) {
+void UpcallStub::preserve_callee_argument_oops(frame fr, const RegisterMap* reg_map, OopClosure* f) {
ShouldNotReachHere(); // caller should never have to gc arguments
}
// Misc.
-void OptimizedEntryBlob::verify() {
+void UpcallStub::verify() {
// unimplemented
}
-void OptimizedEntryBlob::print_on(outputStream* st) const {
+void UpcallStub::print_on(outputStream* st) const {
RuntimeBlob::print_on(st);
print_value_on(st);
}
-void OptimizedEntryBlob::print_value_on(outputStream* st) const {
- st->print_cr("OptimizedEntryBlob (" INTPTR_FORMAT ") used for %s", p2i(this), name());
+void UpcallStub::print_value_on(outputStream* st) const {
+ st->print_cr("UpcallStub (" INTPTR_FORMAT ") used for %s", p2i(this), name());
}
diff --git a/src/hotspot/share/code/codeBlob.hpp b/src/hotspot/share/code/codeBlob.hpp
index abc018e53ee08..38051bf325b8f 100644
--- a/src/hotspot/share/code/codeBlob.hpp
+++ b/src/hotspot/share/code/codeBlob.hpp
@@ -67,7 +67,7 @@ struct CodeBlobType {
// ExceptionBlob : Used for stack unrolling
// SafepointBlob : Used to handle illegal instruction exceptions
// UncommonTrapBlob : Used to handle uncommon traps
-// OptimizedEntryBlob : Used for upcalls from native code
+// UpcallStub : Used for upcalls from native code
//
//
// Layout : continuous in the CodeCache
@@ -79,9 +79,9 @@ struct CodeBlobType {
class CodeBlobLayout;
-class OptimizedEntryBlob; // for as_optimized_entry_blob()
+class UpcallStub; // for as_upcall_stub()
class RuntimeStub; // for as_runtime_stub()
-class JavaFrameAnchor; // for OptimizedEntryBlob::jfa_for_frame
+class JavaFrameAnchor; // for UpcallStub::jfa_for_frame
class CodeBlob {
friend class VMStructs;
@@ -154,7 +154,7 @@ class CodeBlob {
virtual bool is_adapter_blob() const { return false; }
virtual bool is_vtable_blob() const { return false; }
virtual bool is_method_handles_adapter_blob() const { return false; }
- virtual bool is_optimized_entry_blob() const { return false; }
+ virtual bool is_upcall_stub() const { return false; }
bool is_compiled() const { return _is_compiled; }
const bool* is_compiled_addr() const { return &_is_compiled; }
@@ -165,13 +165,13 @@ class CodeBlob {
CompilerType compiler_type() const { return _type; }
// Casting
- nmethod* as_nmethod_or_null() { return is_nmethod() ? (nmethod*) this : NULL; }
- nmethod* as_nmethod() { assert(is_nmethod(), "must be nmethod"); return (nmethod*) this; }
- CompiledMethod* as_compiled_method_or_null() { return is_compiled() ? (CompiledMethod*) this : NULL; }
- CompiledMethod* as_compiled_method() { assert(is_compiled(), "must be compiled"); return (CompiledMethod*) this; }
- CodeBlob* as_codeblob_or_null() const { return (CodeBlob*) this; }
- OptimizedEntryBlob* as_optimized_entry_blob() const { assert(is_optimized_entry_blob(), "must be entry blob"); return (OptimizedEntryBlob*) this; }
- RuntimeStub* as_runtime_stub() const { assert(is_runtime_stub(), "must be runtime blob"); return (RuntimeStub*) this; }
+ nmethod* as_nmethod_or_null() { return is_nmethod() ? (nmethod*) this : NULL; }
+ nmethod* as_nmethod() { assert(is_nmethod(), "must be nmethod"); return (nmethod*) this; }
+ CompiledMethod* as_compiled_method_or_null() { return is_compiled() ? (CompiledMethod*) this : NULL; }
+ CompiledMethod* as_compiled_method() { assert(is_compiled(), "must be compiled"); return (CompiledMethod*) this; }
+ CodeBlob* as_codeblob_or_null() const { return (CodeBlob*) this; }
+ UpcallStub* as_upcall_stub() const { assert(is_upcall_stub(), "must be upcall stub"); return (UpcallStub*) this; }
+ RuntimeStub* as_runtime_stub() const { assert(is_runtime_stub(), "must be runtime blob"); return (RuntimeStub*) this; }
// Boundaries
address header_begin() const { return (address) this; }
@@ -409,7 +409,7 @@ class BufferBlob: public RuntimeBlob {
friend class AdapterBlob;
friend class VtableBlob;
friend class MethodHandlesAdapterBlob;
- friend class OptimizedEntryBlob;
+ friend class UpcallStub;
friend class WhiteBox;
private:
@@ -753,16 +753,17 @@ class SafepointBlob: public SingletonBlob {
//----------------------------------------------------------------------------------------------------
-class ProgrammableUpcallHandler;
+class UpcallLinker;
-class OptimizedEntryBlob: public RuntimeBlob {
- friend class ProgrammableUpcallHandler;
+// A (Panama) upcall stub. Not used by JNI.
+class UpcallStub: public RuntimeBlob {
+ friend class UpcallLinker;
private:
intptr_t _exception_handler_offset;
jobject _receiver;
ByteSize _frame_data_offset;
- OptimizedEntryBlob(const char* name, CodeBuffer* cb, int size,
+ UpcallStub(const char* name, CodeBuffer* cb, int size,
intptr_t exception_handler_offset,
jobject receiver, ByteSize frame_data_offset);
@@ -779,11 +780,11 @@ class OptimizedEntryBlob: public RuntimeBlob {
FrameData* frame_data_for_frame(const frame& frame) const;
public:
// Creation
- static OptimizedEntryBlob* create(const char* name, CodeBuffer* cb,
- intptr_t exception_handler_offset,
- jobject receiver, ByteSize frame_data_offset);
+ static UpcallStub* create(const char* name, CodeBuffer* cb,
+ intptr_t exception_handler_offset,
+ jobject receiver, ByteSize frame_data_offset);
- static void free(OptimizedEntryBlob* blob);
+ static void free(UpcallStub* blob);
address exception_handler() { return code_begin() + _exception_handler_offset; }
jobject receiver() { return _receiver; }
@@ -791,7 +792,7 @@ class OptimizedEntryBlob: public RuntimeBlob {
JavaFrameAnchor* jfa_for_frame(const frame& frame) const;
// Typing
- virtual bool is_optimized_entry_blob() const override { return true; }
+ virtual bool is_upcall_stub() const override { return true; }
// GC/Verification support
void oops_do(OopClosure* f, const frame& frame);
diff --git a/src/hotspot/share/prims/universalNativeInvoker.hpp b/src/hotspot/share/prims/downcallLinker.hpp
similarity index 60%
rename from src/hotspot/share/prims/universalNativeInvoker.hpp
rename to src/hotspot/share/prims/downcallLinker.hpp
index 205cb38eec4bd..5f8fdf88ff85b 100644
--- a/src/hotspot/share/prims/universalNativeInvoker.hpp
+++ b/src/hotspot/share/prims/downcallLinker.hpp
@@ -21,22 +21,22 @@
* questions.
*/
-#ifndef SHARE_VM_PRIMS_UNIVERSALNATIVEINVOKER_HPP
-#define SHARE_VM_PRIMS_UNIVERSALNATIVEINVOKER_HPP
+#ifndef SHARE_VM_PRIMS_DOWNCALLLINKER_HPP
+#define SHARE_VM_PRIMS_DOWNCALLLINKER_HPP
-#include "prims/foreign_globals.hpp"
+#include "prims/foreignGlobals.hpp"
class RuntimeStub;
-class ProgrammableInvoker: AllStatic {
+class DowncallLinker: AllStatic {
public:
- static RuntimeStub* make_native_invoker(BasicType*,
- int num_args,
- BasicType ret_bt,
- const ABIDescriptor& abi,
- const GrowableArray<VMReg>& input_registers,
- const GrowableArray<VMReg>& output_registers,
- bool needs_return_buffer);
+ static RuntimeStub* make_downcall_stub(BasicType*,
+ int num_args,
+ BasicType ret_bt,
+ const ABIDescriptor& abi,
+ const GrowableArray<VMReg>& input_registers,
+ const GrowableArray<VMReg>& output_registers,
+ bool needs_return_buffer);
};
-#endif // SHARE_VM_PRIMS_UNIVERSALNATIVEINVOKER_HPP
+#endif // SHARE_VM_PRIMS_DOWNCALLLINKER_HPP
diff --git a/src/hotspot/share/prims/foreign_globals.cpp b/src/hotspot/share/prims/foreignGlobals.cpp
similarity index 99%
rename from src/hotspot/share/prims/foreign_globals.cpp
rename to src/hotspot/share/prims/foreignGlobals.cpp
index 1a77c247bca53..58f9d1305c3d0 100644
--- a/src/hotspot/share/prims/foreign_globals.cpp
+++ b/src/hotspot/share/prims/foreignGlobals.cpp
@@ -22,10 +22,10 @@
*/
#include "precompiled.hpp"
-#include "foreign_globals.hpp"
+#include "foreignGlobals.hpp"
#include "classfile/javaClasses.hpp"
#include "memory/resourceArea.hpp"
-#include "prims/foreign_globals.inline.hpp"
+#include "prims/foreignGlobals.inline.hpp"
#include "runtime/jniHandles.inline.hpp"
#define FOREIGN_ABI "jdk/internal/foreign/abi/"
diff --git a/src/hotspot/share/prims/foreign_globals.hpp b/src/hotspot/share/prims/foreignGlobals.hpp
similarity index 99%
rename from src/hotspot/share/prims/foreign_globals.hpp
rename to src/hotspot/share/prims/foreignGlobals.hpp
index b1aa96bb93182..ae876662e969d 100644
--- a/src/hotspot/share/prims/foreign_globals.hpp
+++ b/src/hotspot/share/prims/foreignGlobals.hpp
@@ -30,7 +30,7 @@
#include "utilities/growableArray.hpp"
#include "utilities/macros.hpp"
-#include CPU_HEADER(foreign_globals)
+#include CPU_HEADER(foreignGlobals)
class CallingConventionClosure {
public:
diff --git a/src/hotspot/share/prims/foreign_globals.inline.hpp b/src/hotspot/share/prims/foreignGlobals.inline.hpp
similarity index 98%
rename from src/hotspot/share/prims/foreign_globals.inline.hpp
rename to src/hotspot/share/prims/foreignGlobals.inline.hpp
index 8c19388c29fe0..cfd95c2a1e204 100644
--- a/src/hotspot/share/prims/foreign_globals.inline.hpp
+++ b/src/hotspot/share/prims/foreignGlobals.inline.hpp
@@ -24,7 +24,7 @@
#ifndef SHARE_PRIMS_FOREIGN_GLOBALS_INLINE_HPP
#define SHARE_PRIMS_FOREIGN_GLOBALS_INLINE_HPP
-#include "prims/foreign_globals.hpp"
+#include "prims/foreignGlobals.hpp"
#include "classfile/javaClasses.hpp"
#include "oops/oopsHierarchy.hpp"
diff --git a/src/hotspot/share/prims/nativeEntryPoint.cpp b/src/hotspot/share/prims/nativeEntryPoint.cpp
index 673f13ed9e8e0..57145de3622c1 100644
--- a/src/hotspot/share/prims/nativeEntryPoint.cpp
+++ b/src/hotspot/share/prims/nativeEntryPoint.cpp
@@ -30,12 +30,12 @@
#include "memory/resourceArea.hpp"
#include "oops/typeArrayOop.inline.hpp"
#include "oops/oopCast.inline.hpp"
-#include "prims/foreign_globals.inline.hpp"
-#include "prims/universalNativeInvoker.hpp"
+#include "prims/foreignGlobals.inline.hpp"
+#include "prims/downcallLinker.hpp"
#include "runtime/jniHandles.inline.hpp"
-JNI_ENTRY(jlong, NEP_makeInvoker(JNIEnv* env, jclass _unused, jobject method_type, jobject jabi,
- jobjectArray arg_moves, jobjectArray ret_moves, jboolean needs_return_buffer))
+JNI_ENTRY(jlong, NEP_makeDowncallStub(JNIEnv* env, jclass _unused, jobject method_type, jobject jabi,
+ jobjectArray arg_moves, jobjectArray ret_moves, jboolean needs_return_buffer))
ResourceMark rm;
const ABIDescriptor abi = ForeignGlobals::parse_abi_descriptor(jabi);
@@ -73,11 +73,11 @@ JNI_ENTRY(jlong, NEP_makeInvoker(JNIEnv* env, jclass _unused, jobject method_typ
output_regs.push(ForeignGlobals::parse_vmstorage(ret_moves_oop->obj_at(i)));
}
- return (jlong) ProgrammableInvoker::make_native_invoker(
+ return (jlong) DowncallLinker::make_downcall_stub(
basic_type, pslots, ret_bt, abi, input_regs, output_regs, needs_return_buffer)->code_begin();
JNI_END
-JNI_ENTRY(jboolean, NEP_freeInvoker(JNIEnv* env, jclass _unused, jlong invoker))
+JNI_ENTRY(jboolean, NEP_freeDowncallStub(JNIEnv* env, jclass _unused, jlong invoker))
// safe to call without code cache lock, because stub is always alive
CodeBlob* cb = CodeCache::find_blob((char*) invoker);
if (cb == nullptr) {
@@ -94,8 +94,8 @@ JNI_END
#define VM_STORAGE_ARR "[Ljdk/internal/foreign/abi/VMStorage;"
static JNINativeMethod NEP_methods[] = {
- {CC "makeInvoker", CC "(" METHOD_TYPE ABI_DESC VM_STORAGE_ARR VM_STORAGE_ARR "Z)J", FN_PTR(NEP_makeInvoker)},
- {CC "freeInvoker0", CC "(J)Z", FN_PTR(NEP_freeInvoker)},
+ {CC "makeDowncallStub", CC "(" METHOD_TYPE ABI_DESC VM_STORAGE_ARR VM_STORAGE_ARR "Z)J", FN_PTR(NEP_makeDowncallStub)},
+ {CC "freeDowncallStub0", CC "(J)Z", FN_PTR(NEP_freeDowncallStub)},
};
#undef METHOD_TYPE
diff --git a/src/hotspot/share/prims/nativeLookup.cpp b/src/hotspot/share/prims/nativeLookup.cpp
index 950795b2d05e8..eef61809c126e 100644
--- a/src/hotspot/share/prims/nativeLookup.cpp
+++ b/src/hotspot/share/prims/nativeLookup.cpp
@@ -202,7 +202,7 @@ extern "C" {
void JNICALL JVM_RegisterMethodHandleMethods(JNIEnv *env, jclass unsafecls);
void JNICALL JVM_RegisterReferencesMethods(JNIEnv *env, jclass unsafecls);
void JNICALL JVM_RegisterUpcallHandlerMethods(JNIEnv *env, jclass unsafecls);
- void JNICALL JVM_RegisterProgrammableUpcallHandlerMethods(JNIEnv *env, jclass unsafecls);
+ void JNICALL JVM_RegisterUpcallLinkerMethods(JNIEnv *env, jclass unsafecls);
void JNICALL JVM_RegisterNativeEntryPointMethods(JNIEnv *env, jclass unsafecls);
void JNICALL JVM_RegisterPerfMethods(JNIEnv *env, jclass perfclass);
void JNICALL JVM_RegisterWhiteBoxMethods(JNIEnv *env, jclass wbclass);
@@ -220,7 +220,7 @@ static JNINativeMethod lookup_special_native_methods[] = {
{ CC"Java_jdk_internal_misc_Unsafe_registerNatives", NULL, FN_PTR(JVM_RegisterJDKInternalMiscUnsafeMethods) },
{ CC"Java_java_lang_invoke_MethodHandleNatives_registerNatives", NULL, FN_PTR(JVM_RegisterMethodHandleMethods) },
{ CC"Java_jdk_internal_foreign_abi_UpcallStubs_registerNatives", NULL, FN_PTR(JVM_RegisterUpcallHandlerMethods) },
- { CC"Java_jdk_internal_foreign_abi_ProgrammableUpcallHandler_registerNatives", NULL, FN_PTR(JVM_RegisterProgrammableUpcallHandlerMethods) },
+ { CC"Java_jdk_internal_foreign_abi_UpcallLinker_registerNatives", NULL, FN_PTR(JVM_RegisterUpcallLinkerMethods) },
{ CC"Java_jdk_internal_foreign_abi_NativeEntryPoint_registerNatives", NULL, FN_PTR(JVM_RegisterNativeEntryPointMethods) },
{ CC"Java_jdk_internal_perf_Perf_registerNatives", NULL, FN_PTR(JVM_RegisterPerfMethods) },
{ CC"Java_sun_hotspot_WhiteBox_registerNatives", NULL, FN_PTR(JVM_RegisterWhiteBoxMethods) },
diff --git a/src/hotspot/share/prims/universalUpcallHandler.cpp b/src/hotspot/share/prims/upcallLinker.cpp
similarity index 87%
rename from src/hotspot/share/prims/universalUpcallHandler.cpp
rename to src/hotspot/share/prims/upcallLinker.cpp
index ac142f46e2164..74562f3d01ad7 100644
--- a/src/hotspot/share/prims/universalUpcallHandler.cpp
+++ b/src/hotspot/share/prims/upcallLinker.cpp
@@ -27,7 +27,7 @@
#include "classfile/systemDictionary.hpp"
#include "compiler/compilationPolicy.hpp"
#include "memory/resourceArea.hpp"
-#include "prims/universalUpcallHandler.hpp"
+#include "prims/upcallLinker.hpp"
#include "runtime/interfaceSupport.inline.hpp"
#include "runtime/javaCalls.hpp"
#include "runtime/jniHandles.inline.hpp"
@@ -57,7 +57,7 @@ struct UpcallContext {
APPROVED_CPP_THREAD_LOCAL UpcallContext threadContext;
-JavaThread* ProgrammableUpcallHandler::maybe_attach_and_get_thread() {
+JavaThread* UpcallLinker::maybe_attach_and_get_thread() {
JavaThread* thread = JavaThread::current_or_null();
if (thread == nullptr) {
JavaVM_ *vm = (JavaVM *)(&main_vm);
@@ -72,7 +72,7 @@ JavaThread* ProgrammableUpcallHandler::maybe_attach_and_get_thread() {
}
// modelled after JavaCallWrapper::JavaCallWrapper
-JavaThread* ProgrammableUpcallHandler::on_entry(OptimizedEntryBlob::FrameData* context) {
+JavaThread* UpcallLinker::on_entry(UpcallStub::FrameData* context) {
JavaThread* thread = maybe_attach_and_get_thread();
context->thread = thread;
@@ -110,7 +110,7 @@ JavaThread* ProgrammableUpcallHandler::on_entry(OptimizedEntryBlob::FrameData* c
}
// modelled after JavaCallWrapper::~JavaCallWrapper
-void ProgrammableUpcallHandler::on_exit(OptimizedEntryBlob::FrameData* context) {
+void UpcallLinker::on_exit(UpcallStub::FrameData* context) {
JavaThread* thread = context->thread;
assert(thread == JavaThread::current(), "must still be the same thread");
@@ -133,7 +133,7 @@ void ProgrammableUpcallHandler::on_exit(OptimizedEntryBlob::FrameData* context)
assert(!thread->has_pending_exception(), "Upcall can not throw an exception");
}
-void ProgrammableUpcallHandler::handle_uncaught_exception(oop exception) {
+void UpcallLinker::handle_uncaught_exception(oop exception) {
ResourceMark rm;
// Based on CATCH macro
tty->print_cr("Uncaught exception:");
@@ -141,7 +141,7 @@ void ProgrammableUpcallHandler::handle_uncaught_exception(oop exception) {
ShouldNotReachHere();
}
-JVM_ENTRY(jlong, PUH_AllocateOptimizedUpcallStub(JNIEnv *env, jclass unused, jobject mh, jobject abi, jobject conv,
+JVM_ENTRY(jlong, UL_MakeUpcallStub(JNIEnv *env, jclass unused, jobject mh, jobject abi, jobject conv,
jboolean needs_return_buffer, jlong ret_buf_size))
ResourceMark rm(THREAD);
Handle mh_h(THREAD, JNIHandles::resolve(mh));
@@ -177,23 +177,23 @@ JVM_ENTRY(jlong, PUH_AllocateOptimizedUpcallStub(JNIEnv *env, jclass unused, job
BasicType* in_sig_bt = out_sig_bt + 1;
int total_in_args = total_out_args - 1;
- return (jlong) ProgrammableUpcallHandler::generate_optimized_upcall_stub(
+ return (jlong) UpcallLinker::make_upcall_stub(
mh_j, entry, in_sig_bt, total_in_args, out_sig_bt, total_out_args, ret_type, abi, conv, needs_return_buffer, checked_cast<int>(ret_buf_size));
JVM_END
#define CC (char*) /*cast a literal from (const char*)*/
#define FN_PTR(f) CAST_FROM_FN_PTR(void*, &f)
-static JNINativeMethod PUH_methods[] = {
- {CC "allocateOptimizedUpcallStub", CC "(" "Ljava/lang/invoke/MethodHandle;" "L" FOREIGN_ABI "ABIDescriptor;" "L" FOREIGN_ABI "ProgrammableUpcallHandler$CallRegs;" "ZJ)J", FN_PTR(PUH_AllocateOptimizedUpcallStub)},
+static JNINativeMethod UL_methods[] = {
+ {CC "makeUpcallStub", CC "(" "Ljava/lang/invoke/MethodHandle;" "L" FOREIGN_ABI "ABIDescriptor;" "L" FOREIGN_ABI "UpcallLinker$CallRegs;" "ZJ)J", FN_PTR(UL_MakeUpcallStub)},
};
/**
* This one function is exported, used by NativeLookup.
*/
-JNI_ENTRY(void, JVM_RegisterProgrammableUpcallHandlerMethods(JNIEnv *env, jclass PUH_class))
+JNI_ENTRY(void, JVM_RegisterUpcallLinkerMethods(JNIEnv *env, jclass UL_class))
ThreadToNativeFromVM ttnfv(thread);
- int status = env->RegisterNatives(PUH_class, PUH_methods, sizeof(PUH_methods)/sizeof(JNINativeMethod));
+ int status = env->RegisterNatives(UL_class, UL_methods, sizeof(UL_methods)/sizeof(JNINativeMethod));
guarantee(status == JNI_OK && !env->ExceptionOccurred(),
- "register jdk.internal.foreign.abi.ProgrammableUpcallHandler natives");
+ "register jdk.internal.foreign.abi.UpcallLinker natives");
JNI_END
diff --git a/src/hotspot/share/prims/universalUpcallHandler.hpp b/src/hotspot/share/prims/upcallLinker.hpp
similarity index 59%
rename from src/hotspot/share/prims/universalUpcallHandler.hpp
rename to src/hotspot/share/prims/upcallLinker.hpp
index 5fcaf9ed890bd..3f8c717e5014f 100644
--- a/src/hotspot/share/prims/universalUpcallHandler.hpp
+++ b/src/hotspot/share/prims/upcallLinker.hpp
@@ -21,29 +21,29 @@
* questions.
*/
-#ifndef SHARE_VM_PRIMS_UNIVERSALUPCALLHANDLER_HPP
-#define SHARE_VM_PRIMS_UNIVERSALUPCALLHANDLER_HPP
+#ifndef SHARE_VM_PRIMS_UPCALLLINKER_HPP
+#define SHARE_VM_PRIMS_UPCALLLINKER_HPP
#include "asm/codeBuffer.hpp"
#include "code/codeBlob.hpp"
-#include "prims/foreign_globals.hpp"
+#include "prims/foreignGlobals.hpp"
class JavaThread;
-class ProgrammableUpcallHandler {
+class UpcallLinker {
private:
static void handle_uncaught_exception(oop exception);
static JavaThread* maybe_attach_and_get_thread();
- static JavaThread* on_entry(OptimizedEntryBlob::FrameData* context);
- static void on_exit(OptimizedEntryBlob::FrameData* context);
+ static JavaThread* on_entry(UpcallStub::FrameData* context);
+ static void on_exit(UpcallStub::FrameData* context);
public:
- static address generate_optimized_upcall_stub(jobject mh, Method* entry,
- BasicType* in_sig_bt, int total_in_args,
- BasicType* out_sig_bt, int total_out_args,
- BasicType ret_type,
- jobject jabi, jobject jconv,
- bool needs_return_buffer, int ret_buf_size);
+ static address make_upcall_stub(jobject mh, Method* entry,
+ BasicType* in_sig_bt, int total_in_args,
+ BasicType* out_sig_bt, int total_out_args,
+ BasicType ret_type,
+ jobject jabi, jobject jconv,
+ bool needs_return_buffer, int ret_buf_size);
};
-#endif // SHARE_VM_PRIMS_UNIVERSALUPCALLHANDLER_HPP
+#endif // SHARE_VM_PRIMS_UPCALLLINKER_HPP
diff --git a/src/hotspot/share/prims/upcallStubs.cpp b/src/hotspot/share/prims/upcallStubs.cpp
index 499d4e5899d48..19737575fcdb5 100644
--- a/src/hotspot/share/prims/upcallStubs.cpp
+++ b/src/hotspot/share/prims/upcallStubs.cpp
@@ -32,7 +32,7 @@ JVM_ENTRY(static jboolean, UH_FreeUpcallStub0(JNIEnv *env, jobject _unused, jlon
if (cb == nullptr) {
return false;
}
- OptimizedEntryBlob::free(cb->as_optimized_entry_blob());
+ UpcallStub::free(cb->as_upcall_stub());
return true;
JVM_END
diff --git a/src/hotspot/share/runtime/frame.cpp b/src/hotspot/share/runtime/frame.cpp
index 6d7f7841be2d7..a8acdf6f423ae 100644
--- a/src/hotspot/share/runtime/frame.cpp
+++ b/src/hotspot/share/runtime/frame.cpp
@@ -1153,8 +1153,8 @@ void frame::oops_do_internal(OopClosure* f, CodeBlobClosure* cf,
oops_interpreted_do(f, map, use_interpreter_oop_map_cache);
} else if (is_entry_frame()) {
oops_entry_do(f, map);
- } else if (is_optimized_entry_frame()) {
- _cb->as_optimized_entry_blob()->oops_do(f, *this);
+ } else if (is_upcall_stub_frame()) {
+ _cb->as_upcall_stub()->oops_do(f, *this);
} else if (CodeCache::contains(pc())) {
oops_code_blob_do(f, cf, df, derived_mode, map);
} else {
diff --git a/src/hotspot/share/runtime/frame.hpp b/src/hotspot/share/runtime/frame.hpp
index 8413d2ceb3c7e..3a9d7b1e2671e 100644
--- a/src/hotspot/share/runtime/frame.hpp
+++ b/src/hotspot/share/runtime/frame.hpp
@@ -188,7 +188,7 @@ class frame {
bool is_compiled_frame() const;
bool is_safepoint_blob_frame() const;
bool is_deoptimized_frame() const;
- bool is_optimized_entry_frame() const;
+ bool is_upcall_stub_frame() const;
bool is_heap_frame() const { return _on_heap; }
// testers
@@ -200,7 +200,7 @@ class frame {
// is this frame doing a call using the compiled calling convention?
bool is_compiled_caller() const {
- return is_compiled_frame() || is_optimized_entry_frame();
+ return is_compiled_frame() || is_upcall_stub_frame();
}
// tells whether this frame is marked for deoptimization
@@ -238,7 +238,7 @@ class frame {
frame sender_for_entry_frame(RegisterMap* map) const;
frame sender_for_interpreter_frame(RegisterMap* map) const;
frame sender_for_native_frame(RegisterMap* map) const;
- frame sender_for_optimized_entry_frame(RegisterMap* map) const;
+ frame sender_for_upcall_stub_frame(RegisterMap* map) const;
bool is_entry_frame_valid(JavaThread* thread) const;
@@ -420,7 +420,7 @@ class frame {
// tells whether there is another chunk of Delta stack above
bool entry_frame_is_first() const;
- bool optimized_entry_frame_is_first() const;
+ bool upcall_stub_frame_is_first() const;
// Safepoints
diff --git a/src/hotspot/share/runtime/frame.inline.hpp b/src/hotspot/share/runtime/frame.inline.hpp
index 91a16cedecdc5..926f7d6b38df7 100644
--- a/src/hotspot/share/runtime/frame.inline.hpp
+++ b/src/hotspot/share/runtime/frame.inline.hpp
@@ -54,12 +54,12 @@ inline bool frame::is_stub_frame() const {
inline bool frame::is_first_frame() const {
return (is_entry_frame() && entry_frame_is_first())
- // Optimized entry frames are only present on certain platforms
- || (is_optimized_entry_frame() && optimized_entry_frame_is_first());
+ // Upcall stub frames entry frames are only present on certain platforms
+ || (is_upcall_stub_frame() && upcall_stub_frame_is_first());
}
-inline bool frame::is_optimized_entry_frame() const {
- return _cb != NULL && _cb->is_optimized_entry_blob();
+inline bool frame::is_upcall_stub_frame() const {
+ return _cb != NULL && _cb->is_upcall_stub();
}
inline bool frame::is_compiled_frame() const {
diff --git a/src/hotspot/share/runtime/init.cpp b/src/hotspot/share/runtime/init.cpp
index 735e0cff089d5..9a53cc1a265cb 100644
--- a/src/hotspot/share/runtime/init.cpp
+++ b/src/hotspot/share/runtime/init.cpp
@@ -38,7 +38,7 @@
#include "memory/universe.hpp"
#include "prims/jvmtiExport.hpp"
#include "prims/methodHandles.hpp"
-#include "prims/universalNativeInvoker.hpp"
+#include "prims/downcallLinker.hpp"
#include "runtime/globals.hpp"
#include "runtime/atomic.hpp"
#include "runtime/continuation.hpp"
diff --git a/src/hotspot/share/runtime/javaFrameAnchor.hpp b/src/hotspot/share/runtime/javaFrameAnchor.hpp
index a69d41a1e5cae..383851ae9f5d7 100644
--- a/src/hotspot/share/runtime/javaFrameAnchor.hpp
+++ b/src/hotspot/share/runtime/javaFrameAnchor.hpp
@@ -34,7 +34,7 @@
//
class JavaThread;
class MacroAssembler;
-class ProgrammableUpcallHandler;
+class UpcallLinker;
class ZeroFrame;
class JavaFrameAnchor {
@@ -53,7 +53,7 @@ friend class VMStructs;
friend class JVMCIVMStructs;
friend class BytecodeInterpreter;
friend class JavaCallWrapper;
-friend class ProgrammableUpcallHandler;
+friend class UpcallLinker;
private:
//
diff --git a/src/hotspot/share/runtime/sharedRuntime.cpp b/src/hotspot/share/runtime/sharedRuntime.cpp
index ccb5d5c962533..5dfc1220bb0f1 100644
--- a/src/hotspot/share/runtime/sharedRuntime.cpp
+++ b/src/hotspot/share/runtime/sharedRuntime.cpp
@@ -513,8 +513,8 @@ address SharedRuntime::raw_exception_handler_for_return_address(JavaThread* curr
// JavaCallWrapper::~JavaCallWrapper
return StubRoutines::catch_exception_entry();
}
- if (blob != NULL && blob->is_optimized_entry_blob()) {
- return ((OptimizedEntryBlob*)blob)->exception_handler();
+ if (blob != NULL && blob->is_upcall_stub()) {
+ return ((UpcallStub*)blob)->exception_handler();
}
// Interpreted code
if (Interpreter::contains(return_address)) {
@@ -1459,7 +1459,7 @@ JRT_BLOCK_ENTRY(address, SharedRuntime::handle_wrong_method_ic_miss(JavaThread*
frame stub_frame = current->last_frame();
assert(stub_frame.is_runtime_frame(), "sanity check");
frame caller_frame = stub_frame.sender(®_map);
- assert(!caller_frame.is_interpreted_frame() && !caller_frame.is_entry_frame() && !caller_frame.is_optimized_entry_frame(), "unexpected frame");
+ assert(!caller_frame.is_interpreted_frame() && !caller_frame.is_entry_frame() && !caller_frame.is_upcall_stub_frame(), "unexpected frame");
#endif /* ASSERT */
methodHandle callee_method;
@@ -1492,7 +1492,7 @@ JRT_BLOCK_ENTRY(address, SharedRuntime::handle_wrong_method(JavaThread* current)
if (caller_frame.is_interpreted_frame() ||
caller_frame.is_entry_frame() ||
- caller_frame.is_optimized_entry_frame()) {
+ caller_frame.is_upcall_stub_frame()) {
Method* callee = current->callee_target();
guarantee(callee != NULL && callee->is_method(), "bad handshake");
current->set_vm_result_2(callee);
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/ProgrammableInvoker.java b/src/java.base/share/classes/jdk/internal/foreign/abi/DowncallLinker.java
similarity index 94%
rename from src/java.base/share/classes/jdk/internal/foreign/abi/ProgrammableInvoker.java
rename to src/java.base/share/classes/jdk/internal/foreign/abi/DowncallLinker.java
index 4ce3344a687b9..a0475725b415c 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/ProgrammableInvoker.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/DowncallLinker.java
@@ -44,14 +44,9 @@
import static java.lang.invoke.MethodHandles.insertArguments;
import static java.lang.invoke.MethodType.methodType;
-/**
- * This class implements native call invocation through a so called 'universal adapter'. A universal adapter takes
- * an array of longs together with a call 'recipe', which is used to move the arguments in the right places as
- * expected by the system ABI.
- */
-public class ProgrammableInvoker {
+public class DowncallLinker {
private static final boolean USE_SPEC = Boolean.parseBoolean(
- GetPropertyAction.privilegedGetProperty("jdk.internal.foreign.ProgrammableInvoker.USE_SPEC", "true"));
+ GetPropertyAction.privilegedGetProperty("jdk.internal.foreign.DowncallLinker.USE_SPEC", "true"));
private static final JavaLangInvokeAccess JLIA = SharedSecrets.getJavaLangInvokeAccess();
@@ -62,7 +57,7 @@ public class ProgrammableInvoker {
static {
try {
MethodHandles.Lookup lookup = MethodHandles.lookup();
- MH_INVOKE_INTERP_BINDINGS = lookup.findVirtual(ProgrammableInvoker.class, "invokeInterpBindings",
+ MH_INVOKE_INTERP_BINDINGS = lookup.findVirtual(DowncallLinker.class, "invokeInterpBindings",
methodType(Object.class, SegmentAllocator.class, Object[].class, InvocationData.class));
MH_CHECK_SYMBOL = lookup.findStatic(SharedUtils.class, "checkSymbol",
methodType(void.class, Addressable.class));
@@ -74,7 +69,7 @@ public class ProgrammableInvoker {
private final ABIDescriptor abi;
private final CallingSequence callingSequence;
- public ProgrammableInvoker(ABIDescriptor abi, CallingSequence callingSequence) {
+ public DowncallLinker(ABIDescriptor abi, CallingSequence callingSequence) {
this.abi = abi;
assert callingSequence.forDowncall();
this.callingSequence = callingSequence;
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/NativeEntryPoint.java b/src/java.base/share/classes/jdk/internal/foreign/abi/NativeEntryPoint.java
index 8cad1b7e4c697..aad5091c6ee70 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/NativeEntryPoint.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/NativeEntryPoint.java
@@ -33,7 +33,7 @@
import java.util.List;
/**
- * This class describes a 'native invoker', which is used as an appendix argument to linkToNative calls.
+ * This class describes a 'native entry point', which is used as an appendix argument to linkToNative calls.
*/
public class NativeEntryPoint {
static {
@@ -41,17 +41,17 @@ public class NativeEntryPoint {
}
private final MethodType methodType;
- private final long invoker; // read by VM
+ private final long downcallStubAddress; // read by VM
private static final Cleaner CLEANER = CleanerFactory.cleaner();
- private static final SoftReferenceCache<CacheKey, NativeEntryPoint> INVOKER_CACHE = new SoftReferenceCache<>();
+ private static final SoftReferenceCache<CacheKey, NativeEntryPoint> NEP_CACHE = new SoftReferenceCache<>();
private record CacheKey(MethodType methodType, ABIDescriptor abi,
List<VMStorage> argMoves, List<VMStorage> retMoves,
boolean needsReturnBuffer) {}
- private NativeEntryPoint(MethodType methodType, long invoker) {
+ private NativeEntryPoint(MethodType methodType, long downcallStubAddress) {
this.methodType = methodType;
- this.invoker = invoker;
+ this.downcallStubAddress = downcallStubAddress;
}
public static NativeEntryPoint make(ABIDescriptor abi,
@@ -65,22 +65,22 @@ public static NativeEntryPoint make(ABIDescriptor abi,
assert (!needsReturnBuffer || methodType.parameterType(1) == long.class) : "return buffer address expected";
CacheKey key = new CacheKey(methodType, abi, Arrays.asList(argMoves), Arrays.asList(returnMoves), needsReturnBuffer);
- return INVOKER_CACHE.get(key, k -> {
- long invoker = makeInvoker(methodType, abi, argMoves, returnMoves, needsReturnBuffer);
- NativeEntryPoint nep = new NativeEntryPoint(methodType, invoker);
- CLEANER.register(nep, () -> freeInvoker(invoker));
+ return NEP_CACHE.get(key, k -> {
+ long downcallStub = makeDowncallStub(methodType, abi, argMoves, returnMoves, needsReturnBuffer);
+ NativeEntryPoint nep = new NativeEntryPoint(methodType, downcallStub);
+ CLEANER.register(nep, () -> freeDowncallStub(downcallStub));
return nep;
});
}
- private static native long makeInvoker(MethodType methodType, ABIDescriptor abi,
- VMStorage[] encArgMoves, VMStorage[] encRetMoves,
- boolean needsReturnBuffer);
+ private static native long makeDowncallStub(MethodType methodType, ABIDescriptor abi,
+ VMStorage[] encArgMoves, VMStorage[] encRetMoves,
+ boolean needsReturnBuffer);
- private static native boolean freeInvoker0(long invoker);
- private static void freeInvoker(long invoker) {
- if (!freeInvoker0(invoker)) {
- throw new InternalError("Could not free invoker");
+ private static native boolean freeDowncallStub0(long downcallStub);
+ private static void freeDowncallStub(long downcallStub) {
+ if (!freeDowncallStub0(downcallStub)) {
+ throw new InternalError("Could not free downcall stub");
}
}
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/ProgrammableUpcallHandler.java b/src/java.base/share/classes/jdk/internal/foreign/abi/UpcallLinker.java
similarity index 94%
rename from src/java.base/share/classes/jdk/internal/foreign/abi/ProgrammableUpcallHandler.java
rename to src/java.base/share/classes/jdk/internal/foreign/abi/UpcallLinker.java
index 00feb678aad38..bb2bff5b067c1 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/ProgrammableUpcallHandler.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/UpcallLinker.java
@@ -43,18 +43,18 @@
import static java.lang.invoke.MethodType.methodType;
import static sun.security.action.GetBooleanAction.privilegedGetProperty;
-public class ProgrammableUpcallHandler {
+public class UpcallLinker {
private static final boolean DEBUG =
- privilegedGetProperty("jdk.internal.foreign.ProgrammableUpcallHandler.DEBUG");
+ privilegedGetProperty("jdk.internal.foreign.UpcallLinker.DEBUG");
private static final boolean USE_SPEC = Boolean.parseBoolean(
- GetPropertyAction.privilegedGetProperty("jdk.internal.foreign.ProgrammableUpcallHandler.USE_SPEC", "true"));
+ GetPropertyAction.privilegedGetProperty("jdk.internal.foreign.UpcallLinker.USE_SPEC", "true"));
private static final MethodHandle MH_invokeInterpBindings;
static {
try {
MethodHandles.Lookup lookup = lookup();
- MH_invokeInterpBindings = lookup.findStatic(ProgrammableUpcallHandler.class, "invokeInterpBindings",
+ MH_invokeInterpBindings = lookup.findStatic(UpcallLinker.class, "invokeInterpBindings",
methodType(Object.class, Object[].class, InvocationData.class));
} catch (ReflectiveOperationException e) {
throw new InternalError(e);
@@ -91,7 +91,7 @@ public static MemorySegment make(ABIDescriptor abi, MethodHandle target, Calling
VMStorage[] args = Arrays.stream(argMoves).map(Binding.Move::storage).toArray(VMStorage[]::new);
VMStorage[] rets = Arrays.stream(retMoves).map(Binding.Move::storage).toArray(VMStorage[]::new);
CallRegs conv = new CallRegs(args, rets);
- long entryPoint = allocateOptimizedUpcallStub(doBindings, abi, conv,
+ long entryPoint = makeUpcallStub(doBindings, abi, conv,
callingSequence.needsReturnBuffer(), callingSequence.returnBufferSize());
return UpcallStubs.makeUpcall(entryPoint, session);
}
@@ -198,8 +198,8 @@ private static Object invokeInterpBindings(Object[] lowLevelArgs, InvocationData
// used for transporting data into native code
private static record CallRegs(VMStorage[] argRegs, VMStorage[] retRegs) {}
- static native long allocateOptimizedUpcallStub(MethodHandle mh, ABIDescriptor abi, CallRegs conv,
- boolean needsReturnBuffer, long returnBufferSize);
+ static native long makeUpcallStub(MethodHandle mh, ABIDescriptor abi, CallRegs conv,
+ boolean needsReturnBuffer, long returnBufferSize);
private static native void registerNatives();
static {
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/aarch64/CallArranger.java b/src/java.base/share/classes/jdk/internal/foreign/abi/aarch64/CallArranger.java
index 58bcce31f05aa..9bb1237996894 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/aarch64/CallArranger.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/aarch64/CallArranger.java
@@ -34,13 +34,13 @@
import jdk.internal.foreign.abi.Binding;
import jdk.internal.foreign.abi.CallingSequence;
import jdk.internal.foreign.abi.CallingSequenceBuilder;
-import jdk.internal.foreign.abi.ProgrammableUpcallHandler;
+import jdk.internal.foreign.abi.DowncallLinker;
+import jdk.internal.foreign.abi.UpcallLinker;
import jdk.internal.foreign.abi.SharedUtils;
import jdk.internal.foreign.abi.VMStorage;
import jdk.internal.foreign.abi.aarch64.linux.LinuxAArch64CallArranger;
import jdk.internal.foreign.abi.aarch64.macos.MacOsAArch64CallArranger;
import jdk.internal.foreign.Utils;
-import jdk.internal.foreign.abi.ProgrammableInvoker;
import java.lang.foreign.MemorySession;
import java.lang.invoke.MethodHandle;
@@ -52,8 +52,8 @@
import static jdk.internal.foreign.abi.aarch64.AArch64Architecture.*;
/**
- * For the AArch64 C ABI specifically, this class uses the ProgrammableInvoker API, namely CallingSequenceBuilder2
- * to translate a C FunctionDescriptor into a CallingSequence2, which can then be turned into a MethodHandle.
+ * For the AArch64 C ABI specifically, this class uses CallingSequenceBuilder
+ * to translate a C FunctionDescriptor into a CallingSequence, which can then be turned into a MethodHandle.
*
* This includes taking care of synthetic arguments like pointers to return buffers for 'in-memory' returns.
*
@@ -147,7 +147,7 @@ public Bindings getBindings(MethodType mt, FunctionDescriptor cDesc, boolean for
public MethodHandle arrangeDowncall(MethodType mt, FunctionDescriptor cDesc) {
Bindings bindings = getBindings(mt, cDesc, false);
- MethodHandle handle = new ProgrammableInvoker(C, bindings.callingSequence).getBoundMethodHandle();
+ MethodHandle handle = new DowncallLinker(C, bindings.callingSequence).getBoundMethodHandle();
if (bindings.isInMemoryReturn) {
handle = SharedUtils.adaptDowncallForIMR(handle, cDesc);
@@ -163,7 +163,7 @@ public MemorySegment arrangeUpcall(MethodHandle target, MethodType mt, FunctionD
target = SharedUtils.adaptUpcallForIMR(target, true /* drop return, since we don't have bindings for it */);
}
- return ProgrammableUpcallHandler.make(C, target, bindings.callingSequence, session);
+ return UpcallLinker.make(C, target, bindings.callingSequence, session);
}
private static boolean isInMemoryReturn(Optional<MemoryLayout> returnLayout) {
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/CallArranger.java b/src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/CallArranger.java
index b9f00afcff6b2..897ac3b9be901 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/CallArranger.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/x64/sysv/CallArranger.java
@@ -25,33 +25,33 @@
*/
package jdk.internal.foreign.abi.x64.sysv;
+import jdk.internal.foreign.abi.ABIDescriptor;
+import jdk.internal.foreign.abi.Binding;
+import jdk.internal.foreign.abi.CallingSequence;
+import jdk.internal.foreign.abi.CallingSequenceBuilder;
+import jdk.internal.foreign.abi.DowncallLinker;
+import jdk.internal.foreign.abi.SharedUtils;
+import jdk.internal.foreign.abi.UpcallLinker;
+import jdk.internal.foreign.abi.VMStorage;
+
import java.lang.foreign.FunctionDescriptor;
import java.lang.foreign.GroupLayout;
import java.lang.foreign.MemoryAddress;
import java.lang.foreign.MemoryLayout;
import java.lang.foreign.MemorySegment;
import java.lang.foreign.MemorySession;
-import jdk.internal.foreign.abi.ABIDescriptor;
-import jdk.internal.foreign.abi.CallingSequence;
-import jdk.internal.foreign.abi.CallingSequenceBuilder;
-import jdk.internal.foreign.abi.VMStorage;
-import jdk.internal.foreign.abi.Binding;
-import jdk.internal.foreign.abi.ProgrammableInvoker;
-import jdk.internal.foreign.abi.ProgrammableUpcallHandler;
-import jdk.internal.foreign.abi.SharedUtils;
-
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodType;
import java.util.List;
import java.util.Optional;
-import static jdk.internal.foreign.PlatformLayouts.*;
-import static jdk.internal.foreign.abi.Binding.*;
+import static jdk.internal.foreign.PlatformLayouts.SysV;
+import static jdk.internal.foreign.abi.Binding.vmStore;
import static jdk.internal.foreign.abi.x64.X86_64Architecture.*;
/**
- * For the SysV x64 C ABI specifically, this class uses the ProgrammableInvoker API, namely CallingSequenceBuilder2
+ * For the SysV x64 C ABI specifically, this class uses namely CallingSequenceBuilder
* to translate a C FunctionDescriptor into a CallingSequence, which can then be turned into a MethodHandle.
*
* This includes taking care of synthetic arguments like pointers to return buffers for 'in-memory' returns.
@@ -121,7 +121,7 @@ public static Bindings getBindings(MethodType mt, FunctionDescriptor cDesc, bool
public static MethodHandle arrangeDowncall(MethodType mt, FunctionDescriptor cDesc) {
Bindings bindings = getBindings(mt, cDesc, false);
- MethodHandle handle = new ProgrammableInvoker(CSysV, bindings.callingSequence).getBoundMethodHandle();
+ MethodHandle handle = new DowncallLinker(CSysV, bindings.callingSequence).getBoundMethodHandle();
handle = MethodHandles.insertArguments(handle, handle.type().parameterCount() - 1, bindings.nVectorArgs);
if (bindings.isInMemoryReturn) {
@@ -138,7 +138,7 @@ public static MemorySegment arrangeUpcall(MethodHandle target, MethodType mt, Fu
target = SharedUtils.adaptUpcallForIMR(target, true /* drop return, since we don't have bindings for it */);
}
- return ProgrammableUpcallHandler.make(CSysV, target, bindings.callingSequence, session);
+ return UpcallLinker.make(CSysV, target, bindings.callingSequence, session);
}
private static boolean isInMemoryReturn(Optional<MemoryLayout> returnLayout) {
diff --git a/src/java.base/share/classes/jdk/internal/foreign/abi/x64/windows/CallArranger.java b/src/java.base/share/classes/jdk/internal/foreign/abi/x64/windows/CallArranger.java
index 256e9b760e4a8..e0403e71894e7 100644
--- a/src/java.base/share/classes/jdk/internal/foreign/abi/x64/windows/CallArranger.java
+++ b/src/java.base/share/classes/jdk/internal/foreign/abi/x64/windows/CallArranger.java
@@ -24,34 +24,34 @@
*/
package jdk.internal.foreign.abi.x64.windows;
-import java.lang.foreign.FunctionDescriptor;
-import java.lang.foreign.GroupLayout;
-import java.lang.foreign.MemoryAddress;
-import java.lang.foreign.MemoryLayout;
-import java.lang.foreign.MemorySegment;
-import java.lang.foreign.MemorySession;
import jdk.internal.foreign.Utils;
-import jdk.internal.foreign.abi.CallingSequenceBuilder;
import jdk.internal.foreign.abi.ABIDescriptor;
import jdk.internal.foreign.abi.Binding;
import jdk.internal.foreign.abi.CallingSequence;
-import jdk.internal.foreign.abi.ProgrammableInvoker;
-import jdk.internal.foreign.abi.ProgrammableUpcallHandler;
+import jdk.internal.foreign.abi.CallingSequenceBuilder;
+import jdk.internal.foreign.abi.DowncallLinker;
+import jdk.internal.foreign.abi.SharedUtils;
+import jdk.internal.foreign.abi.UpcallLinker;
import jdk.internal.foreign.abi.VMStorage;
import jdk.internal.foreign.abi.x64.X86_64Architecture;
-import jdk.internal.foreign.abi.SharedUtils;
+import java.lang.foreign.FunctionDescriptor;
+import java.lang.foreign.GroupLayout;
+import java.lang.foreign.MemoryAddress;
+import java.lang.foreign.MemoryLayout;
+import java.lang.foreign.MemorySegment;
+import java.lang.foreign.MemorySession;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodType;
import java.util.List;
import java.util.Optional;
-import static jdk.internal.foreign.PlatformLayouts.*;
+import static jdk.internal.foreign.PlatformLayouts.Win64;
import static jdk.internal.foreign.abi.x64.X86_64Architecture.*;
/**
- * For the Windowx x64 C ABI specifically, this class uses the ProgrammableInvoker API, namely CallingSequenceBuilder2
- * to translate a C FunctionDescriptor into a CallingSequence2, which can then be turned into a MethodHandle.
+ * For the Windowx x64 C ABI specifically, this class uses CallingSequenceBuilder
+ * to translate a C FunctionDescriptor into a CallingSequence, which can then be turned into a MethodHandle.
*
* This includes taking care of synthetic arguments like pointers to return buffers for 'in-memory' returns.
*/
@@ -124,7 +124,7 @@ void setReturnBindings(Class<?> carrier, MemoryLayout layout) {
public static MethodHandle arrangeDowncall(MethodType mt, FunctionDescriptor cDesc) {
Bindings bindings = getBindings(mt, cDesc, false);
- MethodHandle handle = new ProgrammableInvoker(CWindows, bindings.callingSequence).getBoundMethodHandle();
+ MethodHandle handle = new DowncallLinker(CWindows, bindings.callingSequence).getBoundMethodHandle();
if (bindings.isInMemoryReturn) {
handle = SharedUtils.adaptDowncallForIMR(handle, cDesc);
@@ -140,7 +140,7 @@ public static MemorySegment arrangeUpcall(MethodHandle target, MethodType mt, Fu
target = SharedUtils.adaptUpcallForIMR(target, false /* need the return value as well */);
}
- return ProgrammableUpcallHandler.make(CWindows, target, bindings.callingSequence, session);
+ return UpcallLinker.make(CWindows, target, bindings.callingSequence, session);
}
private static boolean isInMemoryReturn(Optional<MemoryLayout> returnLayout) {