Skip to content

[llvm-readobj][NFC] Don't use startLine in a middle of a line in ObjDumper. #102071

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

Merged
merged 1 commit into from
Aug 6, 2024
Merged

[llvm-readobj][NFC] Don't use startLine in a middle of a line in ObjDumper. #102071

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 16 additions & 14 deletions llvm/tools/llvm-readobj/ObjDumper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,16 +82,16 @@ void ObjDumper::printAsStringList(StringRef StringContent,
continue;
}
W.startLine() << format("[%6tx] ", CurrentWord - StrContent);
printAsPrintable(W.startLine(), CurrentWord, WordSize);
W.startLine() << '\n';
printAsPrintable(W.getOStream(), CurrentWord, WordSize);
W.getOStream() << '\n';
CurrentWord += WordSize + 1;
}
}

void ObjDumper::printFileSummary(StringRef FileStr, object::ObjectFile &Obj,
ArrayRef<std::string> InputFilenames,
const object::Archive *A) {
W.startLine() << "\n";
W.getOStream() << "\n";
W.printString("File", FileStr);
W.printString("Format", Obj.getFileFormatName());
W.printString("Arch", Triple::getArchTypeName(Obj.getArch()));
Expand Down Expand Up @@ -163,7 +163,8 @@ void ObjDumper::printSectionsAsString(const object::ObjectFile &Obj,
for (object::SectionRef Section :
getSectionRefsByNameOrIndex(Obj, Sections)) {
StringRef SectionName = unwrapOrError(Obj.getFileName(), Section.getName());
W.startLine() << "\nString dump of section '" << SectionName << "':\n";
W.getOStream() << '\n';
W.startLine() << "String dump of section '" << SectionName << "':\n";

StringRef SectionContent =
unwrapOrError(Obj.getFileName(), Section.getContents());
Expand All @@ -180,7 +181,8 @@ void ObjDumper::printSectionsAsHex(const object::ObjectFile &Obj,
for (object::SectionRef Section :
getSectionRefsByNameOrIndex(Obj, Sections)) {
StringRef SectionName = unwrapOrError(Obj.getFileName(), Section.getName());
W.startLine() << "\nHex dump of section '" << SectionName << "':\n";
W.getOStream() << '\n';
W.startLine() << "Hex dump of section '" << SectionName << "':\n";

StringRef SectionContent =
unwrapOrError(Obj.getFileName(), Section.getContents());
Expand All @@ -196,13 +198,13 @@ void ObjDumper::printSectionsAsHex(const object::ObjectFile &Obj,

W.startLine() << format_hex(Section.getAddress() + (SecPtr - SecContent),
10);
W.startLine() << ' ';
W.getOStream() << ' ';
for (i = 0; TmpSecPtr < SecEnd && i < 4; ++i) {
for (k = 0; TmpSecPtr < SecEnd && k < 4; k++, TmpSecPtr++) {
uint8_t Val = *(reinterpret_cast<const uint8_t *>(TmpSecPtr));
W.startLine() << format_hex_no_prefix(Val, 2);
W.getOStream() << format_hex_no_prefix(Val, 2);
}
W.startLine() << ' ';
W.getOStream() << ' ';
}

// We need to print the correct amount of spaces to match the format.
Expand All @@ -211,17 +213,17 @@ void ObjDumper::printSectionsAsHex(const object::ObjectFile &Obj,
// Least, if we cut in a middle of a row, we add the remaining characters,
// which is (8 - (k * 2)).
if (i < 4)
W.startLine() << format("%*c", (4 - i) * 8 + (4 - i), ' ');
W.getOStream() << format("%*c", (4 - i) * 8 + (4 - i), ' ');
if (k < 4)
W.startLine() << format("%*c", 8 - k * 2, ' ');
W.getOStream() << format("%*c", 8 - k * 2, ' ');

TmpSecPtr = SecPtr;
for (i = 0; TmpSecPtr + i < SecEnd && i < 16; ++i)
W.startLine() << (isPrint(TmpSecPtr[i])
? static_cast<char>(TmpSecPtr[i])
: '.');
W.getOStream() << (isPrint(TmpSecPtr[i])
? static_cast<char>(TmpSecPtr[i])
: '.');

W.startLine() << '\n';
W.getOStream() << '\n';
}
}
}
Expand Down