Skip to content

8337987: Relocate jfr and throw_exception stubs from StubGenerator to SharedRuntime #20566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 11 commits into from
Closed

8337987: Relocate jfr and throw_exception stubs from StubGenerator to SharedRuntime #20566

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7f9f0c4
8337987: Relocate jfr and throw_exception stubs from StubGenerator to…
adinn Aug 13, 2024
419c2e3
fix issues with ports
adinn Aug 13, 2024
9614be2
fix some header includes and defintions
adinn Aug 13, 2024
a390a06
fix throw exception stub generation on zero
adinn Aug 13, 2024
58c4234
fix frame layouts for x86_32
adinn Aug 13, 2024
0384e58
typo
adinn Aug 13, 2024
ea4ec0c
copy macro across
adinn Aug 13, 2024
f12aea0
fix accidental paste
adinn Aug 13, 2024
1648205
fix riscv port issues
adinn Aug 14, 2024
d0ba968
fix up jvmci static field declarations
adinn Aug 14, 2024
6307695
merge
adinn Aug 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/hotspot/share/jvmci/jvmciCompilerToVM.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ class CompilerToVM {
static address SharedRuntime_deopt_blob_unpack_with_exception_in_tls;
static address SharedRuntime_deopt_blob_uncommon_trap;
static address SharedRuntime_polling_page_return_handler;
static address SharedRuntime_throw_delayed_StackOverflowError_entry;

static address nmethod_entry_barrier;
static int thread_disarmed_guard_value_offset;
Expand Down
2 changes: 2 additions & 0 deletions src/hotspot/share/jvmci/jvmciCompilerToVMInit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ address CompilerToVM::Data::SharedRuntime_deopt_blob_unpack;
address CompilerToVM::Data::SharedRuntime_deopt_blob_unpack_with_exception_in_tls;
address CompilerToVM::Data::SharedRuntime_deopt_blob_uncommon_trap;
address CompilerToVM::Data::SharedRuntime_polling_page_return_handler;
address CompilerToVM::Data::SharedRuntime_throw_delayed_StackOverflowError_entry;

address CompilerToVM::Data::nmethod_entry_barrier;
int CompilerToVM::Data::thread_disarmed_guard_value_offset;
Expand Down Expand Up @@ -158,6 +159,7 @@ void CompilerToVM::Data::initialize(JVMCI_TRAPS) {
SharedRuntime_deopt_blob_unpack_with_exception_in_tls = SharedRuntime::deopt_blob()->unpack_with_exception_in_tls();
SharedRuntime_deopt_blob_uncommon_trap = SharedRuntime::deopt_blob()->uncommon_trap();
SharedRuntime_polling_page_return_handler = SharedRuntime::polling_page_return_handler_blob()->entry_point();
SharedRuntime_throw_delayed_StackOverflowError_entry = SharedRuntime::throw_delayed_StackOverflowError_entry();

BarrierSetNMethod* bs_nm = BarrierSet::barrier_set()->barrier_set_nmethod();
if (bs_nm != nullptr) {
Expand Down
2 changes: 2 additions & 0 deletions src/hotspot/share/jvmci/vmStructs_jvmci.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@
static_field(CompilerToVM::Data, SharedRuntime_deopt_blob_uncommon_trap, address) \
static_field(CompilerToVM::Data, SharedRuntime_polling_page_return_handler, \
address) \
static_field(CompilerToVM::Data, SharedRuntime_throw_delayed_StackOverflowError_entry, \
address) \
\
static_field(CompilerToVM::Data, nmethod_entry_barrier, address) \
static_field(CompilerToVM::Data, thread_disarmed_guard_value_offset, int) \
Expand Down