Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-11-30 17:21:10 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[VE] Change to use R_VE_SREL32

Browse Source 
Change to use R_VE_SREL32 for relative branch instructions instead of
R_VE_PC_LO32 in order to check ranges of relative branch isntructions
at link time correctly.

Reviewed By: simoll

Differential Revision: https://reviews.llvm.org/D115097
This commit is contained in:
Kazushi (Jam) Marukawa 2021-11-29 01:10:45 +09:00
parent d8495e0352
commit 6b41eb7f26
5 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llvm/lib/Target/VE/MCTargetDesc/VEAsmBackend.cpp
View File

@ -42,6 +42,7 @@ static uint64_t adjustFixupValue(unsigned Kind, uint64_t Value) {
case VE::fixup_ve_tpoff_hi32:
return (Value >> 32) & 0xffffffff;
case VE::fixup_ve_reflong:
case VE::fixup_ve_srel32:
case VE::fixup_ve_lo32:
case VE::fixup_ve_pc_lo32:
case VE::fixup_ve_got_lo32:
@ -68,6 +69,7 @@ static unsigned getFixupKindNumBytes(unsigned Kind) {
case FK_Data_4:
case FK_PCRel_4:
case VE::fixup_ve_reflong:
case VE::fixup_ve_srel32:
case VE::fixup_ve_hi32:
case VE::fixup_ve_lo32:
case VE::fixup_ve_pc_hi32:
@ -103,6 +105,7 @@ public:
const static MCFixupKindInfo Infos[VE::NumTargetFixupKinds] = {
// name, offset, bits, flags
{"fixup_ve_reflong", 0, 32, 0},
{"fixup_ve_srel32", 0, 32, MCFixupKindInfo::FKF_IsPCRel},
{"fixup_ve_hi32", 0, 32, 0},
{"fixup_ve_lo32", 0, 32, 0},
{"fixup_ve_pc_hi32", 0, 32, MCFixupKindInfo::FKF_IsPCRel},

4
llvm/lib/Target/VE/MCTargetDesc/VEELFObjectWriter.cpp
View File

@ -56,6 +56,8 @@ unsigned VEELFObjectWriter::getRelocType(MCContext &Ctx, const MCValue &Target,
return ELF::R_VE_REFLONG;
case FK_PCRel_8:
return ELF::R_VE_REFQUAD;
case VE::fixup_ve_srel32:
return ELF::R_VE_SREL32;
case VE::fixup_ve_pc_hi32:
return ELF::R_VE_PC_HI32;
case VE::fixup_ve_pc_lo32:
@ -76,6 +78,8 @@ unsigned VEELFObjectWriter::getRelocType(MCContext &Ctx, const MCValue &Target,
return ELF::R_VE_REFQUAD;
case VE::fixup_ve_reflong:
return ELF::R_VE_REFLONG;
case VE::fixup_ve_srel32:
llvm_unreachable("Unimplemented fixup pc_hi32 -> relocation");
case VE::fixup_ve_hi32:
return ELF::R_VE_HI32;
case VE::fixup_ve_lo32:

3
llvm/lib/Target/VE/MCTargetDesc/VEFixupKinds.h
View File

@ -17,6 +17,9 @@ enum Fixups {
/// fixup_ve_reflong - 32-bit fixup corresponding to foo
fixup_ve_reflong = FirstTargetFixupKind,
/// fixup_ve_srel32 - 32-bit fixup corresponding to foo for relative branch
fixup_ve_srel32,
/// fixup_ve_hi32 - 32-bit fixup corresponding to foo@hi
fixup_ve_hi32,

2
llvm/lib/Target/VE/MCTargetDesc/VEMCCodeEmitter.cpp
View File

@ -131,7 +131,7 @@ VEMCCodeEmitter::getBranchTargetOpValue(const MCInst &MI, unsigned OpNo,
return getMachineOpValue(MI, MO, Fixups, STI);
Fixups.push_back(
MCFixup::create(0, MO.getExpr(), (MCFixupKind)VE::fixup_ve_pc_lo32));
MCFixup::create(0, MO.getExpr(), (MCFixupKind)VE::fixup_ve_srel32));
return 0;
}

2
llvm/test/MC/VE/sym-br.s
View File

@ -11,6 +11,6 @@
# CHECK-NEXT: b.l.t tgt+24(, %s1)
# CHECK-OBJ: 0 R_VE_REFLONG tgt
# CHECK-OBJ: 8 R_VE_PC_LO32 tgt2
# CHECK-OBJ: 8 R_VE_SREL32 tgt2
# CHECK-OBJ: 10 R_VE_REFLONG tgt
# CHECK-OBJ: 18 R_VE_REFLONG tgt+0x18