6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-01 17:32:36 +00:00
Code Issues Projects Releases Wiki Activity

MC/Mach-O: Use fixup info instead of hard coded list.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@121970 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar 2010-12-16 15:42:31 +00:00
parent b8810a3886
commit 7e06af85d1
1 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/MC/MachObjectWriter.cpp
View File

@ -50,24 +50,6 @@ static unsigned getFixupKindLog2Size(unsigned Kind) {
} }
} }
static bool isFixupKindPCRel(unsigned Kind) {
switch (Kind) {
default:
return false;
case FK_PCRel_1:
case FK_PCRel_2:
case FK_PCRel_4:
case X86::reloc_riprel_4byte:
case X86::reloc_riprel_4byte_movq_load:
return true;
}
}
static bool isFixupKindRIPRel(unsigned Kind) {
return Kind == X86::reloc_riprel_4byte ||
Kind == X86::reloc_riprel_4byte_movq_load;
}
static bool doesSymbolRequireExternRelocation(MCSymbolData *SD) { static bool doesSymbolRequireExternRelocation(MCSymbolData *SD) {
// Undefined symbols are always extern. // Undefined symbols are always extern.
if (SD->Symbol->isUndefined()) if (SD->Symbol->isUndefined())
@ -179,6 +161,18 @@ class MachObjectWriter : public MCObjectWriter {
} }
}; };
/// @name Utility Methods
/// @{
bool isFixupKindPCRel(const MCAssembler &Asm, unsigned Kind) {
const MCFixupKindInfo &FKI = Asm.getBackend().getFixupKindInfo(
(MCFixupKind) Kind);
return FKI.Flags & MCFixupKindInfo::FKF_IsPCRel;
}
/// @}
/// @name Relocation Data /// @name Relocation Data
/// @{ /// @{
@ -489,11 +483,15 @@ public:
// - Input errors, where something cannot be correctly encoded. 'as' allows // - Input errors, where something cannot be correctly encoded. 'as' allows
// these through in many cases. // these through in many cases.
static bool isFixupKindRIPRel(unsigned Kind) {
return Kind == X86::reloc_riprel_4byte ||
Kind == X86::reloc_riprel_4byte_movq_load;
}
void RecordX86_64Relocation(const MCAssembler &Asm, const MCAsmLayout &Layout, void RecordX86_64Relocation(const MCAssembler &Asm, const MCAsmLayout &Layout,
const MCFragment *Fragment, const MCFragment *Fragment,
const MCFixup &Fixup, MCValue Target, const MCFixup &Fixup, MCValue Target,
uint64_t &FixedValue) { uint64_t &FixedValue) {
unsigned IsPCRel = isFixupKindPCRel(Fixup.getKind()); unsigned IsPCRel = isFixupKindPCRel(Asm, Fixup.getKind());
unsigned IsRIPRel = isFixupKindRIPRel(Fixup.getKind()); unsigned IsRIPRel = isFixupKindRIPRel(Fixup.getKind());
unsigned Log2Size = getFixupKindLog2Size(Fixup.getKind()); unsigned Log2Size = getFixupKindLog2Size(Fixup.getKind());
@ -731,7 +729,7 @@ public:
const MCFixup &Fixup, MCValue Target, const MCFixup &Fixup, MCValue Target,
uint64_t &FixedValue) { uint64_t &FixedValue) {
uint32_t FixupOffset = Layout.getFragmentOffset(Fragment)+Fixup.getOffset(); uint32_t FixupOffset = Layout.getFragmentOffset(Fragment)+Fixup.getOffset();
unsigned IsPCRel = isFixupKindPCRel(Fixup.getKind()); unsigned IsPCRel = isFixupKindPCRel(Asm, Fixup.getKind());
unsigned Log2Size = getFixupKindLog2Size(Fixup.getKind()); unsigned Log2Size = getFixupKindLog2Size(Fixup.getKind());
unsigned Type = macho::RIT_Vanilla; unsigned Type = macho::RIT_Vanilla;
@ -841,7 +839,7 @@ public:
return; return;
} }
unsigned IsPCRel = isFixupKindPCRel(Fixup.getKind()); unsigned IsPCRel = isFixupKindPCRel(Asm, Fixup.getKind());
unsigned Log2Size = getFixupKindLog2Size(Fixup.getKind()); unsigned Log2Size = getFixupKindLog2Size(Fixup.getKind());
// If this is a 32-bit TLVP reloc it's handled a bit differently. // If this is a 32-bit TLVP reloc it's handled a bit differently.