[PATCH] D48271: [llvm-readobj] Fix printing format
Paul Semel via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Sun Jul 1 02:56:43 PDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rL336058: [llvm-readobj] Fix printing format (authored by paulsemel, committed by ).
Changed prior to commit:
https://reviews.llvm.org/D48271?vs=153522&id=153648#toc
Repository:
rL LLVM
https://reviews.llvm.org/D48271
Files:
llvm/trunk/test/tools/llvm-readobj/print-section.test
llvm/trunk/tools/llvm-readobj/ELFDumper.cpp
Index: llvm/trunk/test/tools/llvm-readobj/print-section.test
===================================================================
--- llvm/trunk/test/tools/llvm-readobj/print-section.test
+++ llvm/trunk/test/tools/llvm-readobj/print-section.test
@@ -0,0 +1,8 @@
+RUN: llvm-readobj -p .text %p/Inputs/elf-groups.x86_64 \
+RUN: | FileCheck %s
+
+CHECK: [000000] UH..H....E.
+CHECK: [00000f] .E.x.E..
+CHECK: [00001a] ..}..
+CHECK: [000023] .}..
+CHECK: [00002b] 1.H...].
Index: llvm/trunk/tools/llvm-readobj/ELFDumper.cpp
===================================================================
--- llvm/trunk/tools/llvm-readobj/ELFDumper.cpp
+++ llvm/trunk/tools/llvm-readobj/ELFDumper.cpp
@@ -3275,6 +3275,11 @@
}
}
+void printAsPrintable(raw_ostream &W, StringRef S) {
+ for (char C : S)
+ W << (isprint(C) ? C : '.');
+}
+
template <class ELFT>
void GNUStyle<ELFT>::printSectionAsString(const ELFO *Obj,
StringRef SectionName) {
@@ -3298,8 +3303,9 @@
CurrentWord++;
continue;
}
- OS << format("[%6tx]", CurrentWord - SecContent);
- OS << format(" %.*s\n", WordSize, CurrentWord);
+ OS << format("[%6tx] ", CurrentWord - SecContent);
+ printAsPrintable(OS, StringRef(CurrentWord, WordSize));
+ OS << '\n';
CurrentWord += WordSize + 1;
}
OS.flush();
@@ -4361,8 +4367,9 @@
W.startLine() << "["
<< to_string(
format_hex_no_prefix((CurrentWord - SecContent), 6))
- << "]";
- W.startLine() << format(" %.*s\n", WordSize, CurrentWord);
+ << "] ";
+ printAsPrintable(W.startLine(), StringRef(CurrentWord, WordSize));
+ W.startLine() << '\n';
CurrentWord += WordSize + 1;
}
}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D48271.153648.patch
Type: text/x-patch
Size: 1775 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180701/78938db9/attachment.bin>
More information about the llvm-commits
mailing list