infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-01 22:18:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

8283737: riscv: MacroAssembler::stop() should emit fixed-length instruction sequence

Browse Source 
Reviewed-by: fyang, shade
This commit is contained in:
Xiaolin Zheng 2022-03-30 09:04:55 +00:00 committed by Fei Yang
parent edb42d7b0a
commit b82b009047
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
View File

@ -531,8 +531,11 @@ void MacroAssembler::resolve_jobject(Register value, Register thread, Register t
void MacroAssembler::stop(const char* msg) {
address ip = pc();
pusha();
li(c_rarg0, (uintptr_t)(address)msg);
li(c_rarg1, (uintptr_t)(address)ip);
// The length of the instruction sequence emitted should be independent
// of the values of msg and ip so that the size of mach nodes for scratch
// emit and normal emit matches.
mv(c_rarg0, (address)msg);
mv(c_rarg1, (address)ip);
mv(c_rarg2, sp);
mv(c_rarg3, CAST_FROM_FN_PTR(address, MacroAssembler::debug64));
jalr(c_rarg3);