infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-07-31 05:05:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

8256025: AArch64: MachCallRuntimeNode::ret_addr_offset() is incorrect for stub calls

Browse Source 
Reviewed-by: aph
This commit is contained in:
Nick Gasson 2020-11-11 09:59:56 +00:00
parent 6e8b862811
commit 79ac041844
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hotspot/cpu/aarch64/aarch64.ad
View File

@ -1753,7 +1753,9 @@ int MachCallDynamicJavaNode::ret_addr_offset()
int MachCallRuntimeNode::ret_addr_offset() {
// for generated stubs the call will be
// far_call(addr)
// bl(addr)
// or with far branches
// bl(trampoline_stub)
// for real runtime callouts it will be six instructions
// see aarch64_enc_java_to_runtime
// adr(rscratch2, retaddr)
@ -1762,7 +1764,7 @@ int MachCallRuntimeNode::ret_addr_offset() {
// blr(rscratch1)
CodeBlob *cb = CodeCache::find_blob(_entry_point);
if (cb) {
return MacroAssembler::far_branch_size();
return 1 * NativeInstruction::instruction_size;
} else {
return 6 * NativeInstruction::instruction_size;
}