Skip to content

8320272: Make method_entry_barrier address shared #16708

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 3 commits into from
Closed

8320272: Make method_entry_barrier address shared #16708

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
359135e
8320272: Make method_entry_barrier address shared
vnkozlov Nov 17, 2023
3af0798
address comment
vnkozlov Nov 19, 2023
bbf946c
Addition RISC-V patch
vnkozlov Nov 20, 2023
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
9 changes: 6 additions & 3 deletions src/hotspot/cpu/riscv/c2_CodeStubs_riscv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,13 @@ int C2EntryBarrierStub::max_size() const {

void C2EntryBarrierStub::emit(C2_MacroAssembler& masm) {
__ bind(entry());
RuntimeAddress target(StubRoutines::method_entry_barrier());
__ relocate(target.rspec(), [&] {
int32_t offset;
__ la_patchable(t0, target, offset);
__ jalr(ra, t0, offset);
});

int32_t offset = 0;
__ movptr(t0, StubRoutines::method_entry_barrier(), offset);
__ jalr(ra, t0, offset);
__ j(continuation());

// make guard value 4-byte aligned so that it can be accessed by atomic instructions on RISC-V
Expand Down
10 changes: 7 additions & 3 deletions src/hotspot/cpu/riscv/gc/shared/barrierSetAssembler_riscv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,9 +308,13 @@ void BarrierSetAssembler::nmethod_entry_barrier(MacroAssembler* masm, Label* slo
Label skip_barrier;
__ beq(t0, t1, skip_barrier);

int32_t offset = 0;
__ movptr(t0, StubRoutines::method_entry_barrier(), offset);
__ jalr(ra, t0, offset);
RuntimeAddress target(StubRoutines::method_entry_barrier());
__ relocate(target.rspec(), [&] {
int32_t offset;
__ la_patchable(t0, target, offset);
__ jalr(ra, t0, offset);
});

__ j(skip_barrier);

__ bind(local_guard);
Expand Down