From 1d4736e0b10c28221a0d7007d45a1725de7be14a Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Mon, 24 Feb 2014 23:58:54 +0000 Subject: [PATCH] llvm-dwarfdump: Support for debug_line.dwo section for file names for type units under fission. llvm-svn: 202091 --- llvm/include/llvm/DebugInfo/DIContext.h | 1 + llvm/lib/DebugInfo/DWARFContext.cpp | 11 +++++++ llvm/lib/DebugInfo/DWARFContext.h | 3 ++ llvm/lib/DebugInfo/DWARFDebugLine.cpp | 28 ++++++++++-------- llvm/lib/DebugInfo/DWARFDebugLine.h | 8 +++-- .../DebugInfo/Inputs/dwarfdump-line-dwo.cc | 10 +++++++ .../Inputs/dwarfdump-line-dwo.elf-x86-64 | Bin 0 -> 1377 bytes llvm/test/DebugInfo/dwarfdump-line-dwo.test | 6 ++++ llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp | 1 + 9 files changed, 53 insertions(+), 15 deletions(-) create mode 100644 llvm/test/DebugInfo/Inputs/dwarfdump-line-dwo.cc create mode 100644 llvm/test/DebugInfo/Inputs/dwarfdump-line-dwo.elf-x86-64 create mode 100644 llvm/test/DebugInfo/dwarfdump-line-dwo.test diff --git a/llvm/include/llvm/DebugInfo/DIContext.h b/llvm/include/llvm/DebugInfo/DIContext.h index 37f2a260ae61..f04dc001f4b3 100644 --- a/llvm/include/llvm/DebugInfo/DIContext.h +++ b/llvm/include/llvm/DebugInfo/DIContext.h @@ -107,6 +107,7 @@ enum DIDumpType { DIDT_Types, DIDT_TypesDwo, DIDT_Line, + DIDT_LineDwo, DIDT_Loc, DIDT_Ranges, DIDT_Pubnames, diff --git a/llvm/lib/DebugInfo/DWARFContext.cpp b/llvm/lib/DebugInfo/DWARFContext.cpp index b5b75b0408e9..e17387b31d35 100644 --- a/llvm/lib/DebugInfo/DWARFContext.cpp +++ b/llvm/lib/DebugInfo/DWARFContext.cpp @@ -136,6 +136,16 @@ void DWARFContext::dump(raw_ostream &OS, DIDumpType DumpType) { } } + if (DumpType == DIDT_All || DumpType == DIDT_LineDwo) { + OS << "\n.debug_line.dwo contents:\n"; + unsigned stmtOffset = 0; + DataExtractor lineData(getLineDWOSection().Data, isLittleEndian(), + savedAddressByteSize); + DWARFDebugLine::DumpingState state(OS); + while (DWARFDebugLine::parsePrologue(lineData, &stmtOffset, &state.Prologue)) + state.finalize(); + } + if (DumpType == DIDT_All || DumpType == DIDT_Str) { OS << "\n.debug_str contents:\n"; DataExtractor strData(getStringSection(), isLittleEndian(), 0); @@ -645,6 +655,7 @@ DWARFContextInMemory::DWARFContextInMemory(object::ObjectFile *Obj) : .Case("debug_gnu_pubtypes", &GnuPubTypesSection) .Case("debug_info.dwo", &InfoDWOSection.Data) .Case("debug_abbrev.dwo", &AbbrevDWOSection) + .Case("debug_line.dwo", &LineDWOSection.Data) .Case("debug_str.dwo", &StringDWOSection) .Case("debug_str_offsets.dwo", &StringOffsetDWOSection) .Case("debug_addr", &AddrSection) diff --git a/llvm/lib/DebugInfo/DWARFContext.h b/llvm/lib/DebugInfo/DWARFContext.h index 9bac69d6e522..2a534de49dee 100644 --- a/llvm/lib/DebugInfo/DWARFContext.h +++ b/llvm/lib/DebugInfo/DWARFContext.h @@ -166,6 +166,7 @@ public: virtual StringRef getARangeSection() = 0; virtual StringRef getDebugFrameSection() = 0; virtual const Section &getLineSection() = 0; + virtual const Section &getLineDWOSection() = 0; virtual StringRef getStringSection() = 0; virtual StringRef getRangeSection() = 0; virtual StringRef getPubNamesSection() = 0; @@ -208,6 +209,7 @@ class DWARFContextInMemory : public DWARFContext { StringRef ARangeSection; StringRef DebugFrameSection; Section LineSection; + Section LineDWOSection; StringRef StringSection; StringRef RangeSection; StringRef PubNamesSection; @@ -238,6 +240,7 @@ public: virtual StringRef getARangeSection() { return ARangeSection; } virtual StringRef getDebugFrameSection() { return DebugFrameSection; } virtual const Section &getLineSection() { return LineSection; } + virtual const Section &getLineDWOSection() { return LineDWOSection; } virtual StringRef getStringSection() { return StringSection; } virtual StringRef getRangeSection() { return RangeSection; } virtual StringRef getPubNamesSection() { return PubNamesSection; } diff --git a/llvm/lib/DebugInfo/DWARFDebugLine.cpp b/llvm/lib/DebugInfo/DWARFDebugLine.cpp index b2c8502d57fa..83490b1d3ff9 100644 --- a/llvm/lib/DebugInfo/DWARFDebugLine.cpp +++ b/llvm/lib/DebugInfo/DWARFDebugLine.cpp @@ -18,14 +18,15 @@ using namespace dwarf; void DWARFDebugLine::Prologue::dump(raw_ostream &OS) const { OS << "Line table prologue:\n" - << format(" total_length: 0x%8.8x\n", TotalLength) - << format(" version: %u\n", Version) - << format("prologue_length: 0x%8.8x\n", PrologueLength) - << format("min_inst_length: %u\n", MinInstLength) - << format("default_is_stmt: %u\n", DefaultIsStmt) - << format(" line_base: %i\n", LineBase) - << format(" line_range: %u\n", LineRange) - << format(" opcode_base: %u\n", OpcodeBase); + << format(" total_length: 0x%8.8x\n", TotalLength) + << format(" version: %u\n", Version) + << format(" prologue_length: 0x%8.8x\n", PrologueLength) + << format(" min_inst_length: %u\n", MinInstLength) + << format(Version >= 4 ? "max_ops_per_inst: %u\n" : "", MaxOpsPerInst) + << format(" default_is_stmt: %u\n", DefaultIsStmt) + << format(" line_base: %i\n", LineBase) + << format(" line_range: %u\n", LineRange) + << format(" opcode_base: %u\n", OpcodeBase); for (uint32_t i = 0; i < StandardOpcodeLengths.size(); ++i) OS << format("standard_opcode_lengths[%s] = %u\n", LNStandardString(i+1), @@ -172,12 +173,14 @@ DWARFDebugLine::parsePrologue(DataExtractor debug_line_data, prologue->clear(); prologue->TotalLength = debug_line_data.getU32(offset_ptr); prologue->Version = debug_line_data.getU16(offset_ptr); - if (prologue->Version != 2) + if (prologue->Version < 2) return false; prologue->PrologueLength = debug_line_data.getU32(offset_ptr); const uint32_t end_prologue_offset = prologue->PrologueLength + *offset_ptr; prologue->MinInstLength = debug_line_data.getU8(offset_ptr); + if (prologue->Version >= 4) + prologue->MaxOpsPerInst = debug_line_data.getU8(offset_ptr); prologue->DefaultIsStmt = debug_line_data.getU8(offset_ptr); prologue->LineBase = debug_line_data.getU8(offset_ptr); prologue->LineRange = debug_line_data.getU8(offset_ptr); @@ -220,10 +223,9 @@ DWARFDebugLine::parsePrologue(DataExtractor debug_line_data, return true; } -bool -DWARFDebugLine::parseStatementTable(DataExtractor debug_line_data, - const RelocAddrMap *RMap, - uint32_t *offset_ptr, State &state) { +bool DWARFDebugLine::parseStatementTable(DataExtractor debug_line_data, + const RelocAddrMap *RMap, + uint32_t *offset_ptr, State &state) { const uint32_t debug_line_offset = *offset_ptr; Prologue *prologue = &state.Prologue; diff --git a/llvm/lib/DebugInfo/DWARFDebugLine.h b/llvm/lib/DebugInfo/DWARFDebugLine.h index 9e93cc86dd20..88b1aee9228b 100644 --- a/llvm/lib/DebugInfo/DWARFDebugLine.h +++ b/llvm/lib/DebugInfo/DWARFDebugLine.h @@ -34,8 +34,9 @@ public: struct Prologue { Prologue() - : TotalLength(0), Version(0), PrologueLength(0), MinInstLength(0), - DefaultIsStmt(0), LineBase(0), LineRange(0), OpcodeBase(0) {} + : TotalLength(0), Version(0), PrologueLength(0), MinInstLength(0), + MaxOpsPerInst(0), DefaultIsStmt(0), LineBase(0), LineRange(0), + OpcodeBase(0) {} // The size in bytes of the statement information for this compilation unit // (not including the total_length field itself). @@ -49,6 +50,9 @@ public: // program opcodes that alter the address register first multiply their // operands by this value. uint8_t MinInstLength; + // The maximum number of individual operations that may be encoded in an + // instruction. + uint8_t MaxOpsPerInst; // The initial value of theis_stmtregister. uint8_t DefaultIsStmt; // This parameter affects the meaning of the special opcodes. See below. diff --git a/llvm/test/DebugInfo/Inputs/dwarfdump-line-dwo.cc b/llvm/test/DebugInfo/Inputs/dwarfdump-line-dwo.cc new file mode 100644 index 000000000000..2784ae24ee56 --- /dev/null +++ b/llvm/test/DebugInfo/Inputs/dwarfdump-line-dwo.cc @@ -0,0 +1,10 @@ +struct foo { +}; + +foo f; + +// Built with GCC +// $ mkdir -p /tmp/dbginfo +// $ cp dwarfdump-line-dwo.cc /tmp/dbginfo +// $ cd /tmp/dbginfo +// $ g++ -c -fdebug-types-section dwarfdump-line-dwo.cc -o diff --git a/llvm/test/DebugInfo/Inputs/dwarfdump-line-dwo.elf-x86-64 b/llvm/test/DebugInfo/Inputs/dwarfdump-line-dwo.elf-x86-64 new file mode 100644 index 0000000000000000000000000000000000000000..9f1d267dde1e0f1e63af002710a37ac2c3aa5b21 GIT binary patch literal 1377 zcmb`H&ui2`6vtnF=+*|IWyK#9BnOL?HR-l4wN<;W6%|2x5IlHs-AyLj;N}NO)@=`B zSUjnq(0@Wa2;MyT2Y3+_Pl5+eo)x@!&^O8KW|+;xB?-nu zf+iGdOaa#AB5q}23ud7Lr!iJDJ@c2`{_yFm^JNjGr0)NE|4laUey4k~Dq)LL7%{6N zsUZJ&{c)~s4xg#0#<}tz%)KI2wHI5Jxnr1F1!dIKve*+c)*gC*^)+Lyp&Pw8?7Io}$K&XRW0UTnXC!+eiH(?8i5vK^oOt1~-R-%)6MzFw5CE9* zo|kmGxF%7)?u?_XL^~^C;%kAK1Deh2PPZG8hdiMlg4bBE9XL)*l32i*#Lw~{#sbzT z`<=B|?V8X-^qwv9Q{MW3i6tIlEaqP-Sjt=XnP~A4V=;fbU@33?%*1&fVl3w0D_F`~ zXPNN`4-4;v4hoh|AO literal 0 HcmV?d00001 diff --git a/llvm/test/DebugInfo/dwarfdump-line-dwo.test b/llvm/test/DebugInfo/dwarfdump-line-dwo.test new file mode 100644 index 000000000000..3178a5d29922 --- /dev/null +++ b/llvm/test/DebugInfo/dwarfdump-line-dwo.test @@ -0,0 +1,6 @@ +RUN: llvm-dwarfdump %p/Inputs/dwarfdump-line-dwo.elf-x86-64 | FileCheck %s + +CHECK: .debug_line.dwo contents: +CHECK: version: 4 +CHECK: max_ops_per_inst: 1 +CHECK: file_names[ 1]{{.*}}dwarfdump-line-dwo.cc diff --git a/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp b/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp index f827909dc314..103779eafdce 100644 --- a/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp +++ b/llvm/tools/llvm-dwarfdump/llvm-dwarfdump.cpp @@ -65,6 +65,7 @@ DumpType("debug-dump", cl::init(DIDT_All), clEnumValN(DIDT_Types, "types", ".debug_types"), clEnumValN(DIDT_TypesDwo, "types.dwo", ".debug_types.dwo"), clEnumValN(DIDT_Line, "line", ".debug_line"), + clEnumValN(DIDT_LineDwo, "line.dwo", ".debug_line.dwo"), clEnumValN(DIDT_Loc, "loc", ".debug_loc"), clEnumValN(DIDT_Frames, "frames", ".debug_frame"), clEnumValN(DIDT_Ranges, "ranges", ".debug_ranges"),