6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-13 20:32:21 +00:00
Code Issues Projects Releases Wiki Activity

macho-dump: Add support for dumping relocation entries.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@120216 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar 2010-11-27 13:39:48 +00:00
parent 2acadbddf6
commit 90e3e3a429
5 changed files with 76 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/llvm/Object/MachOFormat.h
View File

@ -258,6 +258,15 @@ namespace macho {
uint32_t Index; uint32_t Index;
}; };
/// @}
/// @name Relocation Data
/// @{
struct RelocationEntry {
uint32_t Word0;
uint32_t Word1;
};
/// @} /// @}
// See <mach-o/nlist.h>. // See <mach-o/nlist.h>.

3
include/llvm/Object/MachOObject.h
View File

@ -137,6 +137,9 @@ public:
const LoadCommandInfo &LCI, const LoadCommandInfo &LCI,
unsigned Index, unsigned Index,
InMemoryStruct<macho::Section64> &Res) const; InMemoryStruct<macho::Section64> &Res) const;
void ReadRelocationEntry(
uint64_t RelocationTableOffset, unsigned Index,
InMemoryStruct<macho::RelocationEntry> &Res) const;
/// @} /// @}
}; };

23
lib/MC/MachObjectWriter.cpp
View File

@ -177,13 +177,8 @@ class MachObjectWriter : public MCObjectWriter {
/// @name Relocation Data /// @name Relocation Data
/// @{ /// @{
struct MachRelocationEntry {
uint32_t Word0;
uint32_t Word1;
};
llvm::DenseMap<const MCSectionData*, llvm::DenseMap<const MCSectionData*,
std::vector<MachRelocationEntry> > Relocations; std::vector<macho::RelocationEntry> > Relocations;
llvm::DenseMap<const MCSectionData*, unsigned> IndirectSymBase; llvm::DenseMap<const MCSectionData*, unsigned> IndirectSymBase;
/// @} /// @}
@ -551,7 +546,7 @@ public:
} }
Type = macho::RIT_X86_64_Unsigned; Type = macho::RIT_X86_64_Unsigned;
MachRelocationEntry MRE; macho::RelocationEntry MRE;
MRE.Word0 = FixupOffset; MRE.Word0 = FixupOffset;
MRE.Word1 = ((Index << 0) | MRE.Word1 = ((Index << 0) |
(IsPCRel << 24) | (IsPCRel << 24) |
@ -676,7 +671,7 @@ public:
FixedValue = Value; FixedValue = Value;
// struct relocation_info (8 bytes) // struct relocation_info (8 bytes)
MachRelocationEntry MRE; macho::RelocationEntry MRE;
MRE.Word0 = FixupOffset; MRE.Word0 = FixupOffset;
MRE.Word1 = ((Index << 0) | MRE.Word1 = ((Index << 0) |
(IsPCRel << 24) | (IsPCRel << 24) |
@ -726,7 +721,7 @@ public:
// Relocations are written out in reverse order, so the PAIR comes first. // Relocations are written out in reverse order, so the PAIR comes first.
if (Type == macho::RIT_Difference || Type == macho::RIT_LocalDifference) { if (Type == macho::RIT_Difference || Type == macho::RIT_LocalDifference) {
MachRelocationEntry MRE; macho::RelocationEntry MRE;
MRE.Word0 = ((0 << 0) | MRE.Word0 = ((0 << 0) |
(macho::RIT_Pair << 24) | (macho::RIT_Pair << 24) |
(Log2Size << 28) | (Log2Size << 28) |
@ -736,7 +731,7 @@ public:
Relocations[Fragment->getParent()].push_back(MRE); Relocations[Fragment->getParent()].push_back(MRE);
} }
MachRelocationEntry MRE; macho::RelocationEntry MRE;
MRE.Word0 = ((FixupOffset << 0) | MRE.Word0 = ((FixupOffset << 0) |
(Type << 24) | (Type << 24) |
(Log2Size << 28) | (Log2Size << 28) |
@ -781,7 +776,7 @@ public:
} }
// struct relocation_info (8 bytes) // struct relocation_info (8 bytes)
MachRelocationEntry MRE; macho::RelocationEntry MRE;
MRE.Word0 = Value; MRE.Word0 = Value;
MRE.Word1 = ((Index << 0) | MRE.Word1 = ((Index << 0) |
(IsPCRel << 24) | (IsPCRel << 24) |
@ -861,7 +856,7 @@ public:
} }
// struct relocation_info (8 bytes) // struct relocation_info (8 bytes)
MachRelocationEntry MRE; macho::RelocationEntry MRE;
MRE.Word0 = FixupOffset; MRE.Word0 = FixupOffset;
MRE.Word1 = ((Index << 0) | MRE.Word1 = ((Index << 0) |
(IsPCRel << 24) | (IsPCRel << 24) |
@ -1138,7 +1133,7 @@ public:
uint64_t RelocTableEnd = SectionDataStart + SectionDataFileSize; uint64_t RelocTableEnd = SectionDataStart + SectionDataFileSize;
for (MCAssembler::const_iterator it = Asm.begin(), for (MCAssembler::const_iterator it = Asm.begin(),
ie = Asm.end(); it != ie; ++it) { ie = Asm.end(); it != ie; ++it) {
std::vector<MachRelocationEntry> &Relocs = Relocations[it]; std::vector<macho::RelocationEntry> &Relocs = Relocations[it];
unsigned NumRelocs = Relocs.size(); unsigned NumRelocs = Relocs.size();
uint64_t SectionStart = SectionDataStart + Layout.getSectionAddress(it); uint64_t SectionStart = SectionDataStart + Layout.getSectionAddress(it);
WriteSection(Asm, Layout, *it, SectionStart, RelocTableEnd, NumRelocs); WriteSection(Asm, Layout, *it, SectionStart, RelocTableEnd, NumRelocs);
@ -1192,7 +1187,7 @@ public:
ie = Asm.end(); it != ie; ++it) { ie = Asm.end(); it != ie; ++it) {
// Write the section relocation entries, in reverse order to match 'as' // Write the section relocation entries, in reverse order to match 'as'
// (approximately, the exact algorithm is more complicated than this). // (approximately, the exact algorithm is more complicated than this).
std::vector<MachRelocationEntry> &Relocs = Relocations[it]; std::vector<macho::RelocationEntry> &Relocs = Relocations[it];
for (unsigned i = 0, e = Relocs.size(); i != e; ++i) { for (unsigned i = 0, e = Relocs.size(); i != e; ++i) {
Write32(Relocs[e - i - 1].Word0); Write32(Relocs[e - i - 1].Word0);
Write32(Relocs[e - i - 1].Word1); Write32(Relocs[e - i - 1].Word1);

13
lib/Object/MachOObject.cpp
View File

@ -289,3 +289,16 @@ void MachOObject::ReadSection64(const LoadCommandInfo &LCI,
Index * sizeof(macho::Section64)); Index * sizeof(macho::Section64));
ReadInMemoryStruct(*this, Buffer->getBuffer(), Offset, Res); ReadInMemoryStruct(*this, Buffer->getBuffer(), Offset, Res);
} }
template<>
void SwapStruct(macho::RelocationEntry &Value) {
SwapValue(Value.Word0);
SwapValue(Value.Word1);
}
void MachOObject::ReadRelocationEntry(uint64_t RelocationTableOffset,
unsigned Index,
InMemoryStruct<macho::RelocationEntry> &Res) const {
uint64_t Offset = (RelocationTableOffset +
Index * sizeof(macho::RelocationEntry));
ReadInMemoryStruct(*this, Buffer->getBuffer(), Offset, Res);
}

61
tools/macho-dump/macho-dump.cpp
View File

@ -83,13 +83,13 @@ static void DumpSegmentCommandData(StringRef Name,
outs() << " ('flags', " << Flags << ")\n"; outs() << " ('flags', " << Flags << ")\n";
} }
static void DumpSectionData(unsigned Index, StringRef Name, static int DumpSectionData(MachOObject &Obj, unsigned Index, StringRef Name,
StringRef SegmentName, uint64_t Address, StringRef SegmentName, uint64_t Address,
uint64_t Size, uint32_t Offset, uint64_t Size, uint32_t Offset,
uint32_t Align, uint32_t RelocationTableOffset, uint32_t Align, uint32_t RelocationTableOffset,
uint32_t NumRelocationTableEntries, uint32_t NumRelocationTableEntries,
uint32_t Flags, uint32_t Reserved1, uint32_t Flags, uint32_t Reserved1,
uint32_t Reserved2, uint64_t Reserved3 = ~0ULL) { uint32_t Reserved2, uint64_t Reserved3 = ~0ULL) {
outs() << " # Section " << Index << "\n"; outs() << " # Section " << Index << "\n";
outs() << " (('section_name', '"; outs() << " (('section_name', '";
outs().write_escaped(Name, /*UseHexEscapes=*/true) << "')\n"; outs().write_escaped(Name, /*UseHexEscapes=*/true) << "')\n";
@ -106,6 +106,26 @@ static void DumpSectionData(unsigned Index, StringRef Name,
outs() << " ('reserved2', " << Reserved2 << ")\n"; outs() << " ('reserved2', " << Reserved2 << ")\n";
if (Reserved3 != ~0ULL) if (Reserved3 != ~0ULL)
outs() << " ('reserved3', " << Reserved3 << ")\n"; outs() << " ('reserved3', " << Reserved3 << ")\n";
outs() << " ),\n";
// Dump the relocation entries.
int Res = 0;
outs() << " ('_relocations', [\n";
for (unsigned i = 0; i != NumRelocationTableEntries; ++i) {
InMemoryStruct<macho::RelocationEntry> RE;
Obj.ReadRelocationEntry(RelocationTableOffset, i, RE);
if (!RE) {
Res = Error("unable to read relocation table entry '" + Twine(i) + "'");
break;
}
outs() << " # Relocation " << i << "\n";
outs() << " (('word-0', " << format("%#x", RE->Word0) << "),\n";
outs() << " ('word-1', " << format("%#x", RE->Word1) << ")),\n";
}
outs() << " ])\n";
return Res;
} }
static int DumpSegmentCommand(MachOObject &Obj, static int DumpSegmentCommand(MachOObject &Obj,
@ -131,12 +151,13 @@ static int DumpSegmentCommand(MachOObject &Obj,
break; break;
} }
DumpSectionData(i, StringRef(Sect->Name, 16), if ((Res = DumpSectionData(Obj, i, StringRef(Sect->Name, 16),
StringRef(Sect->SegmentName, 16), Sect->Address, Sect->Size, StringRef(Sect->SegmentName, 16), Sect->Address,
Sect->Offset, Sect->Align, Sect->RelocationTableOffset, Sect->Size, Sect->Offset, Sect->Align,
Sect->NumRelocationTableEntries, Sect->Flags, Sect->RelocationTableOffset,
Sect->Reserved1, Sect->Reserved2); Sect->NumRelocationTableEntries, Sect->Flags,
outs() << " ),\n"; Sect->Reserved1, Sect->Reserved2)))
break;
} }
outs() << " ])\n"; outs() << " ])\n";
@ -166,12 +187,14 @@ static int DumpSegment64Command(MachOObject &Obj,
break; break;
} }
DumpSectionData(i, StringRef(Sect->Name, 16), if ((Res = DumpSectionData(Obj, i, StringRef(Sect->Name, 16),
StringRef(Sect->SegmentName, 16), Sect->Address, Sect->Size, StringRef(Sect->SegmentName, 16), Sect->Address,
Sect->Offset, Sect->Align, Sect->RelocationTableOffset, Sect->Size, Sect->Offset, Sect->Align,
Sect->NumRelocationTableEntries, Sect->Flags, Sect->RelocationTableOffset,
Sect->Reserved1, Sect->Reserved2, Sect->Reserved3); Sect->NumRelocationTableEntries, Sect->Flags,
outs() << " ),\n"; Sect->Reserved1, Sect->Reserved2,
Sect->Reserved3)))
break;
} }
outs() << " ])\n"; outs() << " ])\n";