archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 19:44:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8299168: RISC-V: Fix MachNode size mismatch for MacroAssembler::_verify_oops*

Browse source 
Reviewed-by: fyang
This commit is contained in:
Xiaolin Zheng 2022-12-23 09:22:39 +00:00 • committed by Fei Yang
parent 2294f225c0
commit 2f4098e1dc
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
View file

@ -408,10 +408,13 @@ void MacroAssembler::_verify_oop(Register reg, const char* s, const char* file,
push_reg(RegSet::of(ra, t0, t1, c_rarg0), sp);
mv(c_rarg0, reg); // c_rarg0 : x10
// The length of the instruction sequence emitted should be independent
// of the value of the local char buffer address so that the size of mach
// nodes for scratch emit and normal emit matches.
movptr(t0, (address)b);
{
// The length of the instruction sequence emitted should not depend
// on the address of the char buffer so that the size of mach nodes for
// scratch emit and normal emit matches.
IncompressibleRegion ir(this); // Fixed length
movptr(t0, (address) b);
}
// call indirectly to solve generation ordering problem
ExternalAddress target(StubRoutines::verify_oop_subroutine_entry_address());
@ -450,10 +453,13 @@ void MacroAssembler::_verify_oop_addr(Address addr, const char* s, const char* f
ld(x10, addr);
}
// The length of the instruction sequence emitted should be independent
// of the value of the local char buffer address so that the size of mach
// nodes for scratch emit and normal emit matches.
movptr(t0, (address)b);
{
// The length of the instruction sequence emitted should not depend
// on the address of the char buffer so that the size of mach nodes for
// scratch emit and normal emit matches.
IncompressibleRegion ir(this); // Fixed length
movptr(t0, (address) b);
}
// call indirectly to solve generation ordering problem
ExternalAddress target(StubRoutines::verify_oop_subroutine_entry_address());