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

Don't fetch pointers from a InMemoryStruct.

Browse Source 
InMemoryStruct is extremely dangerous as it returns data from an internal
buffer when the endiannes doesn't match. This should fix the tests on big
endian hosts.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@178875 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2013-04-05 15:15:22 +00:00
parent 332edeb1dc
commit f16c2bb320
7 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tools/llvm-readobj/MachODumper.cpp
View File

@ -157,14 +157,6 @@ namespace {
};
}
static StringRef parseSegmentOrSectionName(ArrayRef<char> P) {
if (P[15] == 0)
// Null terminated.
return StringRef(P.data());
// Not null terminated, so this is a 16 char string.
return StringRef(P.data(), 16);
}
static bool is64BitLoadCommand(const MachOObject *MachOObj, DataRefImpl DRI) {
LoadCommandInfo LCI = MachOObj->getLoadCommandInfo(DRI.d.a);
if (LCI.Command.Type == macho::LCT_Segment64)
@ -181,8 +173,6 @@ static void getSection(const MachOObject *MachOObj,
InMemoryStruct<macho::Section64> Sect;
MachOObj->ReadSection64(LCI, DRI.d.b, Sect);
Section.Name = ArrayRef<char>(Sect->Name);
Section.SegmentName = ArrayRef<char>(Sect->SegmentName);
Section.Address = Sect->Address;
Section.Size = Sect->Size;
Section.Offset = Sect->Offset;
@ -196,8 +186,6 @@ static void getSection(const MachOObject *MachOObj,
InMemoryStruct<macho::Section> Sect;
MachOObj->ReadSection(LCI, DRI.d.b, Sect);
Section.Name = Sect->Name;
Section.SegmentName = Sect->SegmentName;
Section.Address = Sect->Address;
Section.Size = Sect->Size;
Section.Offset = Sect->Offset;
@ -270,15 +258,20 @@ void MachODumper::printSections() {
MachOSection Section;
getSection(MachO, SecI->getRawDataRefImpl(), Section);
DataRefImpl DR = SecI->getRawDataRefImpl();
StringRef Name;
if (error(SecI->getName(Name)))
Name = "";
ArrayRef<char> RawName = Obj->getSectionRawName(DR);
StringRef SegmentName = Obj->getSectionFinalSegmentName(DR);
ArrayRef<char> RawSegmentName = Obj->getSectionRawFinalSegmentName(DR);
DictScope SectionD(W, "Section");
W.printNumber("Index", SectionIndex);
W.printBinary("Name", Name, Section.Name);
W.printBinary("Segment", parseSegmentOrSectionName(Section.SegmentName),
Section.SegmentName);
W.printBinary("Name", Name, RawName);
W.printBinary("Segment", SegmentName, RawSegmentName);
W.printHex ("Address", Section.Address);
W.printHex ("Size", Section.Size);
W.printNumber("Offset", Section.Offset);