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

Add support for scattered relocations to the MachO relocatation pretty printer.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@143051 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Owen Anderson 2011-10-26 20:42:54 +00:00
parent 7b7fa74527
commit 1832f4d94e
2 changed files with 148 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/llvm/Object/MachO.h
View File

@ -18,6 +18,7 @@
#include "llvm/Object/ObjectFile.h" #include "llvm/Object/ObjectFile.h"
#include "llvm/Object/MachOObject.h" #include "llvm/Object/MachOObject.h"
#include "llvm/Support/MachO.h" #include "llvm/Support/MachO.h"
#include "llvm/Support/raw_ostream.h"
#include "llvm/ADT/SmallVector.h" #include "llvm/ADT/SmallVector.h"
namespace llvm { namespace llvm {
@ -110,7 +111,8 @@ private:
InMemoryStruct<macho::RelocationEntry> &Res) const; InMemoryStruct<macho::RelocationEntry> &Res) const;
std::size_t getSectionIndex(DataRefImpl Sec) const; std::size_t getSectionIndex(DataRefImpl Sec) const;
error_code getRelocationTargetName(uint32_t Idx, StringRef &S) const; void printRelocationTargetName(InMemoryStruct<macho::RelocationEntry>& RE,
raw_string_ostream &fmt) const;
}; };
} }

232
lib/Object/MachOObjectFile.cpp
View File

@ -15,8 +15,8 @@
#include "llvm/ADT/Triple.h" #include "llvm/ADT/Triple.h"
#include "llvm/Object/MachO.h" #include "llvm/Object/MachO.h"
#include "llvm/Object/MachOFormat.h" #include "llvm/Object/MachOFormat.h"
#include "llvm/Support/Format.h"
#include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/MemoryBuffer.h"
#include "llvm/Support/raw_ostream.h"
#include <cctype> #include <cctype>
#include <cstring> #include <cstring>
@ -609,7 +609,17 @@ error_code MachOObjectFile::getRelocationAddress(DataRefImpl Rel,
} }
InMemoryStruct<macho::RelocationEntry> RE; InMemoryStruct<macho::RelocationEntry> RE;
getRelocation(Rel, RE); getRelocation(Rel, RE);
Res = reinterpret_cast<uintptr_t>(sectAddress + RE->Word0);
unsigned Arch = getArch();
bool isScattered = (Arch != Triple::x86_64) &&
(RE->Word0 & macho::RF_Scattered);
uint64_t RelAddr = 0;
if (isScattered)
RelAddr = RE->Word0 & 0xFFFFFF;
else
RelAddr = RE->Word0;
Res = reinterpret_cast<uintptr_t>(sectAddress + RelAddr);
return object_error::success; return object_error::success;
} }
error_code MachOObjectFile::getRelocationSymbol(DataRefImpl Rel, error_code MachOObjectFile::getRelocationSymbol(DataRefImpl Rel,
@ -648,9 +658,17 @@ error_code MachOObjectFile::getRelocationTypeName(DataRefImpl Rel,
StringRef res; StringRef res;
InMemoryStruct<macho::RelocationEntry> RE; InMemoryStruct<macho::RelocationEntry> RE;
getRelocation(Rel, RE); getRelocation(Rel, RE);
unsigned r_type = (RE->Word1 >> 28) & 0xF;
unsigned Arch = getArch(); unsigned Arch = getArch();
bool isScattered = (Arch != Triple::x86_64) &&
(RE->Word0 & macho::RF_Scattered);
unsigned r_type;
if (isScattered)
r_type = (RE->Word0 >> 24) & 0xF;
else
r_type = (RE->Word1 >> 28) & 0xF;
switch (Arch) { switch (Arch) {
case Triple::x86: { case Triple::x86: {
const char* Table[] = { const char* Table[] = {
@ -771,23 +789,56 @@ void advanceTo(T &it, size_t Val) {
report_fatal_error(ec.message()); report_fatal_error(ec.message());
} }
error_code void MachOObjectFile::printRelocationTargetName(
MachOObjectFile::getRelocationTargetName(uint32_t Idx, StringRef &S) const { InMemoryStruct<macho::RelocationEntry>& RE,
bool isExtern = (Idx >> 27) & 1; raw_string_ostream &fmt) const {
uint32_t Val = Idx & 0xFFFFFF; unsigned Arch = getArch();
error_code ec; bool isScattered = (Arch != Triple::x86_64) &&
(RE->Word0 & macho::RF_Scattered);
// Target of a scattered relocation is an address. In the interest of
// generating pretty output, scan through the symbol table looking for a
// symbol that aligns with that address. If we find one, print it.
// Otherwise, we just print the hex address of the target.
if (isScattered) {
uint32_t Val = RE->Word1;
error_code ec;
for (symbol_iterator SI = begin_symbols(), SE = end_symbols(); SI != SE;
SI.increment(ec)) {
if (ec) report_fatal_error(ec.message());
uint64_t Addr;
StringRef Name;
if ((ec = SI->getAddress(Addr)))
report_fatal_error(ec.message());
if (Addr != Val) continue;
if ((ec = SI->getName(Name)))
report_fatal_error(ec.message());
fmt << Name;
return;
}
fmt << format("0x%x", Val);
return;
}
StringRef S;
bool isExtern = (RE->Word1 >> 27) & 1;
uint32_t Val = RE->Word1 & 0xFFFFFF;
if (isExtern) { if (isExtern) {
symbol_iterator SI = begin_symbols(); symbol_iterator SI = begin_symbols();
advanceTo(SI, Val); advanceTo(SI, Val);
ec = SI->getName(S); SI->getName(S);
} else { } else {
section_iterator SI = begin_sections(); section_iterator SI = begin_sections();
advanceTo(SI, Val); advanceTo(SI, Val);
ec = SI->getName(S); SI->getName(S);
} }
return ec; fmt << S;
} }
error_code MachOObjectFile::getRelocationValueString(DataRefImpl Rel, error_code MachOObjectFile::getRelocationValueString(DataRefImpl Rel,
@ -795,30 +846,35 @@ error_code MachOObjectFile::getRelocationValueString(DataRefImpl Rel,
InMemoryStruct<macho::RelocationEntry> RE; InMemoryStruct<macho::RelocationEntry> RE;
getRelocation(Rel, RE); getRelocation(Rel, RE);
unsigned Type = (RE->Word1 >> 28) & 0xF; unsigned Arch = getArch();
bool isScattered = (Arch != Triple::x86_64) &&
(RE->Word0 & macho::RF_Scattered);
std::string fmtbuf; std::string fmtbuf;
raw_string_ostream fmt(fmtbuf); raw_string_ostream fmt(fmtbuf);
unsigned Type;
if (isScattered)
Type = (RE->Word0 >> 24) & 0xF;
else
Type = (RE->Word1 >> 28) & 0xF;
// Determine any addends that should be displayed with the relocation. // Determine any addends that should be displayed with the relocation.
// These require decoding the relocation type, which is triple-specific. // These require decoding the relocation type, which is triple-specific.
unsigned Arch = getArch();
// X86_64 has entirely custom relocation types. // X86_64 has entirely custom relocation types.
if (Arch == Triple::x86_64) { if (Arch == Triple::x86_64) {
StringRef Name;
if (error_code ec = getRelocationTargetName(RE->Word1, Name))
report_fatal_error(ec.message());
bool isPCRel = ((RE->Word1 >> 24) & 1); bool isPCRel = ((RE->Word1 >> 24) & 1);
switch (Type) { switch (Type) {
case 3: // X86_64_RELOC_GOT_LOAD case macho::RIT_X86_64_GOTLoad: // X86_64_RELOC_GOT_LOAD
case 4: { // X86_64_RELOC_GOT case macho::RIT_X86_64_GOT: { // X86_64_RELOC_GOT
fmt << Name << "@GOT"; printRelocationTargetName(RE, fmt);
fmt << "@GOT";
if (isPCRel) fmt << "PCREL"; if (isPCRel) fmt << "PCREL";
break; break;
} }
case 5: { // X86_64_RELOC_SUBTRACTOR case macho::RIT_X86_64_Subtractor: { // X86_64_RELOC_SUBTRACTOR
InMemoryStruct<macho::RelocationEntry> RENext; InMemoryStruct<macho::RelocationEntry> RENext;
DataRefImpl RelNext = Rel; DataRefImpl RelNext = Rel;
RelNext.d.a++; RelNext.d.a++;
@ -826,40 +882,42 @@ error_code MachOObjectFile::getRelocationValueString(DataRefImpl Rel,
// X86_64_SUBTRACTOR must be followed by a relocation of type // X86_64_SUBTRACTOR must be followed by a relocation of type
// X86_64_RELOC_UNSIGNED. // X86_64_RELOC_UNSIGNED.
// NOTE: Scattered relocations don't exist on x86_64.
unsigned RType = (RENext->Word1 >> 28) & 0xF; unsigned RType = (RENext->Word1 >> 28) & 0xF;
if (RType != 0) if (RType != 0)
report_fatal_error("Expected X86_64_RELOC_UNSIGNED after " report_fatal_error("Expected X86_64_RELOC_UNSIGNED after "
"X86_64_RELOC_SUBTRACTOR."); "X86_64_RELOC_SUBTRACTOR.");
StringRef SucName;
if (error_code ec = getRelocationTargetName(RENext->Word1, SucName))
report_fatal_error(ec.message());
// The X86_64_RELOC_UNSIGNED contains the minuend symbol, // The X86_64_RELOC_UNSIGNED contains the minuend symbol,
// X86_64_SUBTRACTOR contains to the subtrahend. // X86_64_SUBTRACTOR contains to the subtrahend.
fmt << SucName << "-" << Name; printRelocationTargetName(RENext, fmt);
fmt << "-";
printRelocationTargetName(RE, fmt);
} }
case 6: // X86_64_RELOC_SIGNED1 case macho::RIT_X86_64_Signed1: // X86_64_RELOC_SIGNED1
fmt << Name << "-1"; printRelocationTargetName(RE, fmt);
fmt << "-1";
break; break;
case 7: // X86_64_RELOC_SIGNED2 case macho::RIT_X86_64_Signed2: // X86_64_RELOC_SIGNED2
fmt << Name << "-2"; printRelocationTargetName(RE, fmt);
fmt << "-2";
break; break;
case 8: // X86_64_RELOC_SIGNED4 case macho::RIT_X86_64_Signed4: // X86_64_RELOC_SIGNED4
fmt << Name << "-4"; printRelocationTargetName(RE, fmt);
fmt << "-4";
break; break;
default: default:
fmt << Name; printRelocationTargetName(RE, fmt);
break; break;
} }
// X86 and ARM share some relocation types in common. // X86 and ARM share some relocation types in common.
} else if (Arch == Triple::x86 || Arch == Triple::arm) { } else if (Arch == Triple::x86 || Arch == Triple::arm) {
// Generic relocation types... // Generic relocation types...
switch (Type) { switch (Type) {
case 1: // GENERIC_RELOC_PAIR - prints no info case macho::RIT_Pair: // GENERIC_RELOC_PAIR - prints no info
return object_error::success; return object_error::success;
case 2: // GENERIC_RELOC_SECTDIFF case macho::RIT_Difference: // GENERIC_RELOC_SECTDIFF
case 4: { // GENERIC_RELOC_LOCAL_SECTDIFF case macho::RIT_Generic_LocalDifference: { // GENERIC_RELOC_LOCAL_SECTDIFF
InMemoryStruct<macho::RelocationEntry> RENext; InMemoryStruct<macho::RelocationEntry> RENext;
DataRefImpl RelNext = Rel; DataRefImpl RelNext = Rel;
RelNext.d.a++; RelNext.d.a++;
@ -867,47 +925,46 @@ error_code MachOObjectFile::getRelocationValueString(DataRefImpl Rel,
// X86 sect diff's must be followed by a relocation of type // X86 sect diff's must be followed by a relocation of type
// GENERIC_RELOC_PAIR. // GENERIC_RELOC_PAIR.
unsigned RType = (RENext->Word1 >> 28) & 0xF; bool isNextScattered = (Arch != Triple::x86_64) &&
(RENext->Word0 & macho::RF_Scattered);
unsigned RType;
if (isNextScattered)
RType = (RENext->Word0 >> 24) & 0xF;
else
RType = (RENext->Word1 >> 28) & 0xF;
if (RType != 1) if (RType != 1)
report_fatal_error("Expected GENERIC_RELOC_PAIR after " report_fatal_error("Expected GENERIC_RELOC_PAIR after "
"GENERIC_RELOC_SECTDIFF or " "GENERIC_RELOC_SECTDIFF or "
"GENERIC_RELOC_LOCAL_SECTDIFF."); "GENERIC_RELOC_LOCAL_SECTDIFF.");
StringRef SucName; printRelocationTargetName(RE, fmt);
if (error_code ec = getRelocationTargetName(RENext->Word1, SucName)) fmt << "-";
report_fatal_error(ec.message()); printRelocationTargetName(RENext, fmt);
StringRef Name;
if (error_code ec = getRelocationTargetName(RE->Word1, Name))
report_fatal_error(ec.message());
fmt << Name << "-" << SucName;
break; break;
} }
} }
if (Arch == Triple::x86 && Type != 1) { if (Arch == Triple::x86) {
// All X86 relocations that need special printing were already // All X86 relocations that need special printing were already
// handled in the generic code. // handled in the generic code.
StringRef Name; printRelocationTargetName(RE, fmt);
if (error_code ec = getRelocationTargetName(RE->Word1, Name))
report_fatal_error(ec.message());
fmt << Name;
} else { // ARM-specific relocations } else { // ARM-specific relocations
switch (Type) { switch (Type) {
case 8: // ARM_RELOC_HALF case macho::RIT_ARM_Half: // ARM_RELOC_HALF
case 9: { // ARM_RELOC_HALF_SECTDIFF case macho::RIT_ARM_HalfDifference: { // ARM_RELOC_HALF_SECTDIFF
StringRef Name;
if (error_code ec = getRelocationTargetName(RE->Word1, Name))
report_fatal_error(ec.message());
// Half relocations steal a bit from the length field to encode // Half relocations steal a bit from the length field to encode
// whether this is an upper16 or a lower16 relocation. // whether this is an upper16 or a lower16 relocation.
bool isUpper = (RE->Word1 >> 25) & 1; bool isUpper;
if (isUpper) if (isScattered)
fmt << ":upper16:(" << Name; isUpper = (RE->Word0 >> 28) & 1;
else else
fmt << ":lower16:(" << Name; isUpper = (RE->Word1 >> 25) & 1;
if (isUpper)
fmt << ":upper16:(";
else
fmt << ":lower16:(";
printRelocationTargetName(RE, fmt);
InMemoryStruct<macho::RelocationEntry> RENext; InMemoryStruct<macho::RelocationEntry> RENext;
DataRefImpl RelNext = Rel; DataRefImpl RelNext = Rel;
@ -916,45 +973,40 @@ error_code MachOObjectFile::getRelocationValueString(DataRefImpl Rel,
// ARM half relocs must be followed by a relocation of type // ARM half relocs must be followed by a relocation of type
// ARM_RELOC_PAIR. // ARM_RELOC_PAIR.
unsigned RType = (RENext->Word1 >> 28) & 0xF; bool isNextScattered = (Arch != Triple::x86_64) &&
(RENext->Word0 & macho::RF_Scattered);
unsigned RType;
if (isNextScattered)
RType = (RENext->Word0 >> 24) & 0xF;
else
RType = (RENext->Word1 >> 28) & 0xF;
if (RType != 1) if (RType != 1)
report_fatal_error("Expected ARM_RELOC_PAIR after " report_fatal_error("Expected ARM_RELOC_PAIR after "
"GENERIC_RELOC_HALF"); "GENERIC_RELOC_HALF");
// A constant addend for the relocation is stored in the address // NOTE: The half of the target virtual address is stashed in the
// field of the follow-on relocation. If this is a lower16 relocation // address field of the secondary relocation, but we can't reverse
// we need to shift it left by 16 before using it. // engineer the constant offset from it without decoding the movw/movt
int32_t Addend = RENext->Word0; // instruction to find the other half in its immediate field.
if (!isUpper) Addend <<= 16;
// ARM_RELOC_HALF_SECTDIFF encodes the second section in the // ARM_RELOC_HALF_SECTDIFF encodes the second section in the
// symbol/section pointer of the follow-on relocation. // symbol/section pointer of the follow-on relocation.
StringRef SucName; if (Type == macho::RIT_ARM_HalfDifference) {
if (Type == 9) { // ARM_RELOC_HALF_SECTDIFF fmt << "-";
if (error_code ec = getRelocationTargetName(RENext->Word1, SucName)) printRelocationTargetName(RENext, fmt);
report_fatal_error(ec.message());
} }
if (SucName.size()) fmt << "-" << SucName;
if (Addend > 0) fmt << "+" << Addend;
else if (Addend < 0) fmt << Addend;
fmt << ")"; fmt << ")";
break; break;
} }
default: { default: {
StringRef Name; printRelocationTargetName(RE, fmt);
if (error_code ec = getRelocationTargetName(RE->Word1, Name))
report_fatal_error(ec.message());
fmt << Name;
} }
} }
} }
} else { } else
StringRef Name; printRelocationTargetName(RE, fmt);
if (error_code ec = getRelocationTargetName(RE->Word1, Name))
report_fatal_error(ec.message());
fmt << Name;
}
fmt.flush(); fmt.flush();
Result.append(fmtbuf.begin(), fmtbuf.end()); Result.append(fmtbuf.begin(), fmtbuf.end());
@ -966,19 +1018,25 @@ error_code MachOObjectFile::getRelocationHidden(DataRefImpl Rel,
InMemoryStruct<macho::RelocationEntry> RE; InMemoryStruct<macho::RelocationEntry> RE;
getRelocation(Rel, RE); getRelocation(Rel, RE);
unsigned Type = (RE->Word1 >> 28) & 0xF;
unsigned Arch = getArch(); unsigned Arch = getArch();
bool isScattered = (Arch != Triple::x86_64) &&
(RE->Word0 & macho::RF_Scattered);
unsigned Type;
if (isScattered)
Type = (RE->Word0 >> 24) & 0xF;
else
Type = (RE->Word1 >> 28) & 0xF;
Result = false; Result = false;
// On arches that use the generic relocations, GENERIC_RELOC_PAIR // On arches that use the generic relocations, GENERIC_RELOC_PAIR
// is always hidden. // is always hidden.
if (Arch == Triple::x86 || Arch == Triple::arm) { if (Arch == Triple::x86 || Arch == Triple::arm) {
if (Type == 1) Result = true; if (Type == macho::RIT_Pair) Result = true;
} else if (Arch == Triple::x86_64) { } else if (Arch == Triple::x86_64) {
// On x86_64, X86_64_RELOC_UNSIGNED is hidden only when it follows // On x86_64, X86_64_RELOC_UNSIGNED is hidden only when it follows
// an X864_64_RELOC_SUBTRACTOR. // an X864_64_RELOC_SUBTRACTOR.
if (Type == 0 && Rel.d.a > 0) { if (Type == macho::RIT_X86_64_Unsigned && Rel.d.a > 0) {
DataRefImpl RelPrev = Rel; DataRefImpl RelPrev = Rel;
RelPrev.d.a--; RelPrev.d.a--;
InMemoryStruct<macho::RelocationEntry> REPrev; InMemoryStruct<macho::RelocationEntry> REPrev;
@ -986,7 +1044,7 @@ error_code MachOObjectFile::getRelocationHidden(DataRefImpl Rel,
unsigned PrevType = (REPrev->Word1 >> 28) & 0xF; unsigned PrevType = (REPrev->Word1 >> 28) & 0xF;
if (PrevType == 5) Result = true; if (PrevType == macho::RIT_X86_64_Subtractor) Result = true;
} }
} }