diff options
Diffstat (limited to 'lldb/source/Plugins/SymbolFile/DWARF')
5 files changed, 2 insertions, 75 deletions
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp index 6d3ff8e3591..07090fa875f 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFCompileUnit.cpp @@ -324,11 +324,8 @@ bool DWARFCompileUnit::Verify(Stream *s) const { bool abbr_offset_OK = m_dwarf2Data->get_debug_abbrev_data().ValidOffset(GetAbbrevOffset()); bool addr_size_OK = ((m_addr_size == 4) || (m_addr_size == 8)); - bool verbose = s->GetVerbose(); if (valid_offset && length_OK && version_OK && addr_size_OK && abbr_offset_OK) { - if (verbose) - s->Printf(" 0x%8.8x: OK\n", m_offset); return true; } else { s->Printf(" 0x%8.8x: ", m_offset); diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp index 9dc656d7932..38494a4c7a5 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfo.cpp @@ -430,10 +430,6 @@ static dw_offset_t DumpCallback(SymbolFileDWARF *dwarf2Data, } else { // See if the DIE is in this compile unit? if (cu && dumpInfo->die_offset < cu->GetNextCompileUnitOffset()) { - // This DIE is in this compile unit! - if (s->GetVerbose()) - cu->Dump(s); // Dump the compile unit for the DIE in verbose mode - return next_offset; // // We found our compile unit that contains our DIE, just skip to // dumping the requested DIE... diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp index a824c4ac6af..239bcb68c5b 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugInfoEntry.cpp @@ -666,13 +666,9 @@ void DWARFDebugInfoEntry::DumpAttribute( SymbolFileDWARF *dwarf2Data, const DWARFCompileUnit *cu, const DWARFDataExtractor &debug_info_data, lldb::offset_t *offset_ptr, Stream &s, dw_attr_t attr, dw_form_t form) { - bool verbose = s.GetVerbose(); bool show_form = s.GetFlags().Test(DWARFDebugInfo::eDumpFlag_ShowForm); - if (verbose) - s.Offset(*offset_ptr); - else - s.Printf(" "); + s.Printf(" "); s.Indent(DW_AT_value_to_name(attr)); if (show_form) { @@ -694,35 +690,18 @@ void DWARFDebugInfoEntry::DumpAttribute( s.PutCString("( "); - // Always dump form value if verbose is enabled - if (verbose) { - form_value.Dump(s); - } - // Check to see if we have any special attribute formatters switch (attr) { case DW_AT_stmt_list: - if (verbose) - s.PutCString(" ( "); s.Printf("0x%8.8" PRIx64, form_value.Unsigned()); - if (verbose) - s.PutCString(" )"); break; case DW_AT_language: - if (verbose) - s.PutCString(" ( "); s.PutCString(DW_LANG_value_to_name(form_value.Unsigned())); - if (verbose) - s.PutCString(" )"); break; case DW_AT_encoding: - if (verbose) - s.PutCString(" ( "); s.PutCString(DW_ATE_value_to_name(form_value.Unsigned())); - if (verbose) - s.PutCString(" )"); break; case DW_AT_frame_base: @@ -730,32 +709,20 @@ void DWARFDebugInfoEntry::DumpAttribute( case DW_AT_data_member_location: { const uint8_t *blockData = form_value.BlockData(); if (blockData) { - if (!verbose) - form_value.Dump(s); - // Location description is inlined in data in the form value DWARFDataExtractor locationData(debug_info_data, (*offset_ptr) - form_value.Unsigned(), form_value.Unsigned()); - if (verbose) - s.PutCString(" ( "); DWARFExpression::PrintDWARFExpression( s, locationData, DWARFCompileUnit::GetAddressByteSize(cu), 4, false); - if (verbose) - s.PutCString(" )"); } else { // We have a location list offset as the value that is // the offset into the .debug_loc section that describes // the value over it's lifetime uint64_t debug_loc_offset = form_value.Unsigned(); if (dwarf2Data) { - if (!verbose) - form_value.Dump(s); DWARFExpression::PrintDWARFLocationList( s, cu, dwarf2Data->get_debug_loc_data(), debug_loc_offset); - } else { - if (!verbose) - form_value.Dump(s); } } } break; @@ -765,25 +732,17 @@ void DWARFDebugInfoEntry::DumpAttribute( uint64_t abstract_die_offset = form_value.Reference(); form_value.Dump(s); // *ostrm_ptr << HEX32 << abstract_die_offset << " ( "; - if (verbose) - s.PutCString(" ( "); GetName(dwarf2Data, cu, abstract_die_offset, s); - if (verbose) - s.PutCString(" )"); } break; case DW_AT_type: { uint64_t type_die_offset = form_value.Reference(); - if (!verbose) - form_value.Dump(s); s.PutCString(" ( "); AppendTypeName(dwarf2Data, cu, type_die_offset, s); s.PutCString(" )"); } break; case DW_AT_ranges: { - if (!verbose) - form_value.Dump(s); lldb::offset_t ranges_offset = form_value.Unsigned(); dw_addr_t base_addr = cu ? cu->GetBaseAddress() : 0; if (dwarf2Data) @@ -792,8 +751,6 @@ void DWARFDebugInfoEntry::DumpAttribute( } break; default: - if (!verbose) - form_value.Dump(s); break; } diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugRanges.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugRanges.cpp index ef356685529..bb57029c5cc 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugRanges.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFDebugRanges.cpp @@ -82,7 +82,6 @@ void DWARFDebugRanges::Dump(Stream &s, lldb::offset_t *offset_ptr, dw_addr_t cu_base_addr) { uint32_t addr_size = s.GetAddressByteSize(); - bool verbose = s.GetVerbose(); dw_addr_t base_addr = cu_base_addr; while ( @@ -95,10 +94,6 @@ void DWARFDebugRanges::Dump(Stream &s, begin = LLDB_INVALID_ADDRESS; s.Indent(); - if (verbose) { - s.AddressRange(begin, end, sizeof(dw_addr_t), " offsets = "); - } - if (begin == 0 && end == 0) { s.PutCString(" End"); break; @@ -111,8 +106,7 @@ void DWARFDebugRanges::Dump(Stream &s, dw_addr_t begin_addr = begin + base_addr; dw_addr_t end_addr = end + base_addr; - s.AddressRange(begin_addr, end_addr, sizeof(dw_addr_t), - verbose ? " ==> addrs = " : NULL); + s.AddressRange(begin_addr, end_addr, sizeof(dw_addr_t), NULL); } } } diff --git a/lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.cpp b/lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.cpp index 39c52a8a5e5..cfb6d5dc2ae 100644 --- a/lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.cpp +++ b/lldb/source/Plugins/SymbolFile/DWARF/DWARFFormValue.cpp @@ -406,8 +406,6 @@ void DWARFFormValue::Dump(Stream &s) const { uint64_t uvalue = Unsigned(); bool cu_relative_offset = false; - bool verbose = s.GetVerbose(); - switch (m_form) { case DW_FORM_addr: s.Address(uvalue, sizeof(uint64_t)); @@ -476,8 +474,6 @@ void DWARFFormValue::Dump(Stream &s) const { case DW_FORM_strp: { const char *dbg_str = AsCString(); if (dbg_str) { - if (verbose) - s.Printf(" .debug_str[0x%8.8x] = ", (uint32_t)uvalue); s.QuotedCString(dbg_str); } else { s.PutHex32(uvalue); @@ -496,28 +492,18 @@ void DWARFFormValue::Dump(Stream &s) const { } case DW_FORM_ref1: cu_relative_offset = true; - if (verbose) - s.Printf("cu + 0x%2.2x", (uint8_t)uvalue); break; case DW_FORM_ref2: cu_relative_offset = true; - if (verbose) - s.Printf("cu + 0x%4.4x", (uint16_t)uvalue); break; case DW_FORM_ref4: cu_relative_offset = true; - if (verbose) - s.Printf("cu + 0x%4.4x", (uint32_t)uvalue); break; case DW_FORM_ref8: cu_relative_offset = true; - if (verbose) - s.Printf("cu + 0x%8.8" PRIx64, uvalue); break; case DW_FORM_ref_udata: cu_relative_offset = true; - if (verbose) - s.Printf("cu + 0x%" PRIx64, uvalue); break; // All DW_FORM_indirect attributes should be resolved prior to calling this @@ -535,9 +521,6 @@ void DWARFFormValue::Dump(Stream &s) const { if (cu_relative_offset) { assert(m_cu); // CU must be valid for DW_FORM_ref forms that are compile // unit relative or we will get this wrong - if (verbose) - s.PutCString(" => "); - s.Printf("{0x%8.8" PRIx64 "}", uvalue + m_cu->GetOffset()); } } |
