mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-02-19 06:31:18 +00:00
sectionContainsSymbol needs to be based on VMA's rather than section indices to properly account for files with segment load commands that contain no sections.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@141822 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
18ead6b587
commit
cd74988fb9
@ -449,15 +449,30 @@ error_code MachOObjectFile::isSectionBSS(DataRefImpl DRI,
|
|||||||
error_code MachOObjectFile::sectionContainsSymbol(DataRefImpl Sec,
|
error_code MachOObjectFile::sectionContainsSymbol(DataRefImpl Sec,
|
||||||
DataRefImpl Symb,
|
DataRefImpl Symb,
|
||||||
bool &Result) const {
|
bool &Result) const {
|
||||||
|
SymbolRef::SymbolType ST;
|
||||||
|
getSymbolType(Symb, ST);
|
||||||
|
if (ST == SymbolRef::ST_External) {
|
||||||
|
Result = false;
|
||||||
|
return object_error::success;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint64_t SectBegin, SectEnd;
|
||||||
|
getSectionAddress(Sec, SectBegin);
|
||||||
|
getSectionSize(Sec, SectEnd);
|
||||||
|
SectEnd += SectBegin;
|
||||||
|
|
||||||
if (MachOObj->is64Bit()) {
|
if (MachOObj->is64Bit()) {
|
||||||
InMemoryStruct<macho::Symbol64TableEntry> Entry;
|
InMemoryStruct<macho::Symbol64TableEntry> Entry;
|
||||||
getSymbol64TableEntry(Symb, Entry);
|
getSymbol64TableEntry(Symb, Entry);
|
||||||
Result = Entry->SectionIndex == 1 + Sec.d.a + Sec.d.b;
|
uint64_t SymAddr= Entry->Value;
|
||||||
|
Result = (SymAddr >= SectBegin) && (SymAddr < SectEnd);
|
||||||
} else {
|
} else {
|
||||||
InMemoryStruct<macho::SymbolTableEntry> Entry;
|
InMemoryStruct<macho::SymbolTableEntry> Entry;
|
||||||
getSymbolTableEntry(Symb, Entry);
|
getSymbolTableEntry(Symb, Entry);
|
||||||
Result = Entry->SectionIndex == 1 + Sec.d.a + Sec.d.b;
|
uint64_t SymAddr= Entry->Value;
|
||||||
|
Result = (SymAddr >= SectBegin) && (SymAddr < SectEnd);
|
||||||
}
|
}
|
||||||
|
|
||||||
return object_error::success;
|
return object_error::success;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user