maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Simplify string output. NFC. 

llvm-svn: 292042
This commit is contained in:
Rui Ueyama 2017-01-15 01:11:47 +00:00
parent 543731f96a
commit 483ffa3365
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lld/COFF/MapFile.cpp
View File

@ -36,9 +36,7 @@ using namespace lld::coff;
static void writeOutSecLine(raw_fd_ostream &OS, uint64_t Address, uint64_t Size,
uint64_t Align, StringRef Name) {
OS << format_hex_no_prefix(Address, 8) << ' '
<< format_hex_no_prefix(Size, 8) << ' ' << format("%5x ", Align)
<< left_justify(Name, 7);
OS << format("%08x %08x %5x ", Address, Size, Align) << left_justify(Name, 7);
}
static void writeInSecLine(raw_fd_ostream &OS, uint64_t Address, uint64_t Size,
@ -89,9 +87,7 @@ static void writeSectionChunk(raw_fd_ostream &OS, const SectionChunk *SC,
static void writeMapFile2(raw_fd_ostream &OS,
ArrayRef<OutputSection *> OutputSections) {
OS << left_justify("Address", 8) << ' ' << left_justify("Size", 8)
<< ' ' << left_justify("Align", 5) << ' ' << left_justify("Out", 7) << ' '
<< left_justify("In", 7) << ' ' << left_justify("File", 7) << " Symbol\n";
OS << "Address Size Align Out In File Symbol\n";
for (OutputSection *Sec : OutputSections) {
uint32_t VA = Sec->getRVA();

6
lld/ELF/MapFile.cpp
View File

@ -35,8 +35,7 @@ using namespace lld::elf;
static void writeOutSecLine(raw_fd_ostream &OS, int Width, uint64_t Address,
uint64_t Size, uint64_t Align, StringRef Name) {
OS << format_hex_no_prefix(Address, Width) << ' '
<< format_hex_no_prefix(Size, Width) << ' ' << format("%5x ", Align)
OS << format("%0*x %0*x %5x ", Width, Address, Width, Size, Align)
<< left_justify(Name, 7);
}
@ -100,8 +99,7 @@ static void writeMapFile2(raw_fd_ostream &OS,
int Width = ELFT::Is64Bits ? 16 : 8;
OS << left_justify("Address", Width) << ' ' << left_justify("Size", Width)
<< ' ' << left_justify("Align", 5) << ' ' << left_justify("Out", 7) << ' '
<< left_justify("In", 7) << ' ' << left_justify("File", 7) << " Symbol\n";
<< " Align Out In File Symbol\n";
for (OutputSectionBase *Sec : OutputSections) {
writeOutSecLine(OS, Width, Sec->Addr, Sec->Size, Sec->Addralign,