mirror of
https://github.com/RPCSX/llvm.git
synced 2024-12-11 21:57:55 +00:00
[llvm-pdbdump] Simplify options and output.
This removes a wealth of options, and instead now only provides three options. -symbols, -types, and -compilands. This greatly simplifies use of the tool, and makes it easier to understand what you're going to see when you run the tool. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@230182 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Zachary Turner
parent
5606ca9edd
commit
e759e99a67
@ -53,6 +53,7 @@ void PDBSymbolExe::dump(raw_ostream &OS, int Indent,
|
||||
OS << "\n";
|
||||
|
||||
if (Flags & PDB_DF_Children) {
|
||||
OS << stream_indent(Indent + 2) << "Dumping types\n";
|
||||
if (Flags & PDB_DF_Hidden) {
|
||||
// For some reason, for each SymTag T, this dumps more items of type T
|
||||
// than are dumped by calling dumpChildren(T). In other words, there are
|
||||
|
||||
@ -1,14 +1,32 @@
|
||||
; RUN: llvm-pdbdump %p/Inputs/empty.pdb | FileCheck %s -check-prefix SUMMARY_CHECK
|
||||
; RUN: llvm-pdbdump -functions %p/Inputs/empty.pdb | FileCheck %s -check-prefix MAIN_CHECK
|
||||
; RUN: llvm-pdbdump %p/Inputs/empty.pdb | FileCheck %s -check-prefix=NO_ARGS
|
||||
; RUN: llvm-pdbdump -types %p/Inputs/empty.pdb | FileCheck %s -check-prefix=TYPES
|
||||
; RUN: llvm-pdbdump -compilands %p/Inputs/empty.pdb | FileCheck %s -check-prefix=COMPILANDS
|
||||
; RUN: llvm-pdbdump -types -compilands %p/Inputs/empty.pdb | FileCheck %s -check-prefix=BOTH
|
||||
|
||||
; Check PDB file summary information
|
||||
; SUMMARY_CHECK: empty.pdb
|
||||
; SUMMARY_CHECK: Guid: {0B355641-86A0-A249-896F-9988FAE52FF0}
|
||||
; SUMMARY_CHECK: Attributes: HasPrivateSymbols
|
||||
; Check that neither symbols nor compilands are dumped when neither argument specified.
|
||||
; NO_ARGS: empty.pdb
|
||||
; NO_ARGS: Guid: {0B355641-86A0-A249-896F-9988FAE52FF0}
|
||||
; NO_ARGS: Attributes: HasPrivateSymbols
|
||||
; NO_ARGS-NOT: Dumping compilands
|
||||
; NO_ARGS-NOT: Dumping symbols
|
||||
|
||||
; Check that running with only -compilands doesn't include unwanted symbol types
|
||||
; MAIN_CHECK: (EBP) int32_t __cdecl main()
|
||||
; MAIN_CHECK-NOT: vtbl:
|
||||
; MAIN_CHECK-NOT: enum:
|
||||
; MAIN_CHECK-NOT: class:
|
||||
; MAIN_CHECK-NOT: data:
|
||||
; Check that only symbols are dumped when only -types is specified.
|
||||
; TYPES: empty.pdb
|
||||
; TYPES: Guid: {0B355641-86A0-A249-896F-9988FAE52FF0}
|
||||
; TYPES: Attributes: HasPrivateSymbols
|
||||
; TYPES: Dumping types
|
||||
; TYPES-NOT: Dumping compilands
|
||||
|
||||
; Check that only compilands are dumped when only -compilands is specified.
|
||||
; COMPILANDS: empty.pdb
|
||||
; COMPILANDS: Guid: {0B355641-86A0-A249-896F-9988FAE52FF0}
|
||||
; COMPILANDS: Attributes: HasPrivateSymbols
|
||||
; COMPILANDS-NOT: Dumping types
|
||||
; COMPILANDS: Dumping compilands
|
||||
|
||||
; Check that types and compilands are dumped when both arguments are specified.
|
||||
; BOTH: empty.pdb
|
||||
; BOTH: Guid: {0B355641-86A0-A249-896F-9988FAE52FF0}
|
||||
; BOTH: Attributes: HasPrivateSymbols
|
||||
; BOTH: Dumping types
|
||||
; BOTH: Dumping compilands
|
||||
|
||||
@ -1,14 +1,27 @@
|
||||
; RUN: llvm-pdbdump -all -hidden -group-by=compiland %p/Inputs/symbolformat.pdb | FileCheck --check-prefix=FORMAT %s
|
||||
; RUN: llvm-pdbdump -symbols %p/Inputs/symbolformat.pdb | FileCheck --check-prefix=SYM_FORMAT %s
|
||||
; RUN: llvm-pdbdump -types %p/Inputs/symbolformat.pdb | FileCheck --check-prefix=TYPES_FORMAT %s
|
||||
|
||||
; The format here is func [0x<rva_start>+<prologue_length> - 0x<rva_end>-<epilogue_length>]
|
||||
; FORMAT: test\DebugInfo\PDB\Inputs\symbolformat-fpo.obj
|
||||
; FORMAT-DAG: func [0x001130+0 - 0x001137-1] (VFrame) uint32_t __cdecl fpo_func(uint32_t)
|
||||
; FORMAT: d:\src\llvm\test\DebugInfo\PDB\Inputs\symbolformat.obj
|
||||
; FORMAT-DAG: func [0x001060+3 - 0x001067-2] (EBP) int32_t __cdecl _purecall()
|
||||
; FORMAT-DAG: func [0x001070+6 - 0x001099-4] (EBP) int32_t __cdecl main(int32_t, char**)
|
||||
; FORMAT-DAG: func [0x0010b0+7 - 0x0010c7-4] (EBP) void __thiscall A::A()
|
||||
; FORMAT-DAG: func [0x0010d0+7 - 0x0010ef-4] (EBP) void __thiscall B::B()
|
||||
; FORMAT-DAG: thunk [0x000010f6 - 0x000010fa] (Pcode) B::`vcall'{0}'
|
||||
; FORMAT-DAG: func [0x001100+7 - 0x00110b-4] (EBP) virtual void __thiscall B::PureFunc()
|
||||
; FORMAT-DAG: func [0x001110+7 - 0x00111b-4] (EBP) void __thiscall A::RegularFunc()
|
||||
; FORMAT-DAG: func [0x001120+7 - 0x00112b-4] (EBP) virtual void __thiscall A::VirtualFunc()
|
||||
; The format is func [0x<rva_start>+<prologue_length> - 0x<rva_end>-<epilogue_length>]
|
||||
; SYM_FORMAT: symbolformat-fpo.obj
|
||||
; SYM_FORMAT-DAG: func [0x001130+0 - 0x001137-1] (VFrame) uint32_t __cdecl fpo_func(uint32_t)
|
||||
; SYM_FORMAT: symbolformat.obj
|
||||
; SYM_FORMAT-DAG: func [0x001060+3 - 0x001067-2] (EBP) int32_t __cdecl _purecall()
|
||||
; SYM_FORMAT-DAG: func [0x001070+6 - 0x001099-4] (EBP) int32_t __cdecl main(int32_t, char**)
|
||||
; SYM_FORMAT-DAG: func [0x0010b0+7 - 0x0010c7-4] (EBP) void __thiscall A::A()
|
||||
; SYM_FORMAT-DAG: func [0x0010d0+7 - 0x0010ef-4] (EBP) void __thiscall B::B()
|
||||
; SYM_FORMAT-DAG: thunk [0x000010f6 - 0x000010fa] (Pcode) B::`vcall'{0}'
|
||||
; SYM_FORMAT-DAG: func [0x001100+7 - 0x00110b-4] (EBP) virtual void __thiscall B::PureFunc()
|
||||
; SYM_FORMAT-DAG: func [0x001110+7 - 0x00111b-4] (EBP) void __thiscall A::RegularFunc()
|
||||
; SYM_FORMAT-DAG: func [0x001120+7 - 0x00112b-4] (EBP) virtual void __thiscall A::VirtualFunc()
|
||||
|
||||
; TYPES_FORMAT: Function Signatures
|
||||
; TYPES_FORMAT-DAG: int32_t __cdecl ()
|
||||
; TYPES_FORMAT-DAG: int32_t __cdecl (int32_t, char**)
|
||||
; TYPES_FORMAT-DAG: void __thiscall (A::*)()
|
||||
; TYPES_FORMAT-DAG: void __thiscall (B::*)()
|
||||
; TYPES_FORMAT-DAG: void __thiscall (B::*)(B&)
|
||||
; TYPES_FORMAT-DAG: void __thiscall (B::*)()
|
||||
; TYPES_FORMAT-DAG: B& __thiscall (B::*)(B&)
|
||||
; TYPES_FORMAT-DAG: void __thiscall (A::*)(A&)
|
||||
; TYPES_FORMAT-DAG: void __thiscall (A::*)()
|
||||
; TYPES_FORMAT-DAG: A& __thiscall (A::*)(A&)
|
||||
|
||||
@ -45,71 +45,10 @@ cl::list<std::string> InputFilenames(cl::Positional,
|
||||
cl::desc("<input PDB files>"),
|
||||
cl::OneOrMore);
|
||||
|
||||
cl::opt<bool> DumpHidden(
|
||||
"hidden",
|
||||
cl::desc("Attempt to find hidden symbols. This can find additional\n"
|
||||
"symbols that cannot be found otherwise. For example, vtables\n"
|
||||
"can only be found with an exhaustive search such as this. Be\n"
|
||||
"warned that the performance can be prohibitive on large PDB "
|
||||
"files."));
|
||||
|
||||
cl::opt<bool> DumpAll(
|
||||
"all",
|
||||
cl::desc("Specifies all other options except -hidden and -group-by"));
|
||||
cl::opt<bool> DumpObjFiles("compilands", cl::desc("Display object files"));
|
||||
cl::opt<bool> DumpFuncs("functions", cl::desc("Display function information"));
|
||||
cl::opt<bool> DumpData(
|
||||
"data",
|
||||
cl::desc("Display global, class, and constant variable information."));
|
||||
cl::opt<bool> DumpLabels("labels", cl::desc("Display labels"));
|
||||
cl::opt<bool> DumpPublic("public", cl::desc("Display public symbols"));
|
||||
cl::opt<bool> DumpClasses("classes", cl::desc("Display class type information"));
|
||||
cl::opt<bool> DumpEnums("enums", cl::desc("Display enum information"));
|
||||
cl::opt<bool> DumpFuncsigs("funcsigs",
|
||||
cl::desc("Display unique function signatures"));
|
||||
cl::opt<bool> DumpTypedefs("typedefs", cl::desc("Display typedefs"));
|
||||
cl::opt<bool> DumpThunks("thunks", cl::desc("Display thunks"));
|
||||
cl::opt<bool> DumpVtables(
|
||||
"vtables",
|
||||
cl::desc("Display virtual function tables (only with --exhaustive)"));
|
||||
|
||||
static cl::opt<PDB_DumpType> DumpMode(
|
||||
"group-by", cl::init(PDB_DumpType::ByType), cl::desc("Dump mode:"),
|
||||
cl::values(
|
||||
clEnumValN(PDB_DumpType::ByType, "type",
|
||||
"(Default) Display symbols grouped by type"),
|
||||
clEnumValN(PDB_DumpType::ByObjFile, "compiland",
|
||||
"Display symbols grouped under their containing object "
|
||||
"file."),
|
||||
clEnumValN(PDB_DumpType::Both, "both",
|
||||
"Display symbols grouped by type, and then by object file."),
|
||||
clEnumValEnd));
|
||||
}
|
||||
|
||||
#define SET_DUMP_FLAG_FROM_OPT(Var, Flag, Opt) \
|
||||
if (opts::Opt) \
|
||||
Var |= Flag;
|
||||
|
||||
PDB_DumpFlags CalculateDumpFlags() {
|
||||
PDB_DumpFlags Flags = PDB_DF_None;
|
||||
|
||||
SET_DUMP_FLAG_FROM_OPT(Flags, PDB_DF_Hidden, DumpHidden)
|
||||
|
||||
if (opts::DumpAll)
|
||||
return Flags | PDB_DF_All;
|
||||
|
||||
SET_DUMP_FLAG_FROM_OPT(Flags, PDB_DF_ObjFiles, DumpObjFiles)
|
||||
SET_DUMP_FLAG_FROM_OPT(Flags, PDB_DF_Functions, DumpFuncs)
|
||||
SET_DUMP_FLAG_FROM_OPT(Flags, PDB_DF_Data, DumpData)
|
||||
SET_DUMP_FLAG_FROM_OPT(Flags, PDB_DF_Labels, DumpLabels)
|
||||
SET_DUMP_FLAG_FROM_OPT(Flags, PDB_DF_PublicSyms, DumpPublic)
|
||||
SET_DUMP_FLAG_FROM_OPT(Flags, PDB_DF_Classes, DumpClasses)
|
||||
SET_DUMP_FLAG_FROM_OPT(Flags, PDB_DF_Enums, DumpEnums)
|
||||
SET_DUMP_FLAG_FROM_OPT(Flags, PDB_DF_Funcsigs, DumpFuncsigs)
|
||||
SET_DUMP_FLAG_FROM_OPT(Flags, PDB_DF_Typedefs, DumpTypedefs)
|
||||
SET_DUMP_FLAG_FROM_OPT(Flags, PDB_DF_Thunks, DumpThunks)
|
||||
SET_DUMP_FLAG_FROM_OPT(Flags, PDB_DF_VTables, DumpVtables)
|
||||
return Flags;
|
||||
cl::opt<bool> DumpCompilands("compilands", cl::desc("Display compilands"));
|
||||
cl::opt<bool> DumpSymbols("symbols",
|
||||
cl::desc("Display symbols (implies --compilands"));
|
||||
cl::opt<bool> DumpTypes("types", cl::desc("Display types"));
|
||||
}
|
||||
|
||||
static void dumpInput(StringRef Path) {
|
||||
@ -120,19 +59,24 @@ static void dumpInput(StringRef Path) {
|
||||
outs() << " is available for your platform.";
|
||||
return;
|
||||
}
|
||||
PDB_DumpFlags Flags = CalculateDumpFlags();
|
||||
|
||||
if (opts::DumpMode != opts::PDB_DumpType::ByObjFile)
|
||||
Flags |= PDB_DF_Children;
|
||||
auto GlobalScope(Session->getGlobalScope());
|
||||
PDB_DumpFlags Flags = PDB_DF_None;
|
||||
if (opts::DumpTypes)
|
||||
Flags |= PDB_DF_Children | PDB_DF_Enums | PDB_DF_Funcsigs |
|
||||
PDB_DF_Typedefs | PDB_DF_VTables;
|
||||
GlobalScope->dump(outs(), 0, PDB_DumpLevel::Normal, Flags);
|
||||
outs() << "\n";
|
||||
|
||||
if (opts::DumpMode != opts::PDB_DumpType::ByType) {
|
||||
if (opts::DumpSymbols || opts::DumpCompilands) {
|
||||
outs() << "Dumping compilands\n";
|
||||
auto Compilands = GlobalScope->findAllChildren<PDBSymbolCompiland>();
|
||||
Flags = PDB_DF_None;
|
||||
if (opts::DumpSymbols)
|
||||
Flags |= PDB_DF_Children | PDB_DF_Data | PDB_DF_Functions |
|
||||
PDB_DF_Thunks | PDB_DF_Labels;
|
||||
while (auto Compiland = Compilands->getNext()) {
|
||||
Compiland->dump(outs(), 0, PDB_DumpLevel::Detailed,
|
||||
Flags | PDB_DF_Children);
|
||||
Compiland->dump(outs(), 2, PDB_DumpLevel::Detailed, Flags);
|
||||
outs() << "\n";
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user