diff options
| -rw-r--r-- | llvm/test/tools/llvm-readobj/print-section.test | 8 | ||||
| -rw-r--r-- | llvm/tools/llvm-readobj/ELFDumper.cpp | 15 |
2 files changed, 4 insertions, 19 deletions
diff --git a/llvm/test/tools/llvm-readobj/print-section.test b/llvm/test/tools/llvm-readobj/print-section.test deleted file mode 100644 index 7cdd0ddc92b..00000000000 --- a/llvm/test/tools/llvm-readobj/print-section.test +++ /dev/null @@ -1,8 +0,0 @@ -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...]. diff --git a/llvm/tools/llvm-readobj/ELFDumper.cpp b/llvm/tools/llvm-readobj/ELFDumper.cpp index 6bf7a811e64..9a2be3100ac 100644 --- a/llvm/tools/llvm-readobj/ELFDumper.cpp +++ b/llvm/tools/llvm-readobj/ELFDumper.cpp @@ -3275,11 +3275,6 @@ void GNUStyle<ELFT>::printProgramHeaders(const ELFO *Obj) { } } -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) { @@ -3303,9 +3298,8 @@ void GNUStyle<ELFT>::printSectionAsString(const ELFO *Obj, CurrentWord++; continue; } - OS << format("[%6tx] ", CurrentWord - SecContent); - printAsPrintable(OS, StringRef(CurrentWord, WordSize)); - OS << '\n'; + OS << format("[%6tx]", CurrentWord - SecContent); + OS << format(" %.*s\n", WordSize, CurrentWord); CurrentWord += WordSize + 1; } OS.flush(); @@ -4367,9 +4361,8 @@ void LLVMStyle<ELFT>::printSectionAsString(const ELFO *Obj, W.startLine() << "[" << to_string( format_hex_no_prefix((CurrentWord - SecContent), 6)) - << "] "; - printAsPrintable(W.startLine(), StringRef(CurrentWord, WordSize)); - W.startLine() << '\n'; + << "]"; + W.startLine() << format(" %.*s\n", WordSize, CurrentWord); CurrentWord += WordSize + 1; } } |
