Skip to content
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

8346231: RISC-V: Fix incorrect assertion in SharedRuntime::generate_handler_blob #22750

Closed
wants to merge 1 commit into from
Closed

8346231: RISC-V: Fix incorrect assertion in SharedRuntime::generate_handler_blob #22750

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions src/hotspot/cpu/riscv/sharedRuntime_riscv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2553,17 +2553,18 @@ SafepointBlob* SharedRuntime::generate_handler_blob(SharedStubId id, address cal
// Verify the correct encoding of the poll we're about to skip.
// See NativeInstruction::is_lwu_to_zr()
__ lwu(t0, Address(x18));
__ andi(t1, t0, 0b0000011);
__ andi(t1, t0, 0b1111111);
__ mv(t2, 0b0000011);
__ bne(t1, t2, bail); // 0-6:0b0000011
__ srli(t1, t0, 7);
__ andi(t1, t1, 0b00000);
__ andi(t1, t1, 0b11111);
__ bnez(t1, bail); // 7-11:0b00000
__ srli(t1, t0, 12);
__ andi(t1, t1, 0b110);
__ andi(t1, t1, 0b111);
__ mv(t2, 0b110);
__ bne(t1, t2, bail); // 12-14:0b110
#endif

// Adjust return pc forward to step over the safepoint poll instruction
__ add(x18, x18, NativeInstruction::instruction_size);
__ sd(x18, Address(fp, frame::return_addr_offset * wordSize));
Expand Down