Skip to content

[llvm-objdump] improve disassembler symbol search #145253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

[llvm-objdump] improve disassembler symbol search #145253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
894d8d1
Change how labels are searched for by llvm-objdump
arjunUpatel Jun 18, 2025
ec782af
Update tests affected by cchange in search pattern
arjunUpatel Jun 18, 2025
bf0a486
Add tests
arjunUpatel Jun 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions cross-project-tests/tools/llvm-objdump/RISCV/riscv-sym-search.s
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# RUN: %clang --target=fuchsia-elf-riscv64 -march=rv64g %s -nostdlib -o %t
# RUN: llvm-objdump -d %t | FileCheck %s

# CHECK: auipc a0, 0x101
# CHECK: ld a0, 0x8(a0) <ldata+0x1000>
.global _start
.text
_start:
la a0, gdata

.skip 0x100000
ldata:
.int 0

.data
gdata:
.int 0
4 changes: 2 additions & 2 deletions lld/test/ELF/aarch64-feature-pauth.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,15 @@
# PACPLT: Disassembly of section .plt:
# PACPLT: <.plt>:
# PACPLT-NEXT: stp x16, x30, [sp, #-0x10]!
# PACPLT-NEXT: adrp x16, 0x30000 <func3+0x30000>
# PACPLT-NEXT: adrp x16, 0x30000 <_DYNAMIC+0x{{[0-9a-fA-F]+}}>
# PACPLT-NEXT: ldr x17, [x16, #0x[[B]]]
# PACPLT-NEXT: add x16, x16, #0x[[B]]
# PACPLT-NEXT: br x17
# PACPLT-NEXT: nop
# PACPLT-NEXT: nop
# PACPLT-NEXT: nop
# PACPLT: <func3@plt>:
# PACPLT-NEXT: adrp x16, 0x30000 <func3+0x30000>
# PACPLT-NEXT: adrp x16, 0x30000 <_DYNAMIC+0x{{[0-9a-fA-F]+}}>
# PACPLT-NEXT: ldr x17, [x16, #0x[[C]]]
# PACPLT-NEXT: add x16, x16, #0x[[C]]
# NOHINT-NEXT: braa x17, x16
Expand Down
4 changes: 2 additions & 2 deletions lld/test/ELF/aarch64-gnu-ifunc-plt.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
// DISASM: <bar>:
// DISASM-NEXT: 2102dc: ret
// DISASM: <_start>:
// DISASM-NEXT: 2102e0: bl 0x210330 <zed2+0x210330>
// DISASM-NEXT: 2102e4: bl 0x210340 <zed2+0x210340>
// DISASM-NEXT: 2102e0: bl 0x210330 <zed2@plt+0x10>
// DISASM-NEXT: 2102e4: bl 0x210340 <zed2@plt+0x20>
// DISASM-NEXT: 2102e8: bl 0x210310 <bar2@plt>
// DISASM-NEXT: 2102ec: bl 0x210320 <zed2@plt>
// DISASM-EMPTY:
Expand Down
2 changes: 1 addition & 1 deletion lld/test/ELF/i386-feature-cet.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@

# DISASM: Disassembly of section .text:
# DISASM: 00401200 <func1>:
# DISASM-NEXT: 401200: calll 0x401230 <func2+0x401230>
# DISASM-NEXT: 401200: calll 0x401230 <func1+0x30>
# DISASM-NEXT: 401205: calll 0x401240 <ifunc>
# DISASM-NEXT: retl

Expand Down
4 changes: 2 additions & 2 deletions lld/test/ELF/loongarch-relax-call36.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
# RELAX-NEXT: nop
# RELAX-NEXT: nop
## offset = .plt(0x10400)+32 - 0x10010 = 1040
# RELAX-NEXT: 10010: bl 1040 <bar+0x10420>
# RELAX-NEXT: b 1036 <bar+0x10420>
# RELAX-NEXT: 10010: bl 1040 <_start_end+0x404>
# RELAX-NEXT: b 1036 <_start_end+0x404>
# RELAX-EMPTY:
# RELAX-NEXT: <a>:
# RELAX-NEXT: 10018: ret
Expand Down
4 changes: 2 additions & 2 deletions lld/test/ELF/x86-64-feature-cet.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@

# DISASM: Disassembly of section .text:
# DISASM: 0000000000201330 <func1>:
# DISASM-NEXT: 201330: callq 0x201360 <func2+0x201360>
# DISASM-NEXT: 201335: callq 0x201370 <func2+0x201370>
# DISASM-NEXT: 201330: callq 0x201360 <ifunc+0x25>
# DISASM-NEXT: 201335: callq 0x201370 <ifunc+0x35>
# DISASM-NEXT: retq

# DISASM: Disassembly of section .plt:
Expand Down
27 changes: 11 additions & 16 deletions llvm/test/tools/llvm-objdump/X86/disassemble-same-section-addr.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,28 @@
## to reproduce the original failure.

## Two empty sections, one with symbol in, one without.
# RUN: yaml2obj %s --docnum=1 -o %t1 -D SIZE1=0 -D SIZE2=0 -D SECTION=.second -D INDEX=SHN_ABS
# RUN: yaml2obj %s --docnum=1 -o %t1 -D SIZE1=0 -D SIZE2=0 -D SECTION=.second -D INDEX=SHN_ABS -D VALUE=0x5
# RUN: llvm-objdump -d %t1 | FileCheck %s --check-prefix=TARGET
# RUN: yaml2obj %s --docnum=1 -o %t2 -D SIZE1=0 -D SIZE2=0 -D SECTION=.first -D INDEX=SHN_ABS
# RUN: yaml2obj %s --docnum=1 -o %t2 -D SIZE1=0 -D SIZE2=0 -D SECTION=.first -D INDEX=SHN_ABS -D VALUE=0x5
# RUN: llvm-objdump -d %t2 | FileCheck %s --check-prefix=TARGET

## Two sections, one empty with symbol, other non-empty, without symbol.
# RUN: yaml2obj %s --docnum=1 -o %t3 -D SIZE1=1 -D SIZE2=0 -D SECTION=.second -D INDEX=SHN_ABS
# RUN: yaml2obj %s --docnum=1 -o %t3 -D SIZE1=1 -D SIZE2=0 -D SECTION=.second -D INDEX=SHN_ABS -D VALUE=0x5
# RUN: llvm-objdump -d %t3 | FileCheck %s --check-prefix=TARGET
# RUN: yaml2obj %s --docnum=1 -o %t4 -D SIZE1=0 -D SIZE2=1 -D SECTION=.first -D INDEX=SHN_ABS
# RUN: yaml2obj %s --docnum=1 -o %t4 -D SIZE1=0 -D SIZE2=1 -D SECTION=.first -D INDEX=SHN_ABS -D VALUE=0x5
# RUN: llvm-objdump -d %t4 | FileCheck %s --check-prefix=TARGET

## Fall back to absolute symbol if no symbol found in candidate sections.
# RUN: yaml2obj %s --docnum=1 -o %t5 -D SIZE1=1 -D SIZE2=0 -D SECTION=.caller -D INDEX=SHN_ABS
## Fall back to absolute symbols if no symbol found in candidate sections.
# RUN: llvm-objcopy -N foo --add-symbol absol=0 %p/../ELF/Inputs/call-absolute-symbol.elf-x86_64 %t5
# RUN: llvm-objdump -d %t5 | FileCheck %s --check-prefix=ABSOLUTE

## Show that other symbols with reserved st_shndx values are treated as absolute
## symbols.
# RUN: yaml2obj %s --docnum=1 -o %t6 -D SIZE1=1 -D SIZE2=0 -D SECTION=.caller -D INDEX=SHN_LOPROC
# RUN: llvm-objdump -d %t6 | FileCheck %s --check-prefix=ABSOLUTE

## Print no target if no symbol in section/absolute symbol found.
# RUN: llvm-objcopy %t5 %t7 -N other
# RUN: llvm-objdump -d %t7 | FileCheck %s --check-prefix=FAIL
# RUN: llvm-objcopy %p/../ELF/Inputs/call-absolute-symbol.elf-x86_64 %t6 -N foo
# RUN: llvm-objdump -d %t6 | FileCheck %s --check-prefix=FAIL

# TARGET: callq 0x5 <target>
# ABSOLUTE: callq 0x5 <other+0x5>
# FAIL: callq 0x5{{$}}
# ABSOLUTE: callq 0x100 <absol+0x100>
# FAIL: callq 0x100{{$}}

--- !ELF
FileHeader:
Expand All @@ -58,7 +53,7 @@ Sections:
Symbols:
- Name: target
Section: [[SECTION]]
Value: 0x5
Value: [[VALUE]]
- Name: other
Index: [[INDEX]]
Value: 0x0
Expand Down
15 changes: 10 additions & 5 deletions llvm/tools/llvm-objdump/llvm-objdump.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2392,14 +2392,19 @@ disassembleObject(ObjectFile &Obj, const ObjectFile &DbgObj,
[=](const std::pair<uint64_t, SectionRef> &O) {
return O.first <= Target;
});
uint64_t TargetSecAddr = 0;
uint64_t TargetSecAddr = It == SectionAddresses.end() ? 0 : It->first;
bool FoundSymbols = false;
while (It != SectionAddresses.begin()) {
--It;
if (TargetSecAddr == 0)
if (It->first != TargetSecAddr) {
if (FoundSymbols)
break;
TargetSecAddr = It->first;
if (It->first != TargetSecAddr)
break;
TargetSectionSymbols.push_back(&AllSymbols[It->second]);
}
auto *SectionSymbols = &AllSymbols[It->second];
TargetSectionSymbols.push_back(SectionSymbols);
if (!SectionSymbols->empty())
FoundSymbols = true;
}
} else {
TargetSectionSymbols.push_back(&Symbols);
Expand Down