Skip to content

8370708: RISC-V: Add VerifyStackAtCalls #28005

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

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
+23 −9
Open

8370708: RISC-V: Add VerifyStackAtCalls #28005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f7242f2
Draft
robehn Oct 24, 2025
257b049
li->mv, format, space
robehn Oct 28, 2025
1a2059f
Label name
robehn Oct 28, 2025
0dfed06
Fixed format
robehn Oct 28, 2025
53ac0f9
Forgot fix format for VSAC
robehn Oct 29, 2025
00bd0de
Merge branch 'master' into vsc
robehn Oct 29, 2025
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
30 changes: 22 additions & 8 deletions src/hotspot/cpu/riscv/riscv.ad
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1184,6 +1184,8 @@ bool is_CAS(int opcode, bool maybe_volatile)
}
}

constexpr uint64_t MAJIK_DWORD = 0xabbaabbaabbaabbaull;

// predicate controlling translation of CAS
//
// returns true if CAS needs to use an acquiring load otherwise false
Expand Down Expand Up @@ -1363,10 +1365,15 @@ void MachPrologNode::format(PhaseRegAlloc *ra_, outputStream *st) const {
st->print("# stack bang size=%d\n\t", framesize);
}

st->print("sd fp, [sp, #%d]\n\t", - 2 * wordSize);
st->print("sd ra, [sp, #%d]\n\t", - wordSize);
if (PreserveFramePointer) { st->print("sub fp, sp, #%d\n\t", 2 * wordSize); }
st->print("sub sp, sp, #%d\n\t", framesize);
st->print("sd fp, [sp, #%d]\n\t", framesize - 2 * wordSize);
st->print("sd ra, [sp, #%d]\n\t", framesize - wordSize);
if (PreserveFramePointer) { st->print("add fp, sp, #%d\n\t", framesize); }

if (VerifyStackAtCalls) {
st->print("mv t2, %ld\n\t", MAJIK_DWORD);
st->print("sd t2, [sp, #%d]\n\t", framesize - 3 * wordSize);
}

if (C->stub_function() == nullptr) {
st->print("ld t0, [guard]\n\t");
Expand Down Expand Up @@ -1408,6 +1415,11 @@ void MachPrologNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {

__ build_frame(framesize);

if (VerifyStackAtCalls) {
__ mv(t2, MAJIK_DWORD);
__ sd(t2, Address(sp, framesize - 3 * wordSize));
}

if (C->stub_function() == nullptr) {
BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
// Dummy labels for just measuring the code size
Expand All @@ -1429,10 +1441,6 @@ void MachPrologNode::emit(C2_MacroAssembler *masm, PhaseRegAlloc *ra_) const {
bs->nmethod_entry_barrier(masm, slow_path, continuation, guard);
}

if (VerifyStackAtCalls) {
Unimplemented();
}

C->output()->set_frame_complete(__ offset());

if (C->has_mach_constant_base_node()) {
Expand Down Expand Up @@ -2431,7 +2439,13 @@ encode %{
enc_class riscv_enc_call_epilog() %{
if (VerifyStackAtCalls) {
// Check that stack depth is unchanged: find majik cookie on stack
__ call_Unimplemented();
int framesize = ra_->reg2offset_unchecked(OptoReg::add(ra_->_matcher._old_SP, -3 * VMRegImpl::slots_per_word));
Label stack_ok;
__ ld(t1, Address(sp, framesize));
__ mv(t2, MAJIK_DWORD);
__ beq(t2, t1, stack_ok);
__ stop("MAJIK_DWORD not found");
__ bind(stack_ok);
}
%}

Expand Down
2 changes: 1 addition & 1 deletion src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2368,7 +2368,7 @@ void SharedRuntime::generate_deopt_blob() {
// EPILOG must remove this many slots.
// RISCV needs two words for RA (return address) and FP (frame pointer).
uint SharedRuntime::in_preserve_stack_slots() {
return 2 * VMRegImpl::slots_per_word;
return 2 * VMRegImpl::slots_per_word + (VerifyStackAtCalls ? 0 : 2) ;
}

uint SharedRuntime::out_preserve_stack_slots() {
Expand Down