RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-02-01 05:01:59 +01:00
Code Issues Projects Releases Wiki Activity

[llvm-objdump] - Stop reporting bogus section IDs.

Browse Source 
Imagine we have a file with few sections, and one of them is .foo
with index N != 0.

Problem is that when llvm-objdump is given a -section=.foo parameter
it lists .foo as a section at index 0. That makes impossible to write
test cases which needs to find the index of the particular section,
while ignoring dumping of others.

The patch fixes that.

Differential revision: https://reviews.llvm.org/D49372

llvm-svn: 337361
This commit is contained in:
George Rimar 2018-07-18 08:34:35 +00:00
parent 691d967bcc
commit 98853328e2
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
test/tools/llvm-objdump/X86/section-index.s Normal file
View File

@ -0,0 +1,25 @@
# RUN: llvm-mc %s -filetype=obj -triple=x86_64-pc-linux -o %t
# RUN: llvm-objdump -section-headers %t | FileCheck %s
# CHECK: Idx Name
# CHECK: 3 .foo
# CHECK-NEXT: 4 .bar
# CHECK-NEXT: 5 .zed
## Check we report the valid section index
## when requesting a specific section.
# RUN: llvm-objdump -section-headers -section=.bar %t \
# RUN: | FileCheck %s --check-prefix=BAR
# BAR: Idx Name
# BAR-NEXT: 4 .bar
# BAR-NOT: foo
# BAR-NOT: zed
.section .foo, "ax", %progbits
nop
.section .bar, "ax", %progbits
nop
.section .zed, "ax", %progbits
nop

7
tools/llvm-objdump/llvm-objdump.cpp
View File

@ -1815,7 +1815,6 @@ void llvm::PrintDynamicRelocations(const ObjectFile *Obj) {
void llvm::PrintSectionHeaders(const ObjectFile *Obj) {
outs() << "Sections:\n"
"Idx Name Size Address Type\n";
unsigned i = 0;
for (const SectionRef &Section : ToolSectionFilter(*Obj)) {
StringRef Name;
error(Section.getName(Name));
@ -1826,9 +1825,9 @@ void llvm::PrintSectionHeaders(const ObjectFile *Obj) {
bool BSS = Section.isBSS();
std::string Type = (std::string(Text ? "TEXT " : "") +
(Data ? "DATA " : "") + (BSS ? "BSS" : ""));
outs() << format("%3d %-13s %08" PRIx64 " %016" PRIx64 " %s\n", i,
Name.str().c_str(), Size, Address, Type.c_str());
++i;
outs() << format("%3d %-13s %08" PRIx64 " %016" PRIx64 " %s\n",
Section.getIndex(), Name.str().c_str(), Size, Address,
Type.c_str());
}
}