Skip to content

Commit bfa1403

Browse files
higuoxinghiguoxing
committed
[DWARFYAML] Make the field names consistent with the DWARF spec. NFC.
This patch replaces 'AddrSize'/'SegSize' with 'AddressSize'/'SegmentSelectorSize'. NFC.
1 parent 9ee7d71 commit bfa1403

File tree

9 files changed

+85
-85
lines changed

9 files changed

+85
-85
lines changed

‎llvm/lib/ObjectYAML/DWARFYAML.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ void MappingTraits<DWARFYAML::ARange>::mapping(IO &IO,
106106
IO.mapRequired("Length", ARange.Length);
107107
IO.mapRequired("Version", ARange.Version);
108108
IO.mapRequired("CuOffset", ARange.CuOffset);
109-
IO.mapRequired("AddrSize", ARange.AddrSize);
110-
IO.mapRequired("SegSize", ARange.SegSize);
109+
IO.mapRequired("AddressSize", ARange.AddrSize);
110+
IO.mapRequired("SegmentSelectorSize", ARange.SegSize);
111111
IO.mapRequired("Descriptors", ARange.Descriptors);
112112
}
113113

‎llvm/test/ObjectYAML/MachO/DWARF-debug_aranges.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -313,22 +313,22 @@ LinkEditData:
313313
- _main
314314
DWARF:
315315
debug_aranges:
316-
- Length: 44
317-
Version: 2
318-
CuOffset: 0
319-
AddrSize: 8
320-
SegSize: 0
316+
- Length: 44
317+
Version: 2
318+
CuOffset: 0
319+
AddressSize: 8
320+
SegmentSelectorSize: 0
321321
Descriptors:
322322
- Address: 0x0000000100000F50
323323
Length: 52
324324
...
325325

326326
# CHECK: debug_aranges:
327-
# CHECK-NEXT: - Length: 0x000000000000002C
328-
# CHECK-NEXT: Version: 2
329-
# CHECK-NEXT: CuOffset: 0x0000000000000000
330-
# CHECK-NEXT: AddrSize: 0x08
331-
# CHECK-NEXT: SegSize: 0x00
327+
# CHECK-NEXT: - Length: 0x000000000000002C
328+
# CHECK-NEXT: Version: 2
329+
# CHECK-NEXT: CuOffset: 0x0000000000000000
330+
# CHECK-NEXT: AddressSize: 0x08
331+
# CHECK-NEXT: SegmentSelectorSize: 0x00
332332
# CHECK-NEXT: Descriptors:
333333
# CHECK-NEXT: - Address: 0x0000000100000F50
334334
# CHECK-NEXT: Length: 52

‎llvm/test/ObjectYAML/MachO/DWARF-debug_info.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -381,11 +381,11 @@ DWARF:
381381
- Attribute: DW_AT_type
382382
Form: DW_FORM_ref4
383383
debug_aranges:
384-
- Length: 44
385-
Version: 2
386-
CuOffset: 0
387-
AddrSize: 8
388-
SegSize: 0
384+
- Length: 44
385+
Version: 2
386+
CuOffset: 0
387+
AddressSize: 8
388+
SegmentSelectorSize: 0
389389
Descriptors:
390390
- Address: 0x0000000100000F50
391391
Length: 52

‎llvm/test/ObjectYAML/MachO/DWARF-debug_line.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -394,11 +394,11 @@ DWARF:
394394
- Attribute: DW_AT_type
395395
Form: DW_FORM_ref4
396396
debug_aranges:
397-
- Length: 44
398-
Version: 2
399-
CuOffset: 0
400-
AddrSize: 8
401-
SegSize: 0
397+
- Length: 44
398+
Version: 2
399+
CuOffset: 0
400+
AddressSize: 8
401+
SegmentSelectorSize: 0
402402
Descriptors:
403403
- Address: 0x0000000100000F50
404404
Length: 52

‎llvm/test/ObjectYAML/MachO/DWARF5-debug_info.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -381,11 +381,11 @@ DWARF:
381381
- Attribute: DW_AT_type
382382
Form: DW_FORM_ref4
383383
debug_aranges:
384-
- Length: 44
385-
Version: 2
386-
CuOffset: 0
387-
AddrSize: 8
388-
SegSize: 0
384+
- Length: 44
385+
Version: 2
386+
CuOffset: 0
387+
AddressSize: 8
388+
SegmentSelectorSize: 0
389389
Descriptors:
390390
- Address: 0x0000000100000F50
391391
Length: 52

‎llvm/test/tools/llvm-gsymutil/ARM_AArch64/fat-macho-dwarf.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -378,11 +378,11 @@ Slices:
378378
- Attribute: DW_AT_type
379379
Form: DW_FORM_ref_addr
380380
debug_aranges:
381-
- Length: 28
382-
Version: 2
383-
CuOffset: 0
384-
AddrSize: 4
385-
SegSize: 0
381+
- Length: 28
382+
Version: 2
383+
CuOffset: 0
384+
AddressSize: 4
385+
SegmentSelectorSize: 0
386386
Descriptors:
387387
- Address: 0x000000000000BFF0
388388
Length: 16
@@ -856,11 +856,11 @@ Slices:
856856
- Attribute: DW_AT_type
857857
Form: DW_FORM_ref_addr
858858
debug_aranges:
859-
- Length: 44
860-
Version: 2
861-
CuOffset: 0
862-
AddrSize: 8
863-
SegSize: 0
859+
- Length: 44
860+
Version: 2
861+
CuOffset: 0
862+
AddressSize: 8
863+
SegmentSelectorSize: 0
864864
Descriptors:
865865
- Address: 0x0000000100007F9C
866866
Length: 28

‎llvm/test/tools/llvm-gsymutil/X86/mach-dwarf.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -539,11 +539,11 @@ DWARF:
539539
- Attribute: DW_AT_type
540540
Form: DW_FORM_ref_addr
541541
debug_aranges:
542-
- Length: 60
543-
Version: 2
544-
CuOffset: 0
545-
AddrSize: 8
546-
SegSize: 0
542+
- Length: 60
543+
Version: 2
544+
CuOffset: 0
545+
AddressSize: 8
546+
SegmentSelectorSize: 0
547547
Descriptors:
548548
- Address: 0x0000000100000F70
549549
Length: 17

‎llvm/test/tools/obj2yaml/MachO/DWARF-debug_aranges-error.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -287,11 +287,11 @@ LoadCommands:
287287
reserved3: 0x00000000
288288
DWARF:
289289
debug_aranges:
290-
- Length: 45
291-
Version: 2
292-
CuOffset: 0
293-
AddrSize: 8
294-
SegSize: 0
290+
- Length: 45
291+
Version: 2
292+
CuOffset: 0
293+
AddressSize: 8
294+
SegmentSelectorSize: 0
295295
Descriptors:
296296
- Address: 0x0000000100000F50
297297
Length: 52

‎llvm/test/tools/yaml2obj/ELF/DWARF/debug-aranges.yaml

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -69,21 +69,21 @@ FileHeader:
6969
Machine: EM_X86_64
7070
DWARF:
7171
debug_aranges:
72-
- Format: [[FORMAT]]
73-
Length: 0x2c
74-
Version: 2
75-
CuOffset: 0
76-
AddrSize: 0x04
77-
SegSize: 0x00
72+
- Format: [[FORMAT]]
73+
Length: 0x2c
74+
Version: 2
75+
CuOffset: 0
76+
AddressSize: 0x04
77+
SegmentSelectorSize: 0x00
7878
Descriptors:
7979
- Address: 0x00001234
8080
Length: 0x20
81-
- Format: [[FORMAT]]
82-
Length: 0x2c
83-
Version: 2
84-
CuOffset: 0x65
85-
AddrSize: 0x08
86-
SegSize: 0x00
81+
- Format: [[FORMAT]]
82+
Length: 0x2c
83+
Version: 2
84+
CuOffset: 0x65
85+
AddressSize: 0x08
86+
SegmentSelectorSize: 0x00
8787
Descriptors:
8888
- Address: 0x0000000000005678
8989
Length: 0x20
@@ -307,11 +307,11 @@ Sections:
307307
Size: 0x10
308308
DWARF:
309309
debug_aranges:
310-
- Length: 0x2c
311-
Version: 2
312-
CuOffset: 0
313-
AddrSize: 0x08
314-
SegSize: 0x00
310+
- Length: 0x2c
311+
Version: 2
312+
CuOffset: 0
313+
AddressSize: 0x08
314+
SegmentSelectorSize: 0x00
315315
Descriptors:
316316
- Address: 0x0000000000001234
317317
Length: 0x20
@@ -333,11 +333,11 @@ Sections:
333333
Content: "00"
334334
DWARF:
335335
debug_aranges:
336-
- Length: 0x2c
337-
Version: 2
338-
CuOffset: 0
339-
AddrSize: 0x08
340-
SegSize: 0x00
336+
- Length: 0x2c
337+
Version: 2
338+
CuOffset: 0
339+
AddressSize: 0x08
340+
SegmentSelectorSize: 0x00
341341
Descriptors:
342342
- Address: 0x0000000000001234
343343
Length: 0x20
@@ -398,11 +398,11 @@ Sections:
398398
Type: SHT_STRTAB
399399
DWARF:
400400
debug_aranges:
401-
- Length: 0x2c
402-
Version: 2
403-
CuOffset: 0
404-
AddrSize: 0x08
405-
SegSize: 0x00
401+
- Length: 0x2c
402+
Version: 2
403+
CuOffset: 0
404+
AddressSize: 0x08
405+
SegmentSelectorSize: 0x00
406406
Descriptors:
407407
- Address: 0x0000000000001234
408408
Length: 0x20
@@ -427,12 +427,12 @@ FileHeader:
427427
Machine: EM_X86_64
428428
DWARF:
429429
debug_aranges:
430-
- Length: 0x2c
431-
Version: 2
432-
CuOffset: 0
433-
AddrSize: 0x07 ## Invalid address_size.
434-
SegSize: 0
435-
Descriptors: []
430+
- Length: 0x2c
431+
Version: 2
432+
CuOffset: 0
433+
AddressSize: 0x07 ## Invalid address_size.
434+
SegmentSelectorSize: 0
435+
Descriptors: []
436436

437437
## i) Test that yaml2obj emits an error message if we try to assign an invalid value to
438438
## 'AddrSize' when the 'Descriptors' list isn't empty.
@@ -450,11 +450,11 @@ FileHeader:
450450
Machine: EM_X86_64
451451
DWARF:
452452
debug_aranges:
453-
- Length: 0x2c
454-
Version: 2
455-
CuOffset: 0
456-
AddrSize: 0x07 ## Invalid address_size.
457-
SegSize: 0
453+
- Length: 0x2c
454+
Version: 2
455+
CuOffset: 0
456+
AddressSize: 0x07 ## Invalid address_size.
457+
SegmentSelectorSize: 0
458458
Descriptors:
459459
- Address: 0x1234
460460
Length: 0x1000

0 commit comments

Comments
 (0)