archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-22 03:54:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8294187: RISC-V: Unify all relocations for the backend into AbstractAssembler::relocate()

Browse source 
Reviewed-by: fjiang, yadongwang, fyang
This commit is contained in:
Xiaolin Zheng 2022-09-23 13:15:44 +00:00 • committed by Fei Yang
parent acd75e0f1c
commit 664e5b1d2e
7 changed files with 15 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -730,14 +730,13 @@ void MacroAssembler::la(Register Rd, const address &dest) {
}
void MacroAssembler::la(Register Rd, const Address &adr) {
code_section()->relocate(pc(), adr.rspec());
relocInfo::relocType rtype = adr.rspec().reloc()->type();
switch (adr.getMode()) {
case Address::literal: {
relocInfo::relocType rtype = adr.rspec().reloc()->type();
if (rtype == relocInfo::none) {
mv(Rd, (intptr_t)(adr.target()));
} else {
relocate(adr.rspec());
movptr(Rd, adr.target());
}
break;
@ -1349,7 +1348,7 @@ void MacroAssembler::reinit_heapbase() {
void MacroAssembler::mv(Register Rd, Address dest) {
assert(dest.getMode() == Address::literal, "Address mode should be Address::literal");
code_section()->relocate(pc(), dest.rspec());
relocate(dest.rspec());
movptr(Rd, dest.target());
}
@ -2700,7 +2699,7 @@ void MacroAssembler::la_patchable(Register reg1, const Address &dest, int32_t &o
assert(is_valid_riscv64_address(dest.target()), "bad address");
assert(dest.getMode() == Address::literal, "la_patchable must be applied to a literal address");
code_section()->relocate(pc(), dest.rspec());
relocate(dest.rspec());
// 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
@ -2764,7 +2763,7 @@ void MacroAssembler::get_polling_page(Register dest, relocInfo::relocType rtype)
// Read the polling page. The address of the polling page must
// already be in r.
void MacroAssembler::read_polling_page(Register r, int32_t offset, relocInfo::relocType rtype) {
code_section()->relocate(pc(), rtype);
relocate(rtype);
lwu(zr, Address(r, offset));
}
@ -2779,8 +2778,7 @@ void MacroAssembler::set_narrow_oop(Register dst, jobject obj) {
}
#endif
int oop_index = oop_recorder()->find_index(obj);
RelocationHolder rspec = oop_Relocation::spec(oop_index);
code_section()->relocate(pc(), rspec);
relocate(oop_Relocation::spec(oop_index));
li32(dst, 0xDEADBEEF);
zero_extend(dst, dst, 32);
}
@ -2791,9 +2789,8 @@ void MacroAssembler::set_narrow_klass(Register dst, Klass* k) {
int index = oop_recorder()->find_index(k);
assert(!Universe::heap()->is_in(k), "should not be an oop");
RelocationHolder rspec = metadata_Relocation::spec(index);
code_section()->relocate(pc(), rspec);
narrowKlass nk = CompressedKlassPointers::encode(k);
relocate(metadata_Relocation::spec(index));
li32(dst, nk);
zero_extend(dst, dst, 32);
}