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

Implement get getSymbolFileOffset with getSymbolAddress.

Browse Source 
This has the following advantages:
* Less code.
* The old ELF implementation was wrong for non-relocatable objects.
* The old ELF implementation (and I think MachO) was wrong for thumb.

No current testcase since this is only used from MCJIT and it only uses
relocatable objects and I don't think it supports thumb yet.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@205508 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2014-04-03 03:13:33 +00:00
parent 3539519223
commit 051c948bbe
6 changed files with 24 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
include/llvm/Object/ObjectFile.h
View File

@ -228,7 +228,6 @@ protected:
virtual error_code getSymbolName(DataRefImpl Symb, StringRef &Res) const = 0;
error_code printSymbolName(raw_ostream &OS, DataRefImpl Symb) const override;
virtual error_code getSymbolAddress(DataRefImpl Symb, uint64_t &Res) const = 0;
virtual error_code getSymbolFileOffset(DataRefImpl Symb, uint64_t &Res)const=0;
virtual error_code getSymbolAlignment(DataRefImpl Symb, uint32_t &Res) const;
virtual error_code getSymbolSize(DataRefImpl Symb, uint64_t &Res) const = 0;
virtual error_code getSymbolType(DataRefImpl Symb,
@ -352,7 +351,30 @@ inline error_code SymbolRef::getAddress(uint64_t &Result) const {
}
inline error_code SymbolRef::getFileOffset(uint64_t &Result) const {
return getObject()->getSymbolFileOffset(getRawDataRefImpl(), Result);
uint64_t Address;
if (error_code EC = getAddress(Address))
return EC;
const ObjectFile *Obj = getObject();
section_iterator SecI(Obj->section_begin());
if (error_code EC = getSection(SecI))
return EC;
uint64_t SectionAddress;
if (error_code EC = SecI->getAddress(SectionAddress))
return EC;
uint64_t OffsetInSection = Address - SectionAddress;
StringRef SecContents;
if (error_code EC = SecI->getContents(SecContents))
return EC;
// FIXME: this is a hack.
uint64_t SectionOffset = (uint64_t)SecContents.data() - (uint64_t)Obj->base();
Result = SectionOffset + OffsetInSection;
return object_error::success;
}
inline error_code SymbolRef::getAlignment(uint32_t &Result) const {