dwarfdump: Added macro support to llvm-dwarfdump tool.

Added "macro" option to "-debug-dump" flag, which trigger parsing and dumping of the ".debug_macinfo" section.

Differential Revision: http://reviews.llvm.org/D14294

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@252866 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/DebugInfo/DIContext.h b/include/llvm/DebugInfo/DIContext.h
index eff0e3e6786c6f90ad9294c6055cb2f094f2d274..6659a97a042bbcc13a7d88d5b95155587d3b3ba7 100644 (file)
--- a/include/llvm/DebugInfo/DIContext.h
+++ b/include/llvm/DebugInfo/DIContext.h
@@ -112,6 +112,7 @@ enum DIDumpType {
   DIDT_LineDwo,
   DIDT_Loc,
   DIDT_LocDwo,
+  DIDT_Macro,
   DIDT_Ranges,
   DIDT_Pubnames,
   DIDT_Pubtypes,

diff --git a/include/llvm/DebugInfo/DWARF/DWARFContext.h b/include/llvm/DebugInfo/DWARF/DWARFContext.h
index 66204d7443ecdcdd50e1584986224dfba8101b4c..32beeea45d6530d1ca812c872aa988b163f54e57 100644 (file)
--- a/include/llvm/DebugInfo/DWARF/DWARFContext.h
+++ b/include/llvm/DebugInfo/DWARF/DWARFContext.h
@@ -18,6 +18,7 @@
 #include "llvm/DebugInfo/DWARF/DWARFDebugFrame.h"
 #include "llvm/DebugInfo/DWARF/DWARFDebugLine.h"
 #include "llvm/DebugInfo/DWARF/DWARFDebugLoc.h"
+#include "llvm/DebugInfo/DWARF/DWARFDebugMacro.h"
 #include "llvm/DebugInfo/DWARF/DWARFDebugRangeList.h"
 #include "llvm/DebugInfo/DWARF/DWARFSection.h"
 #include "llvm/DebugInfo/DWARF/DWARFTypeUnit.h"
@@ -45,6 +46,7 @@ class DWARFContext : public DIContext {
   std::unique_ptr<DWARFDebugAranges> Aranges;
   std::unique_ptr<DWARFDebugLine> Line;
   std::unique_ptr<DWARFDebugFrame> DebugFrame;
+  std::unique_ptr<DWARFDebugMacro> Macro;
 
   DWARFUnitSection<DWARFCompileUnit> DWOCUs;
   std::vector<DWARFUnitSection<DWARFTypeUnit>> DWOTUs;
@@ -161,6 +163,9 @@ public:
   /// Get a pointer to the parsed frame information object.
   const DWARFDebugFrame *getDebugFrame();
 
+  /// Get a pointer to the parsed DebugMacro object.
+  const DWARFDebugMacro *getDebugMacro();
+
   /// Get a pointer to a parsed line table corresponding to a compile unit.
   const DWARFDebugLine::LineTable *getLineTableForUnit(DWARFUnit *cu);
 
@@ -184,6 +189,7 @@ public:
   virtual const DWARFSection &getLineSection() = 0;
   virtual StringRef getStringSection() = 0;
   virtual StringRef getRangeSection() = 0;
+  virtual StringRef getMacinfoSection() = 0;
   virtual StringRef getPubNamesSection() = 0;
   virtual StringRef getPubTypesSection() = 0;
   virtual StringRef getGnuPubNamesSection() = 0;
@@ -234,6 +240,7 @@ class DWARFContextInMemory : public DWARFContext {
   DWARFSection LineSection;
   StringRef StringSection;
   StringRef RangeSection;
+  StringRef MacinfoSection;
   StringRef PubNamesSection;
   StringRef PubTypesSection;
   StringRef GnuPubNamesSection;
@@ -272,6 +279,7 @@ public:
   const DWARFSection &getLineSection() override { return LineSection; }
   StringRef getStringSection() override { return StringSection; }
   StringRef getRangeSection() override { return RangeSection; }
+  StringRef getMacinfoSection() override { return MacinfoSection; }
   StringRef getPubNamesSection() override { return PubNamesSection; }
   StringRef getPubTypesSection() override { return PubTypesSection; }
   StringRef getGnuPubNamesSection() override { return GnuPubNamesSection; }

diff --git a/include/llvm/DebugInfo/DWARF/DWARFDebugMacro.h b/include/llvm/DebugInfo/DWARF/DWARFDebugMacro.h
new file mode 100644 (file)
index 0000000..f791096
--- /dev/null
+++ b/include/llvm/DebugInfo/DWARF/DWARFDebugMacro.h
@@ -0,0 +1,59 @@
+//===-- DWARFDebugMacro.h ---------------------------------------*- C++ -*-===//\r
+//\r
+//                     The LLVM Compiler Infrastructure\r
+//\r
+// This file is distributed under the University of Illinois Open Source\r
+// License. See LICENSE.TXT for details.\r
+//\r
+//===----------------------------------------------------------------------===//\r
+\r
+#ifndef LLVM_DEBUGINFO_DWARF_DWARFDEBUGMACRO_H\r
+#define LLVM_DEBUGINFO_DWARF_DWARFDEBUGMACRO_H\r
+\r
+#include "llvm/ADT/SmallVector.h"\r
+#include "llvm/ADT/StringRef.h"\r
+#include "llvm/Support/DataExtractor.h"\r
+#include "llvm/Support/Dwarf.h"\r
+\r
+namespace llvm {\r
+\r
+class raw_ostream;\r
+\r
+class DWARFDebugMacro {\r
+  /// A single macro entry within a macro list.\r
+  struct Entry {\r
+    /// The type of the macro entry.\r
+    uint32_t Type;\r
+    union {\r
+      /// The source line where the macro is defined.\r
+      uint64_t Line;\r
+      /// Vendor extension constant value.\r
+      uint64_t ExtConstant;\r
+    };\r
+\r
+    union {\r
+      /// The string (name, value) of the macro entry.\r
+      const char *MacroStr;\r
+      // An unsigned integer indicating the identity of the source file.\r
+      uint64_t File;\r
+      /// Vendor extension string.\r
+      const char *ExtStr;\r
+    };\r
+  };\r
+\r
+  typedef SmallVector<Entry, 4> MacroList;\r
+\r
+  /// A list of all the macro entries in the debug_macinfo section.\r
+  MacroList Macros;\r
+\r
+public:\r
+  DWARFDebugMacro() {}\r
+  /// Print the macro list found within the debug_macinfo section.\r
+  void dump(raw_ostream &OS) const;\r
+  /// Parse the debug_macinfo section accessible via the 'data' parameter.\r
+  void parse(DataExtractor data);\r
+};\r
+\r
+}\r
+\r
+#endif\r

diff --git a/include/llvm/Support/Dwarf.h b/include/llvm/Support/Dwarf.h
index b30aa80bbe304de33d84aa30be0c32ae424a2c33..8d71353b16705dd3fb6797b29b9266ad73c2fc7a 100644 (file)
--- a/include/llvm/Support/Dwarf.h
+++ b/include/llvm/Support/Dwarf.h
@@ -40,6 +40,7 @@ enum LLVMConstants : uint32_t {
   // LLVM mock tags (see also llvm/Support/Dwarf.def).
   DW_TAG_invalid = ~0U,        // Tag for invalid results.
   DW_VIRTUALITY_invalid = ~0U, // Virtuality for invalid results.
+  DW_MACINFO_invalid = ~0U,    // Macinfo type for invalid results.
 
   // Other constants.
   DWARF_VERSION = 4,       // Default dwarf version we output.

diff --git a/lib/DebugInfo/DWARF/CMakeLists.txt b/lib/DebugInfo/DWARF/CMakeLists.txt
index b3df0422acf5d3cddd8e0253942103b778124b5e..7104c5f10391b68c677c27251e8e444808913759 100644 (file)
--- a/lib/DebugInfo/DWARF/CMakeLists.txt
+++ b/lib/DebugInfo/DWARF/CMakeLists.txt
@@ -10,6 +10,7 @@ add_llvm_library(LLVMDebugInfoDWARF
   DWARFDebugInfoEntry.cpp
   DWARFDebugLine.cpp
   DWARFDebugLoc.cpp
+  DWARFDebugMacro.cpp
   DWARFDebugRangeList.cpp
   DWARFFormValue.cpp
   DWARFTypeUnit.cpp

diff --git a/lib/DebugInfo/DWARF/DWARFContext.cpp b/lib/DebugInfo/DWARF/DWARFContext.cpp
index ac92a632b581111e27470e5c26073984c92905f8..f462485173705a9de06de3e0eaf48dc92275489c 100644 (file)
--- a/lib/DebugInfo/DWARF/DWARFContext.cpp
+++ b/lib/DebugInfo/DWARF/DWARFContext.cpp
@@ -127,6 +127,11 @@ void DWARFContext::dump(raw_ostream &OS, DIDumpType DumpType) {
     getDebugFrame()->dump(OS);
   }
 
+  if (DumpType == DIDT_All || DumpType == DIDT_Macro) {
+    OS << "\n.debug_macinfo contents:\n";
+    getDebugMacro()->dump(OS);
+  }
+
   uint32_t offset = 0;
   if (DumpType == DIDT_All || DumpType == DIDT_Aranges) {
     OS << "\n.debug_aranges contents:\n";
@@ -341,6 +346,16 @@ const DWARFDebugFrame *DWARFContext::getDebugFrame() {
   return DebugFrame.get();
 }
 
+const DWARFDebugMacro *DWARFContext::getDebugMacro() {
+  if (Macro)
+    return Macro.get();
+
+  DataExtractor MacinfoData(getMacinfoSection(), isLittleEndian(), 0);
+  Macro.reset(new DWARFDebugMacro());
+  Macro->parse(MacinfoData);
+  return Macro.get();
+}
+
 const DWARFLineTable *
 DWARFContext::getLineTableForUnit(DWARFUnit *U) {
   if (!Line)
@@ -611,6 +626,7 @@ DWARFContextInMemory::DWARFContextInMemory(const object::ObjectFile &Obj,
             .Case("debug_frame", &DebugFrameSection)
             .Case("debug_str", &StringSection)
             .Case("debug_ranges", &RangeSection)
+            .Case("debug_macinfo", &MacinfoSection)
             .Case("debug_pubnames", &PubNamesSection)
             .Case("debug_pubtypes", &PubTypesSection)
             .Case("debug_gnu_pubnames", &GnuPubNamesSection)

diff --git a/lib/DebugInfo/DWARF/DWARFDebugMacro.cpp b/lib/DebugInfo/DWARF/DWARFDebugMacro.cpp
new file mode 100644 (file)
index 0000000..b6555fa
--- /dev/null
+++ b/lib/DebugInfo/DWARF/DWARFDebugMacro.cpp
@@ -0,0 +1,103 @@
+//===-- DWARFDebugMacro.cpp -----------------------------------------------===//\r
+//\r
+//                     The LLVM Compiler Infrastructure\r
+//\r
+// This file is distributed under the University of Illinois Open Source\r
+// License. See LICENSE.TXT for details.\r
+//\r
+//===----------------------------------------------------------------------===//\r
+\r
+#include "SyntaxHighlighting.h"\r
+#include "llvm/DebugInfo/DWARF/DWARFDebugMacro.h"\r
+#include "llvm/Support/Compiler.h"\r
+#include "llvm/Support/Dwarf.h"\r
+#include "llvm/Support/Format.h"\r
+#include "llvm/Support/raw_ostream.h"\r
+\r
+using namespace llvm;\r
+using namespace dwarf;\r
+using namespace syntax;\r
+\r
+void DWARFDebugMacro::dump(raw_ostream &OS) const {\r
+  unsigned IndLevel = 0;\r
+  for (const Entry &E : Macros) {\r
+    // There should not be DW_MACINFO_end_file when IndLevel is Zero. However,\r
+    // this check handles the case of corrupted ".debug_macinfo" section.\r
+    if (IndLevel > 0)\r
+      IndLevel -= (E.Type == DW_MACINFO_end_file);\r
+    // Print indentation.\r
+    for (unsigned I = 0; I < IndLevel; I++)\r
+      OS << "  ";\r
+    IndLevel += (E.Type == DW_MACINFO_start_file);\r
+\r
+    WithColor(OS, syntax::Macro).get() << MacinfoString(E.Type);\r
+    switch (E.Type) {\r
+    default:\r
+      // Got a corrupted ".debug_macinfo" section (invalid macinfo type).\r
+      break;\r
+    case DW_MACINFO_define:\r
+    case DW_MACINFO_undef:\r
+      OS << " - lineno: " << E.Line;\r
+      OS << " macro: " << E.MacroStr;\r
+      break;\r
+    case DW_MACINFO_start_file:\r
+      OS << " - lineno: " << E.Line;\r
+      OS << " filenum: " << E.File;\r
+      break;\r
+    case DW_MACINFO_end_file:\r
+      break;\r
+    case DW_MACINFO_vendor_ext:\r
+      OS << " - constant: " << E.ExtConstant;\r
+      OS << " string: " << E.ExtStr;\r
+      break;\r
+    }\r
+    OS << "\n";\r
+  }\r
+}\r
+\r
+void DWARFDebugMacro::parse(DataExtractor data) {\r
+  uint32_t Offset = 0;\r
+  while (data.isValidOffset(Offset)) {\r
+    // A macro list entry consists of:\r
+    Entry E;\r
+    // 1. Macinfo type\r
+    E.Type = data.getULEB128(&Offset);\r
+\r
+    if (E.Type == 0) {\r
+      // Reached end of ".debug_macinfo" section.\r
+      return;\r
+    }\r
+\r
+    switch (E.Type) {\r
+    default:\r
+      // Got a corrupted ".debug_macinfo" section (invalid macinfo type).\r
+      // Push the corrupted entry to the list and halt parsing.\r
+      E.Type = DW_MACINFO_invalid;\r
+      Macros.push_back(E);\r
+      return;\r
+    case DW_MACINFO_define:\r
+    case DW_MACINFO_undef:\r
+      // 2. Source line\r
+      E.Line = data.getULEB128(&Offset);\r
+      // 3. Macro string\r
+      E.MacroStr = data.getCStr(&Offset);\r
+      break;\r
+    case DW_MACINFO_start_file:\r
+      // 2. Source line\r
+      E.Line = data.getULEB128(&Offset);\r
+      // 3. Source file id\r
+      E.File = data.getULEB128(&Offset);\r
+      break;\r
+    case DW_MACINFO_end_file:\r
+      break;\r
+    case DW_MACINFO_vendor_ext:\r
+      // 2. Vendor extension constant\r
+      E.ExtConstant = data.getULEB128(&Offset);\r
+      // 3. Vendor extension string\r
+      E.ExtStr = data.getCStr(&Offset);\r
+      break;\r
+    }\r
+\r
+    Macros.push_back(E);\r
+  }\r
+}\r

diff --git a/lib/DebugInfo/DWARF/SyntaxHighlighting.cpp b/lib/DebugInfo/DWARF/SyntaxHighlighting.cpp
index a6b4c6549ca499ab770aaa7d05147fde0e915524..4f561d062b12c7bb1ea4e9ac6bd03531c757ff12 100644 (file)
--- a/lib/DebugInfo/DWARF/SyntaxHighlighting.cpp
+++ b/lib/DebugInfo/DWARF/SyntaxHighlighting.cpp
@@ -27,6 +27,7 @@ WithColor::WithColor(llvm::raw_ostream &OS, enum HighlightColor Type) : OS(OS) {
     case Tag:        OS.changeColor(llvm::raw_ostream::BLUE);    break;
     case Attribute:  OS.changeColor(llvm::raw_ostream::CYAN);    break;
     case Enumerator: OS.changeColor(llvm::raw_ostream::MAGENTA); break;
+    case Macro:      OS.changeColor(llvm::raw_ostream::RED);     break;
     }
   }
 }

diff --git a/lib/DebugInfo/DWARF/SyntaxHighlighting.h b/lib/DebugInfo/DWARF/SyntaxHighlighting.h
index 946a31308aa1c1d76ba6a1a6aa438e5263b40c60..16e68351d5e181e00599ce8c2ffcc53bbbe8dc0a 100644 (file)
--- a/lib/DebugInfo/DWARF/SyntaxHighlighting.h
+++ b/lib/DebugInfo/DWARF/SyntaxHighlighting.h
@@ -17,7 +17,7 @@ namespace dwarf {
 namespace syntax {
 
 // Symbolic names for various syntax elements.
-enum HighlightColor { Address, String, Tag, Attribute, Enumerator };
+enum HighlightColor { Address, String, Tag, Attribute, Enumerator, Macro };
 
 /// An RAII object that temporarily switches an output stream to a
 /// specific color.

diff --git a/lib/Support/Dwarf.cpp b/lib/Support/Dwarf.cpp
index 5764e458f2bb2ac8fe508ca221ddcfbdc3b5f171..dd740384de3860d7e48d8edcbc407184899a26ab 100644 (file)
--- a/lib/Support/Dwarf.cpp
+++ b/lib/Support/Dwarf.cpp
@@ -468,6 +468,7 @@ const char *llvm::dwarf::MacinfoString(unsigned Encoding) {
   case DW_MACINFO_start_file:            return "DW_MACINFO_start_file";
   case DW_MACINFO_end_file:              return "DW_MACINFO_end_file";
   case DW_MACINFO_vendor_ext:            return "DW_MACINFO_vendor_ext";
+  case DW_MACINFO_invalid:               return "DW_MACINFO_invalid";
   }
   return nullptr;
 }

diff --git a/test/DebugInfo/Inputs/dwarfdump-macro-cmd.h b/test/DebugInfo/Inputs/dwarfdump-macro-cmd.h
new file mode 100644 (file)
index 0000000..1209f66
--- /dev/null
+++ b/test/DebugInfo/Inputs/dwarfdump-macro-cmd.h
@@ -0,0 +1 @@
+#define M4 Value4\r

diff --git a/test/DebugInfo/Inputs/dwarfdump-macro.cc b/test/DebugInfo/Inputs/dwarfdump-macro.cc
new file mode 100644 (file)
index 0000000..42b2c6a
--- /dev/null
+++ b/test/DebugInfo/Inputs/dwarfdump-macro.cc
@@ -0,0 +1,11 @@
+#define M1 Value1\r
+#include "dwarfdump-macro.h"\r
+#define M2(x, y)   ((x)+(y)* Value2)\r
+\r
+// Built with GCC\r
+// $ mkdir -p /tmp/dbginfo\r
+// $ cp dwarfdump-macro.cc /tmp/dbginfo\r
+// $ cp dwarfdump-macro.h /tmp/dbginfo\r
+// $ cp dwarfdump-macro-cmd.h /tmp/dbginfo\r
+// $ cd /tmp/dbginfo\r
+// $ g++ -c -g3 -O0 -DM3=Value3 -include dwarfdump-macro-cmd.h dwarfdump-macro.cc -o <output>\r

diff --git a/test/DebugInfo/Inputs/dwarfdump-macro.h b/test/DebugInfo/Inputs/dwarfdump-macro.h
new file mode 100644 (file)
index 0000000..75b35f0
--- /dev/null
+++ b/test/DebugInfo/Inputs/dwarfdump-macro.h
@@ -0,0 +1,5 @@
+\r
+\r
+\r
+#undef M1\r
+#define M1 NewValue1\r

diff --git a/test/DebugInfo/Inputs/dwarfdump-macro.o b/test/DebugInfo/Inputs/dwarfdump-macro.o
new file mode 100644 (file)
index 0000000..5f1cb5e
Binary files /dev/null and b/test/DebugInfo/Inputs/dwarfdump-macro.o differ

diff --git a/test/DebugInfo/debugmacinfo.test b/test/DebugInfo/debugmacinfo.test
new file mode 100644 (file)
index 0000000..3f95169
--- /dev/null
+++ b/test/DebugInfo/debugmacinfo.test
@@ -0,0 +1,27 @@
+RUN: llvm-dwarfdump -debug-dump=macro %p/Inputs/dwarfdump-macro.o \\r
+RUN:   | FileCheck %s -check-prefix TEST_MACINFO\r
+RUN: llvm-dwarfdump -debug-dump=line %p/Inputs/dwarfdump-macro.o \\r
+RUN:   | FileCheck %s -check-prefix TEST_LINE\r
+\r
+\r
+; This test verifies that llvm-dwarfdump tools know how to read .debug_macinfo\r
+; section. It also checks that the file numbers fits with those in the\r
+; .debug_line section.\r
+TEST_MACINFO: .debug_macinfo contents:\r
+TEST_MACINFO: DW_MACINFO_define - lineno: 0 macro: M3 Value3\r
+TEST_MACINFO: DW_MACINFO_start_file - lineno: 0 filenum: 1\r
+TEST_MACINFO:   DW_MACINFO_start_file - lineno: 0 filenum: 2\r
+TEST_MACINFO:     DW_MACINFO_define - lineno: 1 macro: M4 Value4\r
+TEST_MACINFO:   DW_MACINFO_end_file\r
+TEST_MACINFO:   DW_MACINFO_define - lineno: 1 macro: M1 Value1\r
+TEST_MACINFO:   DW_MACINFO_start_file - lineno: 2 filenum: 3\r
+TEST_MACINFO:     DW_MACINFO_undef - lineno: 4 macro: M1\r
+TEST_MACINFO:     DW_MACINFO_define - lineno: 5 macro: M1 NewValue1\r
+TEST_MACINFO:   DW_MACINFO_end_file\r
+TEST_MACINFO:   DW_MACINFO_define - lineno: 3 macro: M2(x,y) ((x)+(y)* Value2)\r
+TEST_MACINFO: DW_MACINFO_end_file\r
+\r
+TEST_LINE: .debug_line contents:\r
+TEST_LINE: file_names[  1]    0 0x00000000 0x00000000 dwarfdump-macro.cc\r
+TEST_LINE: file_names[  2]    1 0x00000000 0x00000000 dwarfdump-macro-cmd.h\r
+TEST_LINE: file_names[  3]    0 0x00000000 0x00000000 dwarfdump-macro.h\r

diff --git a/tools/llvm-dwarfdump/llvm-dwarfdump.cpp b/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
index 4352c15f336be80f62b0e20f041f0c17f21dad29..d742eb3ec342f285018e2abcb183c288d9234328 100644 (file)
--- a/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
+++ b/tools/llvm-dwarfdump/llvm-dwarfdump.cpp
@@ -60,6 +60,7 @@ static cl::opt<DIDumpType> DumpType(
         clEnumValN(DIDT_Loc, "loc", ".debug_loc"),
         clEnumValN(DIDT_LocDwo, "loc.dwo", ".debug_loc.dwo"),
         clEnumValN(DIDT_Frames, "frames", ".debug_frame"),
+        clEnumValN(DIDT_Macro, "macro", ".debug_macinfo"),
         clEnumValN(DIDT_Ranges, "ranges", ".debug_ranges"),
         clEnumValN(DIDT_Pubnames, "pubnames", ".debug_pubnames"),
         clEnumValN(DIDT_Pubtypes, "pubtypes", ".debug_pubtypes"),