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

8293781: RISC-V: Clarify types of calls

Browse source 
Reviewed-by: fjiang, fyang, yadongwang
This commit is contained in:
Yanhong Zhu 2022-09-20 12:12:35 +00:00 • committed by Fei Yang
parent 1b496064bf
commit 84ee1a291c
4 changed files with 85 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2439,6 +2439,9 @@ void MacroAssembler::far_jump(Address entry, Register tmp) {
assert(ReservedCodeCacheSize < 4*G, "branch out of range");
assert(CodeCache::find_blob(entry.target()) != NULL,
"destination of far call not found in code cache");
assert(entry.rspec().type() == relocInfo::external_word_type
|| entry.rspec().type() == relocInfo::runtime_call_type
|| entry.rspec().type() == relocInfo::none, "wrong entry relocInfo type");
int32_t offset = 0;
if (far_branches()) {
// We can use auipc + jalr here because we know that the total size of
@ -2454,6 +2457,9 @@ void MacroAssembler::far_call(Address entry, Register tmp) {
assert(ReservedCodeCacheSize < 4*G, "branch out of range");
assert(CodeCache::find_blob(entry.target()) != NULL,
"destination of far call not found in code cache");
assert(entry.rspec().type() == relocInfo::external_word_type
|| entry.rspec().type() == relocInfo::runtime_call_type
|| entry.rspec().type() == relocInfo::none, "wrong entry relocInfo type");
int32_t offset = 0;
if (far_branches()) {
// We can use auipc + jalr here because we know that the total size of
@ -2701,7 +2707,7 @@ void MacroAssembler::la_patchable(Register reg1, const Address &dest, int32_t &o
// RISC-V doesn't compute a page-aligned address, in order to partially
// compensate for the use of *signed* offsets in its base+disp12
// addressing mode (RISC-V's PC-relative reach remains asymmetric
// [-(2G + 2K), 2G - 2k).
// [-(2G + 2K), 2G - 2K).
if (offset_high >= -((1L << 31) + (1L << 11)) && offset_low < (1L << 31) - (1L << 11)) {
int64_t distance = dest.target() - pc();
auipc(reg1, (int32_t)distance + 0x800);