From: Zachary Turner Date: Fri, 27 Feb 2015 09:15:18 +0000 (+0000) Subject: [llvm-pdbdump] Add support for dumping global variables. X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=964a619cadf1642d7f99da03ade50c75286d0500;p=oota-llvm.git [llvm-pdbdump] Add support for dumping global variables. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@230744 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/test/DebugInfo/PDB/Inputs/symbolformat.cpp b/test/DebugInfo/PDB/Inputs/symbolformat.cpp index 237913e7221..5479b717cd9 100644 --- a/test/DebugInfo/PDB/Inputs/symbolformat.cpp +++ b/test/DebugInfo/PDB/Inputs/symbolformat.cpp @@ -55,6 +55,9 @@ struct MemberTest { typedef int IntType; typedef A ClassAType; +int g_global_int; +void *g_global_pointer = nullptr; + int main(int argc, char **argv) { // Force symbol references so the linker generates debug info B b; diff --git a/test/DebugInfo/PDB/Inputs/symbolformat.pdb b/test/DebugInfo/PDB/Inputs/symbolformat.pdb index 28832d4090f..53d8a1b31a3 100644 Binary files a/test/DebugInfo/PDB/Inputs/symbolformat.pdb and b/test/DebugInfo/PDB/Inputs/symbolformat.pdb differ diff --git a/test/DebugInfo/PDB/pdbdump-flags.test b/test/DebugInfo/PDB/pdbdump-flags.test index d8d38cb705e..badbf0784b5 100644 --- a/test/DebugInfo/PDB/pdbdump-flags.test +++ b/test/DebugInfo/PDB/pdbdump-flags.test @@ -1,32 +1,40 @@ ; 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 +; RUN: llvm-pdbdump -types -compilands %p/Inputs/empty.pdb | FileCheck %s -check-prefix=MULTIPLE ; 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 +; NO_ARGS-NOT: ---TYPES--- +; NO_ARGS-NOT: ---COMPILANDS--- +; NO_ARGS-NOT: ---GLOBALS--- +; NO_ARGS-NOT: ---SYMBOLS--- -; Check that only symbols are dumped when only -types is specified. +; Check that only types 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 +; TYPES: ---TYPES--- +; TYPES-NOT: ---COMPILANDS--- +; TYPES-NOT: ---GLOBALS--- +; TYPES-NOT: ---SYMBOLS--- ; 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 +; COMPILANDS: ---COMPILANDS--- +; COMPILANDS-NOT: ---TYPES--- +; COMPILANDS-NOT: ---GLOBALS--- +; COMPILANDS-NOT: ---SYMBOLS--- ; 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 +; MULTIPLE: empty.pdb +; MULTIPLE: Guid: {0B355641-86A0-A249-896F-9988FAE52FF0} +; MULTIPLE: Attributes: HasPrivateSymbols +; MULTIPLE: ---COMPILANDS--- +; MULTIPLE: ---TYPES--- +; MULTIPLE-NOT: ---GLOBALS--- +; MULTIPLE-NOT: ---SYMBOLS--- diff --git a/test/DebugInfo/PDB/pdbdump-symbol-format.test b/test/DebugInfo/PDB/pdbdump-symbol-format.test index 5ed65642b7f..a34d46d8db6 100644 --- a/test/DebugInfo/PDB/pdbdump-symbol-format.test +++ b/test/DebugInfo/PDB/pdbdump-symbol-format.test @@ -1,8 +1,10 @@ ; 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 ; RUN: llvm-pdbdump -types -class-definitions %p/Inputs/symbolformat.pdb | FileCheck --check-prefix=FULL_CLASS %s +; RUN: llvm-pdbdump -globals %p/Inputs/symbolformat.pdb | FileCheck --check-prefix=GLOBALS %s ; The format is func [0x+ - 0x-] +; SYM_FORMAT: ---SYMBOLS--- ; SYM_FORMAT: symbolformat-fpo.obj ; SYM_FORMAT-DAG: func [{{.*}}] (FPO) unsigned __cdecl fpo_func(unsigned n) ; SYM_FORMAT: symbolformat.obj @@ -15,20 +17,10 @@ ; SYM_FORMAT-DAG: func [{{.*}}] (EBP) void A::RegularFunc() ; SYM_FORMAT-DAG: func [{{.*}}] (EBP) virtual void A::VirtualFunc() +; TYPES_FORMAT: ---TYPES--- ; TYPES_FORMAT: Enums ; TYPES_FORMAT-DAG: enum TestEnum ; TYPES_FORMAT-DAG: enum TestEnumClass -; TYPES_FORMAT: Function Signatures -; TYPES_FORMAT-DAG: int __cdecl () -; TYPES_FORMAT-DAG: int __cdecl (int, char**) -; TYPES_FORMAT-DAG: void (A::)() -; TYPES_FORMAT-DAG: void (B::)() -; TYPES_FORMAT-DAG: void (B::)(B&) -; TYPES_FORMAT-DAG: void (B::)() -; TYPES_FORMAT-DAG: B& (B::)(B&) -; TYPES_FORMAT-DAG: void (A::)(A&) -; TYPES_FORMAT-DAG: void (A::)() -; TYPES_FORMAT-DAG: A& (A::)(A&) ; TYPES_FORMAT: Typedefs ; TYPES_FORMAT-DAG: typedef int IntType ; TYPES_FORMAT-DAG: typedef class A ClassAType @@ -36,6 +28,7 @@ ; TYPES_FORMAT-DAG: class A ; TYPES_FORMAT-DAG: class B +; FULL_CLASS: ---TYPES--- ; FULL_CLASS: Classes ; FULL_CLASS-DAG: class A { ; FULL_CLASS: public: @@ -58,4 +51,9 @@ ; FULL_CLASS: data +0x30 float m_float ; FULL_CLASS: data +0x38 double m_double ; FULL_CLASS: data +0x40 void (__cdecl *m_pfn_2_args)(int, double) -; FULL_CLASS: } \ No newline at end of file +; FULL_CLASS: } + +; GLOBALS: ---GLOBALS--- +; GLOBALS-DAG: func [{{.*}}] (FPO) unsigned __cdecl fpo_func(unsigned n) +; GLOBALS-DAG: data [{{.*}}] static void* g_global_pointer +; GLOBALS-DAG: data [{{.*}}] static int g_global_int diff --git a/tools/llvm-pdbdump/TypeDumper.cpp b/tools/llvm-pdbdump/TypeDumper.cpp index 7b705961441..d0df9fec7ba 100644 --- a/tools/llvm-pdbdump/TypeDumper.cpp +++ b/tools/llvm-pdbdump/TypeDumper.cpp @@ -10,14 +10,12 @@ #include "TypeDumper.h" #include "ClassDefinitionDumper.h" -#include "FunctionDumper.h" #include "llvm-pdbdump.h" #include "TypedefDumper.h" #include "llvm/DebugInfo/PDB/IPDBSession.h" #include "llvm/DebugInfo/PDB/PDBSymbolExe.h" #include "llvm/DebugInfo/PDB/PDBSymbolTypeEnum.h" -#include "llvm/DebugInfo/PDB/PDBSymbolTypeFunctionSig.h" #include "llvm/DebugInfo/PDB/PDBSymbolTypeTypedef.h" #include "llvm/DebugInfo/PDB/PDBSymbolTypeUDT.h" @@ -32,12 +30,6 @@ void TypeDumper::start(const PDBSymbolExe &Exe, raw_ostream &OS, int Indent) { while (auto Enum = Enums->getNext()) Enum->dump(OS, Indent + 2, *this); - auto FuncSigs = Exe.findAllChildren(); - OS << newline(Indent); - OS << "Function Signatures: (" << FuncSigs->getChildCount() << " items)"; - while (auto Sig = FuncSigs->getNext()) - Sig->dump(OS, Indent + 2, *this); - auto Typedefs = Exe.findAllChildren(); OS << newline(Indent) << "Typedefs: (" << Typedefs->getChildCount() << " items)"; @@ -62,15 +54,6 @@ void TypeDumper::dump(const PDBSymbolTypeEnum &Symbol, raw_ostream &OS, OS << "enum " << Symbol.getName(); } -void TypeDumper::dump(const PDBSymbolTypeFunctionSig &Symbol, raw_ostream &OS, - int Indent) { - if (!InlineDump) - OS << newline(Indent); - - FunctionDumper Dumper; - Dumper.start(Symbol, nullptr, FunctionDumper::PointerType::None, OS); -} - void TypeDumper::dump(const PDBSymbolTypeTypedef &Symbol, raw_ostream &OS, int Indent) { if (!InlineDump) diff --git a/tools/llvm-pdbdump/TypeDumper.h b/tools/llvm-pdbdump/TypeDumper.h index d96c24c87fa..93e492429ff 100644 --- a/tools/llvm-pdbdump/TypeDumper.h +++ b/tools/llvm-pdbdump/TypeDumper.h @@ -22,8 +22,6 @@ public: void dump(const PDBSymbolTypeEnum &Symbol, raw_ostream &OS, int Indent) override; - void dump(const PDBSymbolTypeFunctionSig &Symbol, raw_ostream &OS, - int Indent) override; void dump(const PDBSymbolTypeTypedef &Symbol, raw_ostream &OS, int Indent) override; void dump(const PDBSymbolTypeUDT &Symbol, raw_ostream &OS, diff --git a/tools/llvm-pdbdump/llvm-pdbdump.cpp b/tools/llvm-pdbdump/llvm-pdbdump.cpp index e33e71562d3..e8a105d35d2 100644 --- a/tools/llvm-pdbdump/llvm-pdbdump.cpp +++ b/tools/llvm-pdbdump/llvm-pdbdump.cpp @@ -15,7 +15,9 @@ #include "llvm-pdbdump.h" #include "CompilandDumper.h" +#include "FunctionDumper.h" #include "TypeDumper.h" +#include "VariableDumper.h" #include "llvm/ADT/ArrayRef.h" #include "llvm/ADT/StringExtras.h" @@ -25,7 +27,10 @@ #include "llvm/DebugInfo/PDB/IPDBSession.h" #include "llvm/DebugInfo/PDB/PDB.h" #include "llvm/DebugInfo/PDB/PDBSymbolCompiland.h" +#include "llvm/DebugInfo/PDB/PDBSymbolData.h" #include "llvm/DebugInfo/PDB/PDBSymbolExe.h" +#include "llvm/DebugInfo/PDB/PDBSymbolFunc.h" +#include "llvm/DebugInfo/PDB/PDBSymbolThunk.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/ConvertUTF.h" #include "llvm/Support/FileSystem.h" @@ -50,12 +55,13 @@ cl::list InputFilenames(cl::Positional, cl::desc(""), cl::OneOrMore); -cl::opt DumpCompilands("compilands", cl::desc("Display compilands")); -cl::opt DumpSymbols("symbols", - cl::desc("Display symbols (implies --compilands")); -cl::opt DumpTypes("types", cl::desc("Display types")); -cl::opt DumpClassDefs("class-definitions", - cl::desc("Display full class definitions")); +cl::opt Compilands("compilands", cl::desc("Display compilands")); +cl::opt Symbols("symbols", + cl::desc("Display symbols for each compiland")); +cl::opt Globals("globals", cl::desc("Dump global symbols")); +cl::opt Types("types", cl::desc("Display types")); +cl::opt ClassDefs("class-definitions", + cl::desc("Display full class definitions")); } static void dumpInput(StringRef Path) { @@ -85,18 +91,48 @@ static void dumpInput(StringRef Path) { if (GlobalScope->hasPrivateSymbols()) outs() << "HasPrivateSymbols "; - if (opts::DumpTypes) { - outs() << "\nDumping types"; - TypeDumper Dumper(false, opts::DumpClassDefs); + if (opts::Compilands) { + outs() << "\n---COMPILANDS---"; + auto Compilands = GlobalScope->findAllChildren(); + CompilandDumper Dumper; + while (auto Compiland = Compilands->getNext()) + Dumper.start(*Compiland, outs(), 2, false); + } + + if (opts::Types) { + outs() << "\n---TYPES---"; + TypeDumper Dumper(false, opts::ClassDefs); Dumper.start(*GlobalScope, outs(), 2); } - if (opts::DumpSymbols || opts::DumpCompilands) { - outs() << "\nDumping compilands"; + if (opts::Symbols) { + outs() << "\n---SYMBOLS---"; auto Compilands = GlobalScope->findAllChildren(); CompilandDumper Dumper; while (auto Compiland = Compilands->getNext()) - Dumper.start(*Compiland, outs(), 2, opts::DumpSymbols); + Dumper.start(*Compiland, outs(), 2, true); + } + + if (opts::Globals) { + outs() << "\n---GLOBALS---"; + { + FunctionDumper Dumper; + auto Functions = GlobalScope->findAllChildren(); + while (auto Function = Functions->getNext()) + Dumper.start(*Function, FunctionDumper::PointerType::None, outs(), 2); + } + { + auto Vars = GlobalScope->findAllChildren(); + VariableDumper Dumper; + while (auto Var = Vars->getNext()) + Dumper.start(*Var, outs(), 2); + } + { + auto Thunks = GlobalScope->findAllChildren(); + CompilandDumper Dumper; + while (auto Thunk = Thunks->getNext()) + Dumper.dump(*Thunk, outs(), 2); + } } outs().flush(); }