Skip to content

8285437: riscv: Fix MachNode size mismatch for MacroAssembler::verify_oops* #8356

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
zhengxiaolinX wants to merge 2 commits into from
Closed

8285437: riscv: Fix MachNode size mismatch for MacroAssembler::verify_oops* #8356

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f52442b
Fix again: MachNode size mismatch
zhengxiaolinX Apr 13, 2022
61166a4
Add some comments
zhengxiaolinX Apr 23, 2022
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
10 changes: 8 additions & 2 deletions src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,10 @@ void MacroAssembler::verify_oop(Register reg, const char* s) {
push_reg(RegSet::of(ra, t0, t1, c_rarg0), sp);

mv(c_rarg0, reg); // c_rarg0 : x10
li(t0, (uintptr_t)(address)b);
// The length of the instruction sequence emitted should be independent
// of the values of the local char buffer address so that the size of mach
// nodes for scratch emit and normal emit matches.
mv(t0, (address)b);

// call indirectly to solve generation ordering problem
int32_t offset = 0;
Expand Down Expand Up @@ -414,7 +417,10 @@ void MacroAssembler::verify_oop_addr(Address addr, const char* s) {
ld(x10, addr);
}

li(t0, (uintptr_t)(address)b);
// The length of the instruction sequence emitted should be independent
// of the values of the local char buffer address so that the size of mach
// nodes for scratch emit and normal emit matches.
mv(t0, (address)b);

// call indirectly to solve generation ordering problem
int32_t offset = 0;
Expand Down