RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 10:42:39 +01:00
Code Issues Projects Releases Wiki Activity

llvm-dwarfdump: Skip address index info (and dump only the address, if found) when non-verbose dumping addrx forms

Browse Source 
There's a few bugs here still - demonstrated with FIXITs in the test.

llvm-svn: 350046
This commit is contained in:
David Blaikie 2018-12-24 06:52:31 +00:00
parent 6f0d1f0967
commit cf791e1074
2 changed files with 82 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/DebugInfo/DWARF/DWARFFormValue.cpp
View File

@ -370,13 +370,14 @@ void DWARFFormValue::dump(raw_ostream &OS, DIDumpOptions DumpOpts) const {
case DW_FORM_addrx3: case DW_FORM_addrx3:
case DW_FORM_addrx4: case DW_FORM_addrx4:
case DW_FORM_GNU_addr_index: { case DW_FORM_GNU_addr_index: {
AddrOS << format("indexed (%8.8x) address = ", (uint32_t)UValue); Optional<SectionedAddress> A = U->getAddrOffsetSectionItem(UValue);
if (!A || DumpOpts.Verbose)
AddrOS << format("indexed (%8.8x) address = ", (uint32_t)UValue);
if (U == nullptr) if (U == nullptr)
OS << "<invalid dwarf unit>"; OS << "<invalid dwarf unit>";
else if (Optional<SectionedAddress> A = else if (A)
U->getAddrOffsetSectionItem(UValue)) {
dumpSectionedAddress(AddrOS, DumpOpts, *A); dumpSectionedAddress(AddrOS, DumpOpts, *A);
} else else
OS << "<no .debug_addr section>"; OS << "<no .debug_addr section>";
break; break;
} }

77
test/tools/llvm-dwarfdump/X86/debug_info_addrx.s Normal file
View File

@ -0,0 +1,77 @@
# RUN: llvm-mc %s -filetype obj -triple x86_64-pc-linux -o %t.o
# RUN: llvm-dwarfdump -debug-info %t.o | FileCheck %s
# RUN: llvm-dwarfdump -debug-info %t.o -v | FileCheck --check-prefix=VERBOSE %s
# CHECK: DW_TAG_compile_unit
# CHECK: DW_AT_low_pc (0x0000000000000000)
# VERBOSE: DW_AT_low_pc [DW_FORM_addrx] (indexed (00000000) address = 0x0000000000000000 ".text")
# FIXME: There is a debug_addr section, it's just that the index is outside its
# bounds (both of the section, and the range defined by the header for the
# debug_addr contribution for this CU)
# CHECK: DW_AT_low_pc (indexed (00000001) address = <no .debug_addr section>)
# VERBOSE: DW_AT_low_pc [DW_FORM_addrx] (indexed (00000001) address = <no .debug_addr section>)
# CHECK: DW_TAG_compile_unit
# FIXME: Should error "no debug_addr contribution" - rather than parsing debug_addr
# from the start, incorrectly interpreting the header bytes as an address.
# CHECK: DW_AT_low_pc (0x000800050000000c)
# VERBOSE: DW_AT_low_pc [DW_FORM_addrx] (indexed (00000000) address = 0x000800050000000c)
.globl foo # -- Begin function foo
foo: # @foo
.Lfunc_begin0:
retq
.Lfunc_end0:
.section .debug_abbrev,"",@progbits
.byte 1 # Abbreviation Code
.byte 17 # DW_TAG_compile_unit
.byte 0 # DW_CHILDREN_no
.byte 115 # DW_AT_addr_base
.byte 23 # DW_FORM_sec_offset
.byte 17 # DW_AT_low_pc
.byte 27 # DW_FORM_addrx
.byte 17 # DW_AT_low_pc
.byte 27 # DW_FORM_addrx
.byte 0 # EOM(1)
.byte 0 # EOM(2)
.byte 2 # Abbreviation Code
.byte 17 # DW_TAG_compile_unit
.byte 0 # DW_CHILDREN_no
.byte 17 # DW_AT_low_pc
.byte 27 # DW_FORM_addrx
.byte 0 # EOM(1)
.byte 0 # EOM(2)
.byte 0 # EOM(3)
.section .debug_info,"",@progbits
.Lcu_begin0:
.long .Ldebug_info_end0-.Ldebug_info_start0 # Length of Unit
.Ldebug_info_start0:
.short 5 # DWARF version number
.byte 1 # DWARF Unit Type
.byte 8 # Address Size (in bytes)
.long .debug_abbrev # Offset Into Abbrev. Section
.byte 1 # Abbrev [1] 0xc:0x23 DW_TAG_compile_unit
.long .Laddr_table_base0 # DW_AT_addr_base
.byte 0 # DW_AT_low_pc
.byte 1 # DW_AT_low_pc
.Ldebug_info_end0:
.Lcu_begin1:
.long .Ldebug_info_end1-.Ldebug_info_start1 # Length of Unit
.Ldebug_info_start1:
.short 5 # DWARF version number
.byte 1 # DWARF Unit Type
.byte 8 # Address Size (in bytes)
.long .debug_abbrev # Offset Into Abbrev. Section
.byte 2 # Abbrev [2] 0xc:0x23 DW_TAG_compile_unit
.long .Laddr_table_base0 # DW_AT_addr_base
.byte 0 # DW_AT_low_pc
.Ldebug_info_end1:
.section .debug_macinfo,"",@progbits
.byte 0 # End Of Macro List Mark
.section .debug_addr,"",@progbits
.long 12 # Length of Pool
.short 5 # DWARF version number
.byte 8 # Address Size (in bytes)
.byte 0 # Segment selector size
.Laddr_table_base0:
.quad .Lfunc_begin0