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

llvm-dwarfdump: Include unit count in DWP index header dumping

Browse Source 
And add comma separators (to be consistent with recent
changes/improvements to the dumping of other section headers) while I'm
here.
This commit is contained in:
David Blaikie 2020-06-12 12:39:08 -07:00
parent 7a293f5b3c
commit 60f7d5f8b7
9 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/DebugInfo/DWARF/DWARFUnitIndex.cpp
View File

@ -112,7 +112,7 @@ bool DWARFUnitIndex::Header::parse(DataExtractor IndexData,
} }
void DWARFUnitIndex::Header::dump(raw_ostream &OS) const { void DWARFUnitIndex::Header::dump(raw_ostream &OS) const {
OS << format("version = %u slots = %u\n\n", Version, NumBuckets); OS << format("version = %u, units = %u, slots = %u\n\n", Version, NumUnits, NumBuckets);
} }
bool DWARFUnitIndex::parse(DataExtractor IndexData) { bool DWARFUnitIndex::parse(DataExtractor IndexData) {

2
test/DebugInfo/X86/debug-cu-index-unknown-section.s
View File

@ -3,7 +3,7 @@
# RUN: FileCheck %s --strict-whitespace # RUN: FileCheck %s --strict-whitespace
# CHECK: .debug_cu_index contents: # CHECK: .debug_cu_index contents:
# CHECK-NEXT: version = 2 slots = 2 # CHECK-NEXT: version = 2, units = 1, slots = 2
# CHECK-EMPTY: # CHECK-EMPTY:
# CHECK-NEXT: Index Signature Unknown: 9 INFO # CHECK-NEXT: Index Signature Unknown: 9 INFO
# CHECK-NEXT: ----- ------------------ ------------------------ ------------------------ # CHECK-NEXT: ----- ------------------ ------------------------ ------------------------

2
test/DebugInfo/X86/dwp-v2-cu-index.s
View File

@ -6,7 +6,7 @@
# RUN: FileCheck %s # RUN: FileCheck %s
# CHECK: .debug_cu_index contents: # CHECK: .debug_cu_index contents:
# CHECK-NEXT: version = 2 slots = 2 # CHECK-NEXT: version = 2, units = 1, slots = 2
# CHECK-EMPTY: # CHECK-EMPTY:
# CHECK-NEXT: Index Signature INFO ABBREV LINE LOC STR_OFFSETS MACINFO MACRO # CHECK-NEXT: Index Signature INFO ABBREV LINE LOC STR_OFFSETS MACINFO MACRO
# CHECK-NEXT: ----- ------------------ ------------------------ ------------------------ ------------------------ ------------------------ ------------------------ ------------------------ ------------------------ # CHECK-NEXT: ----- ------------------ ------------------------ ------------------------ ------------------------ ------------------------ ------------------------ ------------------------ ------------------------

2
test/DebugInfo/X86/dwp-v2-tu-index.s
View File

@ -6,7 +6,7 @@
# RUN: FileCheck %s # RUN: FileCheck %s
# CHECK: .debug_tu_index contents: # CHECK: .debug_tu_index contents:
# CHECK-NEXT: version = 2 slots = 2 # CHECK-NEXT: version = 2, units = 1, slots = 2
# CHECK-EMPTY: # CHECK-EMPTY:
# CHECK-NEXT: Index Signature TYPES ABBREV LINE STR_OFFSETS # CHECK-NEXT: Index Signature TYPES ABBREV LINE STR_OFFSETS
# CHECK-NEXT: ----- ------------------ ------------------------ ------------------------ ------------------------ ------------------------ # CHECK-NEXT: ----- ------------------ ------------------------ ------------------------ ------------------------ ------------------------

2
test/DebugInfo/X86/dwp-v5-cu-index.s
View File

@ -6,7 +6,7 @@
# RUN: FileCheck %s # RUN: FileCheck %s
# CHECK: .debug_cu_index contents: # CHECK: .debug_cu_index contents:
# CHECK-NEXT: version = 5 slots = 2 # CHECK-NEXT: version = 5, units = 1, slots = 2
# CHECK-EMPTY: # CHECK-EMPTY:
# CHECK-NEXT: Index Signature INFO ABBREV LINE LOCLISTS STR_OFFSETS MACRO RNGLISTS # CHECK-NEXT: Index Signature INFO ABBREV LINE LOCLISTS STR_OFFSETS MACRO RNGLISTS
# CHECK-NEXT: ----- ------------------ ------------------------ ------------------------ ------------------------ ------------------------ ------------------------ ------------------------ ------------------------ # CHECK-NEXT: ----- ------------------ ------------------------ ------------------------ ------------------------ ------------------------ ------------------------ ------------------------ ------------------------

2
test/DebugInfo/X86/dwp-v5-tu-index.s
View File

@ -6,7 +6,7 @@
# RUN: FileCheck %s # RUN: FileCheck %s
# CHECK: .debug_tu_index contents: # CHECK: .debug_tu_index contents:
# CHECK-NEXT: version = 5 slots = 2 # CHECK-NEXT: version = 5, units = 1, slots = 2
# CHECK-EMPTY: # CHECK-EMPTY:
# CHECK-NEXT: Index Signature INFO ABBREV LINE STR_OFFSETS # CHECK-NEXT: Index Signature INFO ABBREV LINE STR_OFFSETS
# CHECK-NEXT: ----- ------------------ ------------------------ ------------------------ ------------------------ ------------------------ # CHECK-NEXT: ----- ------------------ ------------------------ ------------------------ ------------------------ ------------------------

4
test/DebugInfo/dwarfdump-dwp.test
View File

@ -37,14 +37,14 @@ RUN: llvm-dwarfdump -v %p/Inputs/dwarfdump-dwp.x86_64.o | FileCheck %s
; CHECK: DW_AT_decl_file {{.*}} ("b.cpp") ; CHECK: DW_AT_decl_file {{.*}} ("b.cpp")
; CHECK: .debug_cu_index contents: ; CHECK: .debug_cu_index contents:
; CHECK-NEXT: version = 2 slots = 16 ; CHECK-NEXT: version = 2, units = 2, slots = 16
; CHECK: Index Signature INFO ABBREV LINE STR_OFFSETS ; CHECK: Index Signature INFO ABBREV LINE STR_OFFSETS
; CHECK-NEXT: ----- ------------------ ------------------------ ------------------------ ------------------------ ------------------------ ; CHECK-NEXT: ----- ------------------ ------------------------ ------------------------ ------------------------ ------------------------
; CHECK-NEXT: 3 0xfef104c25502f092 [0x0000002d, 0x0000005f) [0x00000043, 0x0000008e) [0x0000001a, 0x00000034) [0x00000010, 0x00000024) ; CHECK-NEXT: 3 0xfef104c25502f092 [0x0000002d, 0x0000005f) [0x00000043, 0x0000008e) [0x0000001a, 0x00000034) [0x00000010, 0x00000024)
; CHECK-NEXT: 9 0x03c30756e2d45008 [0x00000000, 0x0000002d) [0x00000000, 0x00000043) [0x00000000, 0x0000001a) [0x00000000, 0x00000010) ; CHECK-NEXT: 9 0x03c30756e2d45008 [0x00000000, 0x0000002d) [0x00000000, 0x00000043) [0x00000000, 0x0000001a) [0x00000000, 0x00000010)
; CHECK: .debug_tu_index contents: ; CHECK: .debug_tu_index contents:
; CHECK-NEXT: version = 2 slots = 16 ; CHECK-NEXT: version = 2, units = 2, slots = 16
; CHECK: Index Signature TYPES ABBREV LINE STR_OFFSETS ; CHECK: Index Signature TYPES ABBREV LINE STR_OFFSETS
; CHECK-NEXT: ----- ------------------ ------------------------ ------------------------ ------------------------ ------------------------ ; CHECK-NEXT: ----- ------------------ ------------------------ ------------------------ ------------------------ ------------------------
; CHECK-NEXT: 9 0x1d02f3be30cc5688 [0x00000024, 0x00000048) [0x00000043, 0x0000008e) [0x0000001a, 0x00000034) [0x00000010, 0x00000024) ; CHECK-NEXT: 9 0x1d02f3be30cc5688 [0x00000024, 0x00000048) [0x00000043, 0x0000008e) [0x0000001a, 0x00000034) [0x00000010, 0x00000024)

2
test/tools/llvm-dwp/X86/info-v5.s
View File

@ -9,7 +9,7 @@
#CHECK: 0x00000000: Compile Unit: length = 0x00000050, format = DWARF32, version = 0x0005, unit_type = DW_UT_split_compile, abbr_offset = 0x0000, addr_size = 0x08, DWO_id = [[DWOID:.*]] (next unit at 0x00000054) #CHECK: 0x00000000: Compile Unit: length = 0x00000050, format = DWARF32, version = 0x0005, unit_type = DW_UT_split_compile, abbr_offset = 0x0000, addr_size = 0x08, DWO_id = [[DWOID:.*]] (next unit at 0x00000054)
# CHECK-DAG: .debug_cu_index contents: # CHECK-DAG: .debug_cu_index contents:
# CHECK: version = 2 slots = 2 # CHECK: version = 2, units = 1, slots = 2
# CHECK: Index Signature INFO ABBREV # CHECK: Index Signature INFO ABBREV
# CHECK: 1 [[DWOID]] [0x00000000, 0x00000054) [0x00000000, 0x0000002a) # CHECK: 1 [[DWOID]] [0x00000000, 0x00000054) [0x00000000, 0x0000002a)

4
test/tools/llvm-dwp/X86/unknown-section-id.s
View File

@ -13,7 +13,7 @@
## identifiers is copied. ## identifiers is copied.
# CHECK: .debug_cu_index contents: # CHECK: .debug_cu_index contents:
# CHECK-NEXT: version = 2 slots = 2 # CHECK-NEXT: version = 2, units = 1, slots = 2
# CHECK: Index Signature INFO ABBREV # CHECK: Index Signature INFO ABBREV
# CHECK-NOT: Unknown # CHECK-NOT: Unknown
# CHECK: ----- # CHECK: -----
@ -21,7 +21,7 @@
# CHECK-NOT: [ # CHECK-NOT: [
# CHECK: .debug_tu_index contents: # CHECK: .debug_tu_index contents:
# CHECK-NEXT: version = 2 slots = 2 # CHECK-NEXT: version = 2, units = 1, slots = 2
# CHECK: Index Signature TYPES ABBREV # CHECK: Index Signature TYPES ABBREV
# CHECK-NOT: Unknown # CHECK-NOT: Unknown
# CHECK: ----- # CHECK: -----