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

Revert "Add a funciton to get the segment name of a section."

Browse Source 
This reverts commit r170095 since it appears to be breaking the bots.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@170105 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Christopher
2012-12-13 06:36:18 +00:00
parent a61b17c18a
commit ef8581479e
4 changed files with 14 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/Object/MachOObjectFile.cpp
View File

@@ -473,43 +473,28 @@ static bool is64BitLoadCommand(const MachOObject *MachOObj, DataRefImpl DRI) {
return false;
}
static StringRef parseSegmentOrSectionName(const char *P) {
if (P[15] == 0)
// Null terminated.
return P;
// Not null terminated, so this is a 16 char string.
return StringRef(P, 16);
}
error_code MachOObjectFile::getSectionName(DataRefImpl DRI,
StringRef &Result) const {
// FIXME: thread safety.
static char result[34];
if (is64BitLoadCommand(MachOObj.get(), DRI)) {
LoadCommandInfo LCI = MachOObj->getLoadCommandInfo(DRI.d.a);
InMemoryStruct<macho::Section64> Sect;
MachOObj->ReadSection64(LCI, DRI.d.b, Sect);
Result = parseSegmentOrSectionName(Sect->Name);
strcpy(result, Sect->SegmentName);
strcat(result, ",");
strcat(result, Sect->Name);
} else {
LoadCommandInfo LCI = MachOObj->getLoadCommandInfo(DRI.d.a);
InMemoryStruct<macho::Section> Sect;
MachOObj->ReadSection(LCI, DRI.d.b, Sect);
Result = parseSegmentOrSectionName(Sect->Name);
}
return object_error::success;
}
error_code MachOObjectFile::getSectionFinalSegmentName(DataRefImpl Sec,
StringRef &Res) const {
if (is64BitLoadCommand(MachOObj.get(), Sec)) {
LoadCommandInfo LCI = MachOObj->getLoadCommandInfo(Sec.d.a);
InMemoryStruct<macho::Section64> Sect;
MachOObj->ReadSection64(LCI, Sec.d.b, Sect);
Res = parseSegmentOrSectionName(Sect->SegmentName);
} else {
LoadCommandInfo LCI = MachOObj->getLoadCommandInfo(Sec.d.a);
InMemoryStruct<macho::Section> Sect;
MachOObj->ReadSection(LCI, Sec.d.b, Sect);
Res = parseSegmentOrSectionName(Sect->SegmentName);
strcpy(result, Sect->SegmentName);
strcat(result, ",");
strcat(result, Sect->Name);
}
Result = StringRef(result);
return object_error::success;
}