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

For COFF and MachO, compute the gap between to symbols.

Browse Source 
Before r238028 we used to do this in O(N^2), now we do it in O(N log N).

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@238698 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2015-05-31 23:15:35 +00:00
parent 7b72baf44a
commit f8f9476a1b
2 changed files with 51 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/DebugInfo/debuglineinfo-macho.test
View File

@ -1,7 +1,12 @@
# Check that relocations get applied
RUN: llvm-dwarfdump %p/Inputs/test-simple-macho.o | FileCheck %s
RUN: llvm-dwarfdump %p/Inputs/test-multiple-macho.o | FileCheck %s
RUN: llvm-rtdyld -printline %p/Inputs/test-multiple-macho.o | FileCheck %s
RUN: llvm-rtdyld -printline %p/Inputs/test-multiple-macho.o | \
RUN: FileCheck --check-prefix=SIZE %s
RUN: llvm-rtdyld -printobjline %p/Inputs/test-multiple-macho.o | FileCheck %s
SIZE: Function: _bar, Size = 48
SIZE: Function: _foo, Size = 16
SIZE: Function: _fubar, Size = 46
CHECK-NOT: error: failed to compute relocation: X86_64_RELOC_UNSIGNED

48
tools/llvm-rtdyld/llvm-rtdyld.cpp
View File

@ -247,6 +247,36 @@ static int printLineInfoForInput(bool LoadObjects, bool UseDebugObj) {
std::unique_ptr<DIContext> Context(
new DWARFContextInMemory(*SymbolObj,LoadedObjInfo.get()));
// FIXME: This is generally useful. Figure out a place in lib/Object to
// put utility functions.
std::map<object::SectionRef, std::vector<uint64_t>> FuncAddresses;
if (!isa<ELFObjectFileBase>(SymbolObj)) {
for (object::SymbolRef Sym : SymbolObj->symbols()) {
object::SymbolRef::Type SymType;
if (Sym.getType(SymType))
continue;
if (SymType != object::SymbolRef::ST_Function)
continue;
uint64_t Addr;
if (Sym.getAddress(Addr))
continue;
object::section_iterator Sec = SymbolObj->section_end();
if (Sym.getSection(Sec))
continue;
std::vector<uint64_t> &Addrs = FuncAddresses[*Sec];
if (Addrs.empty()) {
uint64_t SecAddr = Sec->getAddress();
uint64_t SecSize = Sec->getSize();
Addrs.push_back(SecAddr + SecSize);
}
Addrs.push_back(Addr);
}
for (auto &Pair : FuncAddresses) {
std::vector<uint64_t> &Addrs = Pair.second;
array_pod_sort(Addrs.begin(), Addrs.end());
}
}
// Use symbol info to iterate functions in the object.
for (object::SymbolRef Sym : SymbolObj->symbols()) {
object::SymbolRef::Type SymType;
@ -255,13 +285,25 @@ static int printLineInfoForInput(bool LoadObjects, bool UseDebugObj) {
if (SymType == object::SymbolRef::ST_Function) {
StringRef Name;
uint64_t Addr;
uint64_t Size;
if (Sym.getName(Name))
continue;
if (Sym.getAddress(Addr))
continue;
if (Sym.getSize(Size))
continue;
uint64_t Size;
if (isa<ELFObjectFileBase>(SymbolObj)) {
if (Sym.getSize(Size))
continue;
} else {
object::section_iterator Sec = SymbolObj->section_end();
if (Sym.getSection(Sec))
continue;
const std::vector<uint64_t> &Addrs = FuncAddresses[*Sec];
auto AddrI = std::find(Addrs.begin(), Addrs.end(), Addr);
assert(AddrI != Addrs.end() && (AddrI + 1) != Addrs.end());
assert(*AddrI == Addr);
Size = *(AddrI + 1) - Addr;
}
// If we're not using the debug object, compute the address of the
// symbol in memory (rather than that in the unrelocated object file)