6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-15 06:29:05 +00:00
Code Issues Projects Releases Wiki Activity

MC: Use MCSymbol in RelAndSymbol, NFC

Browse Source 
Switch from `MCSymbolData` to `MCSymbol`.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@237502 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Duncan P. N. Exon Smith
2015-05-16 01:14:19 +00:00
parent 43c7aeef66
commit 57e32d40b7
6 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/llvm/MC/MCMachObjectWriter.h
View File

@@ -96,9 +96,9 @@ class MachObjectWriter : public MCObjectWriter {
/// @{ /// @{
struct RelAndSymbol { struct RelAndSymbol {
const MCSymbolData *Sym; const MCSymbol *Sym;
MachO::any_relocation_info MRE; MachO::any_relocation_info MRE;
RelAndSymbol(const MCSymbolData *Sym, const MachO::any_relocation_info &MRE) RelAndSymbol(const MCSymbol *Sym, const MachO::any_relocation_info &MRE)
: Sym(Sym), MRE(MRE) {} : Sym(Sym), MRE(MRE) {}
}; };
@@ -223,7 +223,7 @@ public:
// to a symbol it should be passed as \p RelSymbol so that it can be updated // to a symbol it should be passed as \p RelSymbol so that it can be updated
// afterwards. If the relocation doesn't refer to a symbol, nullptr should be // afterwards. If the relocation doesn't refer to a symbol, nullptr should be
// used. // used.
void addRelocation(const MCSymbolData *RelSymbol, const MCSectionData *SD, void addRelocation(const MCSymbol *RelSymbol, const MCSectionData *SD,
MachO::any_relocation_info &MRE) { MachO::any_relocation_info &MRE) {
RelAndSymbol P(RelSymbol, MRE); RelAndSymbol P(RelSymbol, MRE);
Relocations[SD].push_back(P); Relocations[SD].push_back(P);

2
lib/MC/MachObjectWriter.cpp
View File

@@ -633,7 +633,7 @@ void MachObjectWriter::ComputeSymbolTable(
continue; continue;
// Set the Index and the IsExtern bit. // Set the Index and the IsExtern bit.
unsigned Index = Rel.Sym->getIndex(); unsigned Index = Rel.Sym->getData().getIndex();
assert(isInt<24>(Index)); assert(isInt<24>(Index));
if (IsLittleEndian) if (IsLittleEndian)
Rel.MRE.r_word1 = (Rel.MRE.r_word1 & (~0U << 24)) | Index | (1 << 27); Rel.MRE.r_word1 = (Rel.MRE.r_word1 & (~0U << 24)) | Index | (1 << 27);

12
lib/Target/AArch64/MCTargetDesc/AArch64MachObjectWriter.cpp
View File

@@ -230,8 +230,7 @@ void AArch64MachObjectWriter::RecordRelocation(
MachO::any_relocation_info MRE; MachO::any_relocation_info MRE;
MRE.r_word0 = FixupOffset; MRE.r_word0 = FixupOffset;
MRE.r_word1 = (IsPCRel << 24) | (Log2Size << 25) | (Type << 28); MRE.r_word1 = (IsPCRel << 24) | (Log2Size << 25) | (Type << 28);
Writer->addRelocation(A_Base ? &A_Base->getData() : nullptr, Writer->addRelocation(A_Base, Fragment->getParent(), MRE);
Fragment->getParent(), MRE);
return; return;
} else if (Target.getSymA()->getKind() != MCSymbolRefExpr::VK_None || } else if (Target.getSymA()->getKind() != MCSymbolRefExpr::VK_None ||
Target.getSymB()->getKind() != MCSymbolRefExpr::VK_None) Target.getSymB()->getKind() != MCSymbolRefExpr::VK_None)
@@ -282,8 +281,7 @@ void AArch64MachObjectWriter::RecordRelocation(
MachO::any_relocation_info MRE; MachO::any_relocation_info MRE;
MRE.r_word0 = FixupOffset; MRE.r_word0 = FixupOffset;
MRE.r_word1 = (IsPCRel << 24) | (Log2Size << 25) | (Type << 28); MRE.r_word1 = (IsPCRel << 24) | (Log2Size << 25) | (Type << 28);
Writer->addRelocation(A_Base ? &A_Base->getData() : nullptr, Writer->addRelocation(A_Base, Fragment->getParent(), MRE);
Fragment->getParent(), MRE);
RelSymbol = B_Base; RelSymbol = B_Base;
Type = MachO::ARM64_RELOC_SUBTRACTOR; Type = MachO::ARM64_RELOC_SUBTRACTOR;
@@ -392,8 +390,7 @@ void AArch64MachObjectWriter::RecordRelocation(
MRE.r_word0 = FixupOffset; MRE.r_word0 = FixupOffset;
MRE.r_word1 = MRE.r_word1 =
(Index << 0) | (IsPCRel << 24) | (Log2Size << 25) | (Type << 28); (Index << 0) | (IsPCRel << 24) | (Log2Size << 25) | (Type << 28);
Writer->addRelocation(RelSymbol ? &RelSymbol->getData() : nullptr, Writer->addRelocation(RelSymbol, Fragment->getParent(), MRE);
Fragment->getParent(), MRE);
// Now set up the Addend relocation. // Now set up the Addend relocation.
Type = MachO::ARM64_RELOC_ADDEND; Type = MachO::ARM64_RELOC_ADDEND;
@@ -414,8 +411,7 @@ void AArch64MachObjectWriter::RecordRelocation(
MRE.r_word0 = FixupOffset; MRE.r_word0 = FixupOffset;
MRE.r_word1 = MRE.r_word1 =
(Index << 0) | (IsPCRel << 24) | (Log2Size << 25) | (Type << 28); (Index << 0) | (IsPCRel << 24) | (Log2Size << 25) | (Type << 28);
Writer->addRelocation(RelSymbol ? &RelSymbol->getData() : nullptr, Writer->addRelocation(RelSymbol, Fragment->getParent(), MRE);
Fragment->getParent(), MRE);
} }
MCObjectWriter *llvm::createAArch64MachObjectWriter(raw_pwrite_stream &OS, MCObjectWriter *llvm::createAArch64MachObjectWriter(raw_pwrite_stream &OS,

4
lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp
View File

@@ -396,7 +396,7 @@ void ARMMachObjectWriter::RecordRelocation(MachObjectWriter *Writer,
uint32_t FixupOffset = Layout.getFragmentOffset(Fragment)+Fixup.getOffset(); uint32_t FixupOffset = Layout.getFragmentOffset(Fragment)+Fixup.getOffset();
unsigned Index = 0; unsigned Index = 0;
unsigned Type = 0; unsigned Type = 0;
const MCSymbolData *RelSymbol = nullptr; const MCSymbol *RelSymbol = nullptr;
if (Target.isAbsolute()) { // constant if (Target.isAbsolute()) { // constant
// FIXME! // FIXME!
@@ -416,7 +416,7 @@ void ARMMachObjectWriter::RecordRelocation(MachObjectWriter *Writer,
// Check whether we need an external or internal relocation. // Check whether we need an external or internal relocation.
if (requiresExternRelocation(Writer, Asm, *Fragment, RelocType, SD, if (requiresExternRelocation(Writer, Asm, *Fragment, RelocType, SD,
FixedValue)) { FixedValue)) {
RelSymbol = SD; RelSymbol = &SD->getSymbol();
// For external relocations, make sure to offset the fixup value to // For external relocations, make sure to offset the fixup value to
// compensate for the addend of the symbol address, if it was // compensate for the addend of the symbol address, if it was

4
lib/Target/PowerPC/MCTargetDesc/PPCMachObjectWriter.cpp
View File

@@ -333,7 +333,7 @@ void PPCMachObjectWriter::RecordPPCRelocation(
unsigned Index = 0; unsigned Index = 0;
unsigned Type = RelocType; unsigned Type = RelocType;
const MCSymbolData *RelSymbol = nullptr; const MCSymbol *RelSymbol = nullptr;
if (Target.isAbsolute()) { // constant if (Target.isAbsolute()) { // constant
// SymbolNum of 0 indicates the absolute section. // SymbolNum of 0 indicates the absolute section.
// //
@@ -355,7 +355,7 @@ void PPCMachObjectWriter::RecordPPCRelocation(
// Check whether we need an external or internal relocation. // Check whether we need an external or internal relocation.
if (Writer->doesSymbolRequireExternRelocation(SD)) { if (Writer->doesSymbolRequireExternRelocation(SD)) {
RelSymbol = SD; RelSymbol = &SD->getSymbol();
// For external relocations, make sure to offset the fixup value to // For external relocations, make sure to offset the fixup value to
// compensate for the addend of the symbol address, if it was // compensate for the addend of the symbol address, if it was
// undefined. This occurs with weak definitions, for example. // undefined. This occurs with weak definitions, for example.

16
lib/Target/X86/MCTargetDesc/X86MachObjectWriter.cpp
View File

@@ -199,8 +199,7 @@ void X86MachObjectWriter::RecordX86_64Relocation(
MRE.r_word0 = FixupOffset; MRE.r_word0 = FixupOffset;
MRE.r_word1 = MRE.r_word1 =
(Index << 0) | (IsPCRel << 24) | (Log2Size << 25) | (Type << 28); (Index << 0) | (IsPCRel << 24) | (Log2Size << 25) | (Type << 28);
Writer->addRelocation(A_Base ? &A_Base->getData() : nullptr, Writer->addRelocation(A_Base, Fragment->getParent(), MRE);
Fragment->getParent(), MRE);
if (B_Base) if (B_Base)
RelSymbol = B_Base; RelSymbol = B_Base;
@@ -339,8 +338,7 @@ void X86MachObjectWriter::RecordX86_64Relocation(
MRE.r_word0 = FixupOffset; MRE.r_word0 = FixupOffset;
MRE.r_word1 = (Index << 0) | (IsPCRel << 24) | (Log2Size << 25) | MRE.r_word1 = (Index << 0) | (IsPCRel << 24) | (Log2Size << 25) |
(IsExtern << 27) | (Type << 28); (IsExtern << 27) | (Type << 28);
Writer->addRelocation(RelSymbol ? &RelSymbol->getData() : nullptr, Writer->addRelocation(RelSymbol, Fragment->getParent(), MRE);
Fragment->getParent(), MRE);
} }
bool X86MachObjectWriter::RecordScatteredRelocation(MachObjectWriter *Writer, bool X86MachObjectWriter::RecordScatteredRelocation(MachObjectWriter *Writer,
@@ -453,9 +451,6 @@ void X86MachObjectWriter::RecordTLVPRelocation(MachObjectWriter *Writer,
uint32_t Value = Layout.getFragmentOffset(Fragment)+Fixup.getOffset(); uint32_t Value = Layout.getFragmentOffset(Fragment)+Fixup.getOffset();
unsigned IsPCRel = 0; unsigned IsPCRel = 0;
// Get the symbol data.
const MCSymbolData *SD_A = &Asm.getSymbolData(Target.getSymA()->getSymbol());
// We're only going to have a second symbol in pic mode and it'll be a // We're only going to have a second symbol in pic mode and it'll be a
// subtraction from the picbase. For 32-bit pic the addend is the difference // subtraction from the picbase. For 32-bit pic the addend is the difference
// between the picbase and the next address. For 32-bit static the addend is // between the picbase and the next address. For 32-bit static the addend is
@@ -479,7 +474,8 @@ void X86MachObjectWriter::RecordTLVPRelocation(MachObjectWriter *Writer,
MRE.r_word0 = Value; MRE.r_word0 = Value;
MRE.r_word1 = MRE.r_word1 =
(IsPCRel << 24) | (Log2Size << 25) | (MachO::GENERIC_RELOC_TLV << 28); (IsPCRel << 24) | (Log2Size << 25) | (MachO::GENERIC_RELOC_TLV << 28);
Writer->addRelocation(SD_A, Fragment->getParent(), MRE); Writer->addRelocation(&Target.getSymA()->getSymbol(), Fragment->getParent(),
MRE);
} }
void X86MachObjectWriter::RecordX86Relocation(MachObjectWriter *Writer, void X86MachObjectWriter::RecordX86Relocation(MachObjectWriter *Writer,
@@ -531,7 +527,7 @@ void X86MachObjectWriter::RecordX86Relocation(MachObjectWriter *Writer,
uint32_t FixupOffset = Layout.getFragmentOffset(Fragment)+Fixup.getOffset(); uint32_t FixupOffset = Layout.getFragmentOffset(Fragment)+Fixup.getOffset();
unsigned Index = 0; unsigned Index = 0;
unsigned Type = 0; unsigned Type = 0;
const MCSymbolData *RelSymbol = nullptr; const MCSymbol *RelSymbol = nullptr;
if (Target.isAbsolute()) { // constant if (Target.isAbsolute()) { // constant
// SymbolNum of 0 indicates the absolute section. // SymbolNum of 0 indicates the absolute section.
@@ -552,7 +548,7 @@ void X86MachObjectWriter::RecordX86Relocation(MachObjectWriter *Writer,
// Check whether we need an external or internal relocation. // Check whether we need an external or internal relocation.
if (Writer->doesSymbolRequireExternRelocation(SD)) { if (Writer->doesSymbolRequireExternRelocation(SD)) {
RelSymbol = SD; RelSymbol = &SD->getSymbol();
// For external relocations, make sure to offset the fixup value to // For external relocations, make sure to offset the fixup value to
// compensate for the addend of the symbol address, if it was // compensate for the addend of the symbol address, if it was
// undefined. This occurs with weak definitions, for example. // undefined. This occurs with weak definitions, for example.