RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2025-03-03 10:27:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "[llvm-readobj] Simplify usage of -codeview flag"

Browse Source 
This reverts commit r255790.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@255791 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Reid Kleckner 2015-12-16 18:19:34 +00:00
parent 377b54ca02
commit 3a06c2dfa3
3 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/llvm-readobj/COFFDumper.cpp
View File

@ -60,7 +60,6 @@ public:
void printCOFFExports() override;
void printCOFFDirectives() override;
void printCOFFBaseReloc() override;
void printCodeViewDebugInfo() override;
void printStackMap() const override;
private:
void printSymbol(const SymbolRef &Sym);
@ -72,7 +71,7 @@ private:
void printBaseOfDataField(const pe32_header *Hdr);
void printBaseOfDataField(const pe32plus_header *Hdr);
void printCodeViewSection(const SectionRef &Section);
void printCodeViewDebugInfo(const SectionRef &Section);
void printCodeViewSymbolsSubsection(StringRef Subsection,
const SectionRef &Section,
@ -475,16 +474,7 @@ void COFFDumper::printBaseOfDataField(const pe32_header *Hdr) {
void COFFDumper::printBaseOfDataField(const pe32plus_header *) {}
void COFFDumper::printCodeViewDebugInfo() {
for (const SectionRef &S : Obj->sections()) {
StringRef SecName;
error(S.getName(SecName));
if (SecName == ".debug$S")
printCodeViewSection(S);
}
}
void COFFDumper::printCodeViewSection(const SectionRef &Section) {
void COFFDumper::printCodeViewDebugInfo(const SectionRef &Section) {
StringRef Data;
error(Section.getContents(Data));
@ -526,7 +516,8 @@ void COFFDumper::printCodeViewSection(const SectionRef &Section) {
switch (SubSectionType) {
case COFF::DEBUG_SYMBOL_SUBSECTION:
printCodeViewSymbolsSubsection(Contents, Section, Offset);
if (opts::SectionSymbols)
printCodeViewSymbolsSubsection(Contents, Section, Offset);
break;
case COFF::DEBUG_LINE_TABLE_SUBSECTION: {
// Holds a PC to file:line table. Some data to parse this subsection is
@ -786,6 +777,9 @@ void COFFDumper::printSections() {
}
}
if (Name == ".debug$S" && opts::CodeView)
printCodeViewDebugInfo(Sec);
if (opts::SectionData &&
!(Section->Characteristics & COFF::IMAGE_SCN_CNT_UNINITIALIZED_DATA)) {
StringRef Data;

1
tools/llvm-readobj/ObjDumper.h
View File

@ -56,7 +56,6 @@ public:
virtual void printCOFFExports() { }
virtual void printCOFFDirectives() { }
virtual void printCOFFBaseReloc() { }
virtual void printCodeViewDebugInfo() { }
// Only implemented for MachO.
virtual void printMachODataInCode() { }

2
tools/llvm-readobj/llvm-readobj.cpp
View File

@ -354,8 +354,6 @@ static void dumpObject(const ObjectFile *Obj) {
Dumper->printCOFFDirectives();
if (opts::COFFBaseRelocs)
Dumper->printCOFFBaseReloc();
if (opts::CodeView)
Dumper->printCodeViewDebugInfo();
}
if (Obj->isMachO()) {
if (opts::MachODataInCode)