This is an archive of the discontinued LLVM Phabricator instance.

Differential D104700

[llvm-objdump] Prevent variable locations to overlap short comments
ClosedPublic

Authored by ikudrin on Jun 22 2021, 4:17 AM.

Details

Reviewers
MaskRay
ostannard
echristo
jhenderson
Commits
rGc2e6bcb494c1: [llvm-objdump] Prevent variable locations to overlap short comments
Summary

For now, the source variable locations are printed at about the same space as the comments for disassembled code, which can make some ranges for variables disappear if a line contains comments, for example:

                                        ┠─ bar = W1
0:  add x0, x2, #2, lsl #12     // =8192┃
4:  add z31.d, z31.d, #65280    // =0xff00
8:  nop                                 ┻

The patch shifts the report a bit to allow printing comments up to approximately 16 characters without interferences.

Diff Detail

Event Timeline

ikudrin created this revision.Jun 22 2021, 4:17 AM
Herald added subscribers: rupprecht, emaste. · View Herald TranscriptJun 22 2021, 4:17 AM
ikudrin requested review of this revision.Jun 22 2021, 4:17 AM
ikudrin added a parent revision: D104699: [llvm-objdump] Print comments for the disassembled code.
Harbormaster completed remote builds in B110377: Diff 353601.Jun 22 2021, 4:18 AM
jhenderson added inline comments.Jun 23 2021, 12:47 AM
llvm/test/tools/llvm-objdump/ELF/AArch64/disassemble-print-comments.s
6

I think it may be best to do the --debug-vars case in a separate invocation, to show that the option has no impact on the comment output.

Same goes for the X86 test case.

llvm/tools/llvm-objdump/llvm-objdump.cpp
224

The default is mentioned in the command guide, so the doc needs updating as part of this patch.

ikudrin updated this revision to Diff 353928.Jun 23 2021, 4:37 AM
ikudrin marked 2 inline comments as done.
  • Updated the documentation
  • Added separate invocations in tests to check printing comments and debug variables together
Harbormaster completed remote builds in B110599: Diff 353928.Jun 23 2021, 5:18 AM
jhenderson accepted this revision.Jun 23 2021, 5:25 AM

LGTM.

This revision is now accepted and ready to land.Jun 23 2021, 5:25 AM
This revision was landed with ongoing or failed builds.Jun 28 2021, 12:27 AM
Closed by commit rGc2e6bcb494c1: [llvm-objdump] Prevent variable locations to overlap short comments (authored by ikudrin). · Explain Why
This revision was automatically updated to reflect the committed changes.
ikudrin added a commit: rGc2e6bcb494c1: [llvm-objdump] Prevent variable locations to overlap short comments.

Revision Contents

PathSize
llvm/
test/
tools/
llvm-objdump/
ELF/
AArch64/
56 lines
ARM/
122 lines
6 lines
X86/
56 lines
tools/
llvm-objdump/
2 lines

Diff 353601

llvm/test/tools/llvm-objdump/ELF/AArch64/disassemble-print-comments.s

## Check that 'llvm-objdump -d' prints comments generated by the disassembler. ## Check that 'llvm-objdump -d' prints comments generated by the disassembler.
## Also check that printing comments does not break printing the locations of
## variables.
# RUN: llvm-mc -filetype=obj -triple=aarch64 -mattr=+sve %s -o %t # RUN: llvm-mc -filetype=obj -triple=aarch64 -mattr=+sve %s -o %t
# RUN: llvm-objdump -d --mattr=+sve --no-show-raw-insn %t | FileCheck %s # RUN: llvm-objdump -d --mattr=+sve --debug-vars --no-show-raw-insn %t | FileCheck %s
jhendersonUnsubmitted
Done
ReplyInline Actions

I think it may be best to do the --debug-vars case in a separate invocation, to show that the option has no impact on the comment output.

Same goes for the X86 test case.

jhenderson: I think it may be best to do the `--debug-vars` case in a separate invocation, to show that the…
# CHECK: 0000000000000000 <foo>: # CHECK: 0000000000000000 <foo>:
# CHECK-NEXT: 0: add x0, x2, #2, lsl #12 // =8192 # CHECK-NEXT: ┠─ bar = W1
# CHECK-NEXT: 4: add z31.d, z31.d, #65280 // =0xff00 # CHECK-NEXT: 0: add x0, x2, #2, lsl #12 // =8192 ┃
# CHECK-NEXT: 4: add z31.d, z31.d, #65280 // =0xff00 ┻
.text .text
foo: foo:
add x0, x2, 8192 add x0, x2, 8192
add z31.d, z31.d, #65280 add z31.d, z31.d, #65280
.LFooEnd:
.section .debug_abbrev,"",@progbits
.uleb128 1 // Abbreviation Code
.uleb128 0x11 // DW_TAG_compile_unit
.byte 1 // DW_CHILDREN_yes
.byte 0 // EOM(1)
.byte 0 // EOM(2)
.uleb128 2 // Abbreviation Code
.uleb128 0x2e // DW_TAG_subprogram
.byte 1 // DW_CHILDREN_yes
.uleb128 0x11 // DW_AT_low_pc
.uleb128 0x01 // DW_FORM_addr
.uleb128 0x12 // DW_AT_high_pc
.uleb128 0x06 // DW_FORM_data4
.byte 0 // EOM(1)
.byte 0 // EOM(2)
.uleb128 3 // Abbreviation Code
.uleb128 0x34 // DW_TAG_variable
.byte 0 // DW_CHILDREN_no
.uleb128 0x02 // DW_AT_location
.uleb128 0x18 // DW_FORM_exprloc
.uleb128 0x03 // DW_AT_name
.uleb128 0x08 // DW_FORM_string
.byte 0 // EOM(1)
.byte 0 // EOM(2)
.byte 0 // EOM(3)
.section .debug_info,"",@progbits
.long .LCuEnd-.LCuBegin // Length of Unit
.LCuBegin:
.short 4 // DWARF version number
.long .debug_abbrev // Offset Into Abbrev. Section
.byte 8 // Address Size
.uleb128 1 // Abbrev [1] DW_TAG_compile_unit
.uleb128 2 // Abbrev [2] DW_TAG_subprogram
.quad foo // DW_AT_low_pc
.long .LFooEnd-foo // DW_AT_high_pc
.uleb128 3 // Abbrev [3] DW_TAG_variable
.byte .LLocEnd-.LLocBegin // DW_AT_location
.LLocBegin:
.byte 0x51 // DW_OP_reg1
.LLocEnd:
.asciz "bar" // DW_FORM_string
.byte 0 // End Of Children Mark
.byte 0 // End Of Children Mark
.LCuEnd:

llvm/test/tools/llvm-objdump/ELF/ARM/debug-vars-dwarf4.s

## Check that the --debug-vars option works for simple register locations, when ## Check that the --debug-vars option works for simple register locations, when
## using DWARF4 debug info, with multiple functions in one section. Check that ## using DWARF4 debug info, with multiple functions in one section. Check that
## the live-range lines are rendered correctly when using the --no-show-raw-insn, ## the live-range lines are rendered correctly when using the --no-show-raw-insn,
## --line-numbers and --source options. These do not affect the DWARF parsing ## --line-numbers and --source options. These do not affect the DWARF parsing
## used by --debug-vars, but do add extra lines or columns to the output, so we ## used by --debug-vars, but do add extra lines or columns to the output, so we
## test to make sure the live ranges are still displayed correctly. ## test to make sure the live ranges are still displayed correctly.
## Generated with this compile command, with the source code in Inputs/debug.c: ## Generated with this compile command, with the source code in Inputs/debug.c:
## clang --target=arm--none-eabi -march=armv7-a -c debug.c -O1 -gdwarf-4 -S -o - ## clang --target=arm--none-eabi -march=armv7-a -c debug.c -O1 -gdwarf-4 -S -o -
# RUN: llvm-mc -triple armv8a--none-eabi < %s -filetype=obj | \ # RUN: llvm-mc -triple armv8a--none-eabi < %s -filetype=obj | \
# RUN: llvm-objdump - -d --debug-vars | \ # RUN: llvm-objdump - -d --debug-vars | \
# RUN: FileCheck %s --check-prefix=RAW --strict-whitespace # RUN: FileCheck %s --check-prefix=RAW --strict-whitespace
## Check that passing the default value for --debug-vars-indent (40) makes no ## Check that passing the default value for --debug-vars-indent (52) makes no
## change to the output. ## change to the output.
# RUN: llvm-mc -triple armv8a--none-eabi < %s -filetype=obj | \ # RUN: llvm-mc -triple armv8a--none-eabi < %s -filetype=obj | \
# RUN: llvm-objdump - -d --debug-vars --debug-vars-indent=40 | \ # RUN: llvm-objdump - -d --debug-vars --debug-vars-indent=52 | \
# RUN: FileCheck %s --check-prefix=RAW --strict-whitespace # RUN: FileCheck %s --check-prefix=RAW --strict-whitespace
# RUN: llvm-mc -triple armv8a--none-eabi < %s -filetype=obj | \ # RUN: llvm-mc -triple armv8a--none-eabi < %s -filetype=obj | \
# RUN: llvm-objdump - -d --debug-vars --debug-vars-indent=30 | \ # RUN: llvm-objdump - -d --debug-vars --debug-vars-indent=30 | \
# RUN: FileCheck %s --check-prefix=INDENT --strict-whitespace # RUN: FileCheck %s --check-prefix=INDENT --strict-whitespace
# RUN: llvm-mc -triple armv8a--none-eabi < %s -filetype=obj | \ # RUN: llvm-mc -triple armv8a--none-eabi < %s -filetype=obj | \
# RUN: llvm-objdump - -d --debug-vars --no-show-raw-insn | \ # RUN: llvm-objdump - -d --debug-vars --no-show-raw-insn | \
Show All 18 Lines
# RUN: llvm-mc -triple armv8a--none-eabi < %s -filetype=obj | \ # RUN: llvm-mc -triple armv8a--none-eabi < %s -filetype=obj | \
# RUN: llvm-objdump - -d --debug-vars=ascii | \ # RUN: llvm-objdump - -d --debug-vars=ascii | \
# RUN: FileCheck %s --check-prefix=ASCII --strict-whitespace # RUN: FileCheck %s --check-prefix=ASCII --strict-whitespace
## Note that llvm-objdump emits tab characters in the disassembly, assuming an ## Note that llvm-objdump emits tab characters in the disassembly, assuming an
## 8-byte tab stop, so these might not look aligned in a text editor. ## 8-byte tab stop, so these might not look aligned in a text editor.
# RAW: 00000000 <foo>: # RAW: 00000000 <foo>:
# RAW-NEXT: ┠─ a = R0 # RAW-NEXT: ┠─ a = R0
# RAW-NEXT: ┃ ┠─ b = R1 # RAW-NEXT: ┃ ┠─ b = R1
# RAW-NEXT: ┃ ┃ ┠─ c = R2 # RAW-NEXT: ┃ ┃ ┠─ c = R2
# RAW-NEXT: ┃ ┃ ┃ ┌─ x = R0 # RAW-NEXT: ┃ ┃ ┃ ┌─ x = R0
# RAW-NEXT: 0: 00 00 81 e0 add r0, r1, r0 ┻ ┃ ┃ ╈ # RAW-NEXT: 0: 00 00 81 e0 add r0, r1, r0 ┻ ┃ ┃ ╈
# RAW-NEXT: ┌─ y = R0 # RAW-NEXT: ┌─ y = R0
# RAW-NEXT: 4: 02 00 80 e0 add r0, r0, r2 ╈ ┃ ┃ ┻ # RAW-NEXT: 4: 02 00 80 e0 add r0, r0, r2 ╈ ┃ ┃ ┻
# RAW-NEXT: 8: 1e ff 2f e1 bx lr ┻ ┻ ┻ # RAW-NEXT: 8: 1e ff 2f e1 bx lr ┻ ┻ ┻
# RAW-EMPTY: # RAW-EMPTY:
# RAW-NEXT: 0000000c <bar>: # RAW-NEXT: 0000000c <bar>:
# RAW-NEXT: ┠─ a = R0 # RAW-NEXT: ┠─ a = R0
# RAW-NEXT: c: 01 00 80 e2 add r0, r0, #1 ┃ # RAW-NEXT: c: 01 00 80 e2 add r0, r0, #1 ┃
# RAW-NEXT: 10: 1e ff 2f e1 bx lr ┻ # RAW-NEXT: 10: 1e ff 2f e1 bx lr ┻
# INDENT: 00000000 <foo>: # INDENT: 00000000 <foo>:
# INDENT-NEXT: ┠─ a = R0 # INDENT-NEXT: ┠─ a = R0
# INDENT-NEXT: ┃ ┠─ b = R1 # INDENT-NEXT: ┃ ┠─ b = R1
# INDENT-NEXT: ┃ ┃ ┠─ c = R2 # INDENT-NEXT: ┃ ┃ ┠─ c = R2
# INDENT-NEXT: ┃ ┃ ┃ ┌─ x = R0 # INDENT-NEXT: ┃ ┃ ┃ ┌─ x = R0
# INDENT-NEXT: 0: 00 00 81 e0 add r0, r1, r0 ┻ ┃ ┃ ╈ # INDENT-NEXT: 0: 00 00 81 e0 add r0, r1, r0 ┻ ┃ ┃ ╈
# INDENT-NEXT: ┌─ y = R0 # INDENT-NEXT: ┌─ y = R0
# INDENT-NEXT: 4: 02 00 80 e0 add r0, r0, r2 ╈ ┃ ┃ ┻ # INDENT-NEXT: 4: 02 00 80 e0 add r0, r0, r2 ╈ ┃ ┃ ┻
# INDENT-NEXT: 8: 1e ff 2f e1 bx lr ┻ ┻ ┻ # INDENT-NEXT: 8: 1e ff 2f e1 bx lr ┻ ┻ ┻
# INDENT-EMPTY: # INDENT-EMPTY:
# INDENT-NEXT: 0000000c <bar>: # INDENT-NEXT: 0000000c <bar>:
# INDENT-NEXT: ┠─ a = R0 # INDENT-NEXT: ┠─ a = R0
# INDENT-NEXT: c: 01 00 80 e2 add r0, r0, #1 ┃ # INDENT-NEXT: c: 01 00 80 e2 add r0, r0, #1 ┃
# INDENT-NEXT: 10: 1e ff 2f e1 bx lr ┻ # INDENT-NEXT: 10: 1e ff 2f e1 bx lr ┻
# NO-RAW: 00000000 <foo>: # NO-RAW: 00000000 <foo>:
# NO-RAW-NEXT: ┠─ a = R0 # NO-RAW-NEXT: ┠─ a = R0
# NO-RAW-NEXT: ┃ ┠─ b = R1 # NO-RAW-NEXT: ┃ ┠─ b = R1
# NO-RAW-NEXT: ┃ ┃ ┠─ c = R2 # NO-RAW-NEXT: ┃ ┃ ┠─ c = R2
# NO-RAW-NEXT: ┃ ┃ ┃ ┌─ x = R0 # NO-RAW-NEXT: ┃ ┃ ┃ ┌─ x = R0
# NO-RAW-NEXT: 0: add r0, r1, r0 ┻ ┃ ┃ ╈ # NO-RAW-NEXT: 0: add r0, r1, r0 ┻ ┃ ┃ ╈
# NO-RAW-NEXT: ┌─ y = R0 # NO-RAW-NEXT: ┌─ y = R0
# NO-RAW-NEXT: 4: add r0, r0, r2 ╈ ┃ ┃ ┻ # NO-RAW-NEXT: 4: add r0, r0, r2 ╈ ┃ ┃ ┻
# NO-RAW-NEXT: 8: bx lr ┻ ┻ ┻ # NO-RAW-NEXT: 8: bx lr ┻ ┻ ┻
# NO-RAW-EMPTY: # NO-RAW-EMPTY:
# NO-RAW-NEXT: 0000000c <bar>: # NO-RAW-NEXT: 0000000c <bar>:
# NO-RAW-NEXT: ┠─ a = R0 # NO-RAW-NEXT: ┠─ a = R0
# NO-RAW-NEXT: c: add r0, r0, #1 ┃ # NO-RAW-NEXT: c: add r0, r0, #1 ┃
# NO-RAW-NEXT: 10: bx lr ┻ # NO-RAW-NEXT: 10: bx lr ┻
# LINE-NUMS: 00000000 <foo>: # LINE-NUMS: 00000000 <foo>:
# LINE-NUMS-NEXT: ; foo(): # LINE-NUMS-NEXT: ; foo():
# LINE-NUMS-NEXT: ; SRC_COMPDIR{{[\\/]}}debug.c:2 ┠─ a = R0 # LINE-NUMS-NEXT: ; SRC_COMPDIR{{[\\/]}}debug.c:2 ┠─ a = R0
# LINE-NUMS-NEXT: ┃ ┠─ b = R1 # LINE-NUMS-NEXT: ┃ ┠─ b = R1
# LINE-NUMS-NEXT: ┃ ┃ ┠─ c = R2 # LINE-NUMS-NEXT: ┃ ┃ ┠─ c = R2
# LINE-NUMS-NEXT: ┃ ┃ ┃ ┌─ x = R0 # LINE-NUMS-NEXT: ┃ ┃ ┃ ┌─ x = R0
# LINE-NUMS-NEXT: 0: add r0, r1, r0 ┻ ┃ ┃ ╈ # LINE-NUMS-NEXT: 0: add r0, r1, r0 ┻ ┃ ┃ ╈
# LINE-NUMS-NEXT: ; SRC_COMPDIR{{[\\/]}}debug.c:3 ┌─ y = R0 # LINE-NUMS-NEXT: ; SRC_COMPDIR{{[\\/]}}debug.c:3 ┌─ y = R0
# LINE-NUMS-NEXT: 4: add r0, r0, r2 ╈ ┃ ┃ ┻ # LINE-NUMS-NEXT: 4: add r0, r0, r2 ╈ ┃ ┃ ┻
# LINE-NUMS-NEXT: ; SRC_COMPDIR{{[\\/]}}debug.c:4 ┃ ┃ ┃ # LINE-NUMS-NEXT: ; SRC_COMPDIR{{[\\/]}}debug.c:4 ┃ ┃ ┃
# LINE-NUMS-NEXT: 8: bx lr ┻ ┻ ┻ # LINE-NUMS-NEXT: 8: bx lr ┻ ┻ ┻
# LINE-NUMS-EMPTY: # LINE-NUMS-EMPTY:
# LINE-NUMS-NEXT: 0000000c <bar>: # LINE-NUMS-NEXT: 0000000c <bar>:
# LINE-NUMS-NEXT: ; bar(): # LINE-NUMS-NEXT: ; bar():
# LINE-NUMS-NEXT: ; SRC_COMPDIR{{[\\/]}}debug.c:8 ┠─ a = R0 # LINE-NUMS-NEXT: ; SRC_COMPDIR{{[\\/]}}debug.c:8 ┠─ a = R0
# LINE-NUMS-NEXT: c: add r0, r0, #1 ┃ # LINE-NUMS-NEXT: c: add r0, r0, #1 ┃
# LINE-NUMS-NEXT: ; SRC_COMPDIR{{[\\/]}}debug.c:9 ┃ # LINE-NUMS-NEXT: ; SRC_COMPDIR{{[\\/]}}debug.c:9 ┃
# LINE-NUMS-NEXT: 10: bx lr ┻ # LINE-NUMS-NEXT: 10: bx lr ┻
# SOURCE: 00000000 <foo>: # SOURCE: 00000000 <foo>:
# SOURCE-NEXT: ; int x = a + b; ┠─ a = R0 # SOURCE-NEXT: ; int x = a + b; ┠─ a = R0
# SOURCE-NEXT: ┃ ┠─ b = R1 # SOURCE-NEXT: ┃ ┠─ b = R1
# SOURCE-NEXT: ┃ ┃ ┠─ c = R2 # SOURCE-NEXT: ┃ ┃ ┠─ c = R2
# SOURCE-NEXT: ┃ ┃ ┃ ┌─ x = R0 # SOURCE-NEXT: ┃ ┃ ┃ ┌─ x = R0
# SOURCE-NEXT: 0: add r0, r1, r0 ┻ ┃ ┃ ╈ # SOURCE-NEXT: 0: add r0, r1, r0 ┻ ┃ ┃ ╈
# SOURCE-NEXT: ; int y = x + c; ┌─ y = R0 # SOURCE-NEXT: ; int y = x + c; ┌─ y = R0
# SOURCE-NEXT: 4: add r0, r0, r2 ╈ ┃ ┃ ┻ # SOURCE-NEXT: 4: add r0, r0, r2 ╈ ┃ ┃ ┻
# SOURCE-NEXT: ; return y; ┃ ┃ ┃ # SOURCE-NEXT: ; return y; ┃ ┃ ┃
# SOURCE-NEXT: 8: bx lr ┻ ┻ ┻ # SOURCE-NEXT: 8: bx lr ┻ ┻ ┻
# SOURCE-EMPTY: # SOURCE-EMPTY:
# SOURCE-NEXT: 0000000c <bar>: # SOURCE-NEXT: 0000000c <bar>:
# SOURCE-NEXT: ; a++; ┠─ a = R0 # SOURCE-NEXT: ; a++; ┠─ a = R0
# SOURCE-NEXT: c: add r0, r0, #1 ┃ # SOURCE-NEXT: c: add r0, r0, #1 ┃
# SOURCE-NEXT: ; return a; ┃ # SOURCE-NEXT: ; return a; ┃
# SOURCE-NEXT: 10: bx lr ┻ # SOURCE-NEXT: 10: bx lr ┻
# ASCII: 00000000 <foo>: # ASCII: 00000000 <foo>:
# ASCII-NEXT: |- a = R0 # ASCII-NEXT: |- a = R0
# ASCII-NEXT: | |- b = R1 # ASCII-NEXT: | |- b = R1
# ASCII-NEXT: | | |- c = R2 # ASCII-NEXT: | | |- c = R2
# ASCII-NEXT: | | | /- x = R0 # ASCII-NEXT: | | | /- x = R0
# ASCII-NEXT: 0: 00 00 81 e0 add r0, r1, r0 v | | ^ # ASCII-NEXT: 0: 00 00 81 e0 add r0, r1, r0 v | | ^
# ASCII-NEXT: /- y = R0 # ASCII-NEXT: /- y = R0
# ASCII-NEXT: 4: 02 00 80 e0 add r0, r0, r2 ^ | | v # ASCII-NEXT: 4: 02 00 80 e0 add r0, r0, r2 ^ | | v
# ASCII-NEXT: 8: 1e ff 2f e1 bx lr v v v # ASCII-NEXT: 8: 1e ff 2f e1 bx lr v v v
# ASCII-EMPTY: # ASCII-EMPTY:
# ASCII-NEXT: 0000000c <bar>: # ASCII-NEXT: 0000000c <bar>:
# ASCII-NEXT: |- a = R0 # ASCII-NEXT: |- a = R0
# ASCII-NEXT: c: 01 00 80 e2 add r0, r0, #1 | # ASCII-NEXT: c: 01 00 80 e2 add r0, r0, #1 |
# ASCII-NEXT: 10: 1e ff 2f e1 bx lr v # ASCII-NEXT: 10: 1e ff 2f e1 bx lr v
.text .text
.syntax unified .syntax unified
.eabi_attribute 67, "2.09" .eabi_attribute 67, "2.09"
.eabi_attribute 6, 10 .eabi_attribute 6, 10
.eabi_attribute 7, 65 .eabi_attribute 7, 65
.eabi_attribute 8, 1 .eabi_attribute 8, 1
.eabi_attribute 9, 2 .eabi_attribute 9, 2
▲ Show 20 Lines • Show All 299 Lines • Show Last 20 Lines

llvm/test/tools/llvm-objdump/ELF/ARM/debug-vars-wide-chars.s

# RUN: mkdir -p %t/a # RUN: mkdir -p %t/a
# RUN: cp %p/Inputs/wide-char.c %t/a/wide-char.c # RUN: cp %p/Inputs/wide-char.c %t/a/wide-char.c
# RUN: sed -e "s,SRC_COMPDIR,%/t/a,g" %s > %t.s # RUN: sed -e "s,SRC_COMPDIR,%/t/a,g" %s > %t.s
# RUN: llvm-mc -triple armv8a--none-eabi < %t.s -filetype=obj | \ # RUN: llvm-mc -triple armv8a--none-eabi < %t.s -filetype=obj | \
# RUN: llvm-objdump - -d --debug-vars --source | \ # RUN: llvm-objdump - -d --debug-vars --source | \
# RUN: FileCheck %s --strict-whitespace # RUN: FileCheck %s --strict-whitespace
## The Chinese character in the source does not print correctly on Windows. ## The Chinese character in the source does not print correctly on Windows.
# UNSUPPORTED: system-windows # UNSUPPORTED: system-windows
## Check that the --debug-vars option correctly aligns the variable display when ## Check that the --debug-vars option correctly aligns the variable display when
## the source code (printed by the -S option) includes East Asian wide ## the source code (printed by the -S option) includes East Asian wide
## characters. ## characters.
# CHECK: 00000000 <foo>: # CHECK: 00000000 <foo>:
# CHECK-NEXT: ; return *喵; ┠─ 喵 = R0 # CHECK-NEXT: ; return *喵; ┠─ 喵 = R0
# CHECK-NEXT: 0: 00 00 90 e5 ldr r0, [r0] ┻ # CHECK-NEXT: 0: 00 00 90 e5 ldr r0, [r0] ┻
# CHECK-NEXT: 4: 1e ff 2f e1 bx lr # CHECK-NEXT: 4: 1e ff 2f e1 bx lr
.text .text
.syntax unified .syntax unified
.eabi_attribute 67, "2.09" .eabi_attribute 67, "2.09"
.eabi_attribute 6, 10 .eabi_attribute 6, 10
.eabi_attribute 7, 65 .eabi_attribute 7, 65
.eabi_attribute 8, 1 .eabi_attribute 8, 1
.eabi_attribute 9, 2 .eabi_attribute 9, 2
▲ Show 20 Lines • Show All 206 Lines • Show Last 20 Lines

llvm/test/tools/llvm-objdump/X86/disassemble-print-comments.s

## Check that 'llvm-objdump -d' prints comments generated by the disassembler. ## Check that 'llvm-objdump -d' prints comments generated by the disassembler.
## Also check that printing comments does not break printing the locations of
## variables.
# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t # RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t
# RUN: llvm-objdump -d --no-show-raw-insn %t | FileCheck %s # RUN: llvm-objdump -d --debug-vars --no-show-raw-insn %t | FileCheck %s
# CHECK: 0000000000000000 <foo>: # CHECK: 0000000000000000 <foo>:
# CHECK-NEXT: 0: nop # CHECK-NEXT: ┠─ bar = RDX
# CHECK-NEXT: 1: cmpl $305419896, %eax # imm = 0x12345678 # CHECK-NEXT: 0: nop ┃
# CHECK-NEXT: 1: cmpl $305419896, %eax # imm = 0x12345678 ┻
.text .text
foo: foo:
nop nop
cmpl $0x12345678, %eax cmpl $0x12345678, %eax
.LFooEnd:
.section .debug_abbrev,"",@progbits
.uleb128 1 # Abbreviation Code
.uleb128 0x11 # DW_TAG_compile_unit
.byte 1 # DW_CHILDREN_yes
.byte 0 # EOM(1)
.byte 0 # EOM(2)
.uleb128 2 # Abbreviation Code
.uleb128 0x2e # DW_TAG_subprogram
.byte 1 # DW_CHILDREN_yes
.uleb128 0x11 # DW_AT_low_pc
.uleb128 0x01 # DW_FORM_addr
.uleb128 0x12 # DW_AT_high_pc
.uleb128 0x06 # DW_FORM_data4
.byte 0 # EOM(1)
.byte 0 # EOM(2)
.uleb128 3 # Abbreviation Code
.uleb128 0x34 # DW_TAG_variable
.byte 0 # DW_CHILDREN_no
.uleb128 0x02 # DW_AT_location
.uleb128 0x18 # DW_FORM_exprloc
.uleb128 0x03 # DW_AT_name
.uleb128 0x08 # DW_FORM_string
.byte 0 # EOM(1)
.byte 0 # EOM(2)
.byte 0 # EOM(3)
.section .debug_info,"",@progbits
.long .LCuEnd-.LCuBegin # Length of Unit
.LCuBegin:
.short 4 # DWARF version number
.long .debug_abbrev # Offset Into Abbrev. Section
.byte 8 # Address Size
.uleb128 1 # Abbrev [1] DW_TAG_compile_unit
.uleb128 2 # Abbrev [2] DW_TAG_subprogram
.quad foo # DW_AT_low_pc
.long .LFooEnd-foo # DW_AT_high_pc
.uleb128 3 # Abbrev [3] DW_TAG_variable
.byte .LLocEnd-.LLocBegin # DW_AT_location
.LLocBegin:
.byte 0x51 # DW_OP_reg1
.LLocEnd:
.asciz "bar" # DW_FORM_string
.byte 0 # End Of Children Mark
.byte 0 # End Of Children Mark
.LCuEnd:

llvm/tools/llvm-objdump/llvm-objdump.cpp

Show First 20 Lines • Show All 215 Lines • ▼ Show 20 Lines
std::string objdump::TripleName; std::string objdump::TripleName;
bool objdump::UnwindInfo; bool objdump::UnwindInfo;
static bool Wide; static bool Wide;
std::string objdump::Prefix; std::string objdump::Prefix;
uint32_t objdump::PrefixStrip; uint32_t objdump::PrefixStrip;
DebugVarsFormat objdump::DbgVariables = DVDisabled; DebugVarsFormat objdump::DbgVariables = DVDisabled;
int objdump::DbgIndent = 40; int objdump::DbgIndent = 52;
jhendersonUnsubmitted
Done
ReplyInline Actions

The default is mentioned in the command guide, so the doc needs updating as part of this patch.

jhenderson: The default is mentioned in the command guide, so the doc needs updating as part of this patch.
static StringSet<> DisasmSymbolSet; static StringSet<> DisasmSymbolSet;
StringSet<> objdump::FoundSectionSet; StringSet<> objdump::FoundSectionSet;
static StringRef ToolName; static StringRef ToolName;
namespace { namespace {
struct FilterResult { struct FilterResult {
// True if the section should not be skipped. // True if the section should not be skipped.
▲ Show 20 Lines • Show All 2,409 Lines • Show Last 20 Lines