[llvm-objdump] Add ability to demangle COFF symbols.
llvm-svn: 340221
diff --git a/llvm/tools/llvm-objdump/COFFDump.cpp b/llvm/tools/llvm-objdump/COFFDump.cpp
index 7ca5d04..7a437b1 100644
--- a/llvm/tools/llvm-objdump/COFFDump.cpp
+++ b/llvm/tools/llvm-objdump/COFFDump.cpp
@@ -16,6 +16,7 @@
//===----------------------------------------------------------------------===//
#include "llvm-objdump.h"
+#include "llvm/Demangle/Demangle.h"
#include "llvm/Object/COFF.h"
#include "llvm/Object/COFFImportFile.h"
#include "llvm/Object/ObjectFile.h"
@@ -646,10 +647,24 @@
<< "(sec " << format("%2d", int(Symbol->getSectionNumber())) << ")"
<< "(fl 0x00)" // Flag bits, which COFF doesn't have.
<< "(ty " << format("%3x", unsigned(Symbol->getType())) << ")"
- << "(scl " << format("%3x", unsigned(Symbol->getStorageClass())) << ") "
+ << "(scl " << format("%3x", unsigned(Symbol->getStorageClass()))
+ << ") "
<< "(nx " << unsigned(Symbol->getNumberOfAuxSymbols()) << ") "
<< "0x" << format("%08x", unsigned(Symbol->getValue())) << " "
- << Name << "\n";
+ << Name;
+ if (Demangle && Name.startswith("?")) {
+ char *DemangledSymbol = nullptr;
+ size_t Size = 0;
+ int Status = -1;
+ DemangledSymbol =
+ microsoftDemangle(Name.data(), DemangledSymbol, &Size, &Status);
+
+ if (Status == 0 && DemangledSymbol) {
+ outs() << " (" << StringRef(DemangledSymbol) << ")";
+ std::free(DemangledSymbol);
+ }
+ }
+ outs() << "\n";
for (unsigned AI = 0, AE = Symbol->getNumberOfAuxSymbols(); AI < AE; ++AI, ++SI) {
if (Symbol->isSectionDefinition()) {
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.cpp b/llvm/tools/llvm-objdump/llvm-objdump.cpp
index 8cec29e..09fa0c6 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.cpp
+++ b/llvm/tools/llvm-objdump/llvm-objdump.cpp
@@ -92,12 +92,11 @@
DisassembleAlld("D", cl::desc("Alias for --disassemble-all"),
cl::aliasopt(DisassembleAll));
-cl::opt<std::string> llvm::Demangle("demangle",
- cl::desc("Demangle symbols names"),
- cl::ValueOptional, cl::init("none"));
+cl::opt<bool> llvm::Demangle("demangle", cl::desc("Demangle symbols names"),
+ cl::init(false));
static cl::alias DemangleShort("C", cl::desc("Alias for --demangle"),
- cl::aliasopt(Demangle));
+ cl::aliasopt(llvm::Demangle));
static cl::list<std::string>
DisassembleFunctions("df",
@@ -1529,18 +1528,23 @@
outs() << '\n' << Name << ":\n";
};
StringRef SymbolName = std::get<1>(Symbols[si]);
- if (Demangle.getValue() == "" || Demangle.getValue() == "itanium") {
+ if (Demangle) {
char *DemangledSymbol = nullptr;
size_t Size = 0;
- int Status;
- DemangledSymbol =
- itaniumDemangle(SymbolName.data(), DemangledSymbol, &Size, &Status);
- if (Status == 0)
+ int Status = -1;
+ if (SymbolName.startswith("_Z"))
+ DemangledSymbol = itaniumDemangle(SymbolName.data(), DemangledSymbol,
+ &Size, &Status);
+ else if (SymbolName.startswith("?"))
+ DemangledSymbol = microsoftDemangle(SymbolName.data(),
+ DemangledSymbol, &Size, &Status);
+
+ if (Status == 0 && DemangledSymbol)
PrintSymbol(StringRef(DemangledSymbol));
else
PrintSymbol(SymbolName);
- if (Size != 0)
+ if (DemangledSymbol)
free(DemangledSymbol);
} else
PrintSymbol(SymbolName);
@@ -2395,10 +2399,6 @@
if (DisassembleAll || PrintSource || PrintLines)
Disassemble = true;
- if (Demangle.getValue() != "none" && Demangle.getValue() != "" &&
- Demangle.getValue() != "itanium")
- warn("Unsupported demangling style");
-
if (!Disassemble
&& !Relocations
&& !DynamicRelocations
diff --git a/llvm/tools/llvm-objdump/llvm-objdump.h b/llvm/tools/llvm-objdump/llvm-objdump.h
index 65867c2..44ef14d 100644
--- a/llvm/tools/llvm-objdump/llvm-objdump.h
+++ b/llvm/tools/llvm-objdump/llvm-objdump.h
@@ -31,10 +31,10 @@
extern cl::opt<std::string> TripleName;
extern cl::opt<std::string> ArchName;
extern cl::opt<std::string> MCPU;
-extern cl::opt<std::string> Demangle;
extern cl::list<std::string> MAttrs;
extern cl::list<std::string> FilterSections;
extern cl::opt<bool> AllHeaders;
+extern cl::opt<bool> Demangle;
extern cl::opt<bool> Disassemble;
extern cl::opt<bool> DisassembleAll;
extern cl::opt<bool> NoShowRawInsn;