RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-04-02 07:41:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[DWARF v5] Fix DWARF emitter and consumer to produce/expect a uleb for a location description's length.

Browse Source 
Reviewer: davide, JDevliegere

Differential Revision: https://reviews.llvm.org/D57550

llvm-svn: 352889
This commit is contained in:
Wolfgang Pieb 2019-02-01 17:11:58 +00:00
parent 9d0b5151fc
commit 8f88aac961
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/CodeGen/AsmPrinter/DwarfDebug.cpp
View File

@ -1978,8 +1978,10 @@ void DebugLocEntry::finalize(const AsmPrinter &AP,
void DwarfDebug::emitDebugLocEntryLocation(const DebugLocStream::Entry &Entry) { void DwarfDebug::emitDebugLocEntryLocation(const DebugLocStream::Entry &Entry) {
// Emit the size. // Emit the size.
Asm->OutStreamer->AddComment("Loc expr size"); Asm->OutStreamer->AddComment("Loc expr size");
Asm->emitInt16(DebugLocs.getBytes(Entry).size()); if (getDwarfVersion() >= 5)
Asm->EmitULEB128(DebugLocs.getBytes(Entry).size());
else
Asm->emitInt16(DebugLocs.getBytes(Entry).size());
// Emit the entry. // Emit the entry.
APByteStreamer Streamer(*Asm); APByteStreamer Streamer(*Asm);
emitDebugLocEntry(Streamer, Entry); emitDebugLocEntry(Streamer, Entry);

3
lib/DebugInfo/DWARF/DWARFDebugLoc.cpp
View File

@ -183,7 +183,8 @@ DWARFDebugLoclists::parseOneLocationList(DataExtractor Data, unsigned *Offset,
} }
if (Kind != dwarf::DW_LLE_base_address) { if (Kind != dwarf::DW_LLE_base_address) {
unsigned Bytes = Data.getU16(Offset); unsigned Bytes =
Version >= 5 ? Data.getULEB128(Offset) : Data.getU16(Offset);
// A single location description describing the location of the object... // A single location description describing the location of the object...
StringRef str = Data.getData().substr(*Offset, Bytes); StringRef str = Data.getData().substr(*Offset, Bytes);
*Offset += Bytes; *Offset += Bytes;

6
test/CodeGen/X86/debug-loclists.ll
View File

@ -11,7 +11,7 @@
; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x0040 => {0x00000040} "A") ; CHECK-NEXT: DW_AT_type [DW_FORM_ref4] (cu + 0x0040 => {0x00000040} "A")
; CHECK: .debug_loclists contents: ; CHECK: .debug_loclists contents:
; CHECK-NEXT: 0x00000000: locations list header: length = 0x00000017, version = 0x0005, addr_size = 0x08, seg_size = 0x00, offset_entry_count = 0x00000000 ; CHECK-NEXT: 0x00000000: locations list header: length = 0x00000015, version = 0x0005, addr_size = 0x08, seg_size = 0x00, offset_entry_count = 0x00000000
; CHECK-NEXT: 0x00000000: ; CHECK-NEXT: 0x00000000:
; CHECK-NEXT: [0x0000000000000000, 0x0000000000000004): DW_OP_breg5 RDI+0 ; CHECK-NEXT: [0x0000000000000000, 0x0000000000000004): DW_OP_breg5 RDI+0
; CHECK-NEXT: [0x0000000000000004, 0x0000000000000012): DW_OP_breg3 RBX+0 ; CHECK-NEXT: [0x0000000000000004, 0x0000000000000012): DW_OP_breg3 RBX+0
@ -32,13 +32,13 @@
; ASM-NEXT: .byte 4 # DW_LLE_offset_pair ; ASM-NEXT: .byte 4 # DW_LLE_offset_pair
; ASM-NEXT: .uleb128 .Lfunc_begin0-.Lfunc_begin0 # starting offset ; ASM-NEXT: .uleb128 .Lfunc_begin0-.Lfunc_begin0 # starting offset
; ASM-NEXT: .uleb128 .Ltmp0-.Lfunc_begin0 # ending offset ; ASM-NEXT: .uleb128 .Ltmp0-.Lfunc_begin0 # ending offset
; ASM-NEXT: .short 2 # Loc expr size ; ASM-NEXT: .byte 2 # Loc expr size
; ASM-NEXT: .byte 117 # DW_OP_breg5 ; ASM-NEXT: .byte 117 # DW_OP_breg5
; ASM-NEXT: .byte 0 # 0 ; ASM-NEXT: .byte 0 # 0
; ASM-NEXT: .byte 4 # DW_LLE_offset_pair ; ASM-NEXT: .byte 4 # DW_LLE_offset_pair
; ASM-NEXT: .uleb128 .Ltmp0-.Lfunc_begin0 # starting offset ; ASM-NEXT: .uleb128 .Ltmp0-.Lfunc_begin0 # starting offset
; ASM-NEXT: .uleb128 .Ltmp1-.Lfunc_begin0 # ending offset ; ASM-NEXT: .uleb128 .Ltmp1-.Lfunc_begin0 # ending offset
; ASM-NEXT: .short 2 # Loc expr size ; ASM-NEXT: .byte 2 # Loc expr size
; ASM-NEXT: .byte 115 # DW_OP_breg3 ; ASM-NEXT: .byte 115 # DW_OP_breg3
; ASM-NEXT: .byte 0 # 0 ; ASM-NEXT: .byte 0 # 0
; ASM-NEXT: .byte 0 # DW_LLE_end_of_list ; ASM-NEXT: .byte 0 # DW_LLE_end_of_list

8
test/DebugInfo/X86/dwarfdump-debug-loclists.test
View File

@ -9,7 +9,7 @@
# CHECK-NEXT: [0x0000000000000700, 0x0000000000000710): DW_OP_breg5 RDI+0 # CHECK-NEXT: [0x0000000000000700, 0x0000000000000710): DW_OP_breg5 RDI+0
# CHECK: .debug_loclists contents: # CHECK: .debug_loclists contents:
# CHECK-NEXT: 0x00000000: locations list header: length = 0x0000002f, version = 0x0005, addr_size = 0x08, seg_size = 0x00, offset_entry_count = 0x00000000 # CHECK-NEXT: 0x00000000: locations list header: length = 0x0000002c, version = 0x0005, addr_size = 0x08, seg_size = 0x00, offset_entry_count = 0x00000000
# CHECK-NEXT: 0x00000000: # CHECK-NEXT: 0x00000000:
# CHECK-NEXT: [0x0000000000000000, 0x0000000000000010): DW_OP_breg5 RDI+0 # CHECK-NEXT: [0x0000000000000000, 0x0000000000000010): DW_OP_breg5 RDI+0
# CHECK-NEXT: [0x0000000000000530, 0x0000000000000540): DW_OP_breg6 RBP-8, DW_OP_deref # CHECK-NEXT: [0x0000000000000530, 0x0000000000000540): DW_OP_breg6 RBP-8, DW_OP_deref
@ -37,7 +37,7 @@
.byte 4 # DW_LLE_offset_pair .byte 4 # DW_LLE_offset_pair
.uleb128 0x0 # starting offset .uleb128 0x0 # starting offset
.uleb128 0x10 # ending offset .uleb128 0x10 # ending offset
.short 2 # Loc expr size .byte 2 # Loc expr size
.byte 117 # DW_OP_breg5 .byte 117 # DW_OP_breg5
.byte 0 # 0 .byte 0 # 0
@ -47,7 +47,7 @@
.byte 4 # DW_LLE_offset_pair .byte 4 # DW_LLE_offset_pair
.uleb128 0x30 # starting offset .uleb128 0x30 # starting offset
.uleb128 0x40 # ending offset .uleb128 0x40 # ending offset
.short 3 # Loc expr size .byte 3 # Loc expr size
.byte 118 # DW_OP_breg6 .byte 118 # DW_OP_breg6
.byte 120 # -8 .byte 120 # -8
.byte 6 # DW_OP_deref .byte 6 # DW_OP_deref
@ -55,7 +55,7 @@
.byte 8 # DW_LLE_start_length .byte 8 # DW_LLE_start_length
.quad 0x700 # Some address .quad 0x700 # Some address
.uleb128 0x10 # length .uleb128 0x10 # length
.short 2 # Loc expr size .byte 2 # Loc expr size
.byte 117 # DW_OP_breg5 .byte 117 # DW_OP_breg5
.byte 0 # 0 .byte 0 # 0

4
test/tools/llvm-dwarfdump/X86/debug_loclists_startx_length.s
View File

@ -6,7 +6,7 @@
# the final version which uses ULEB128 and not the U32. # the final version which uses ULEB128 and not the U32.
# CHECK: .debug_loclists contents: # CHECK: .debug_loclists contents:
# CHECK-NEXT: 0x00000000: locations list header: length = 0x0000000f, version = 0x0005, addr_size = 0x08, seg_size = 0x00, offset_entry_count = 0x00000000 # CHECK-NEXT: 0x00000000: locations list header: length = 0x0000000e, version = 0x0005, addr_size = 0x08, seg_size = 0x00, offset_entry_count = 0x00000000
# CHECK-NEXT: 0x00000000: # CHECK-NEXT: 0x00000000:
# CHECK-NEXT: Addr idx 1 (w/ length 16): DW_OP_reg5 RDI # CHECK-NEXT: Addr idx 1 (w/ length 16): DW_OP_reg5 RDI
@ -21,7 +21,7 @@
.byte 3 # DW_LLE_startx_length .byte 3 # DW_LLE_startx_length
.byte 0x01 # Index .byte 0x01 # Index
.uleb128 0x10 # Length .uleb128 0x10 # Length
.short 1 # Loc expr size .byte 1 # Loc expr size
.byte 85 # DW_OP_reg5 .byte 85 # DW_OP_reg5
.byte 0 # DW_LLE_end_of_list .byte 0 # DW_LLE_end_of_list
.Ldebug_loclist_table_end0: .Ldebug_loclist_table_end0: