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

Print alignment in decimal instead of hexadecimal. 

Previously, we were printing out something like this for
sections/symbols with alignment 16

  0000000000201000 0000000000000182    10 .data

which I think confusing. I think printing it in decimal is better.

Differential Revision: https://reviews.llvm.org/D29258

llvm-svn: 293685
This commit is contained in:
Rui Ueyama 2017-01-31 20:42:34 +00:00
parent 42932fb632
commit eb1ad400f9
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lld/COFF/MapFile.cpp
View File

@ -36,7 +36,7 @@ using namespace lld::coff;
static void writeOutSecLine(raw_fd_ostream &OS, uint64_t Address, uint64_t Size, static void writeOutSecLine(raw_fd_ostream &OS, uint64_t Address, uint64_t Size,
uint64_t Align, StringRef Name) { uint64_t Align, StringRef Name) {
OS << format("%08llx %08llx %5llx ", Address, Size, Align) OS << format("%08llx %08llx %5lld ", Address, Size, Align)
<< left_justify(Name, 7); << left_justify(Name, 7);
} }

2
lld/ELF/MapFile.cpp
View File

@ -35,7 +35,7 @@ using namespace lld::elf;
static void writeOutSecLine(raw_fd_ostream &OS, int Width, uint64_t Address, static void writeOutSecLine(raw_fd_ostream &OS, int Width, uint64_t Address,
uint64_t Size, uint64_t Align, StringRef Name) { uint64_t Size, uint64_t Align, StringRef Name) {
OS << format("%0*llx %0*llx %5llx ", Width, Address, Width, Size, Align) OS << format("%0*llx %0*llx %5lld ", Width, Address, Width, Size, Align)
<< left_justify(Name, 7); << left_justify(Name, 7);
} }

6
lld/test/COFF/lldmap.test
View File

@ -5,7 +5,7 @@
# RUN: FileCheck %s < %T/bar.map # RUN: FileCheck %s < %T/bar.map
# CHECK: Address Size Align Out In File Symbol # CHECK: Address Size Align Out In File Symbol
# CHECK-NEXT: 00001000 00000006 1000 .text # CHECK-NEXT: 00001000 00000006 4096 .text
# CHECK-NEXT: 00001000 00000006 10 .text$mn # CHECK-NEXT: 00001000 00000006 16 .text$mn
# CHECK-NEXT: 00001000 00000006 10 {{.*}}lldmap.test.tmp.obj # CHECK-NEXT: 00001000 00000006 16 {{.*}}lldmap.test.tmp.obj
# CHECK-NEXT: 00001000 00000006 0 main # CHECK-NEXT: 00001000 00000006 0 main

6
lld/test/ELF/map-file.s
View File

@ -24,7 +24,7 @@ bar:
.long bar - . .long bar - .
.long zed - . .long zed - .
local: local:
.comm common,4,4 .comm common,4,16
// CHECK: Address Size Align Out In File Symbol // CHECK: Address Size Align Out In File Symbol
// CHECK-NEXT: 0000000000200158 0000000000000030 8 .eh_frame // CHECK-NEXT: 0000000000200158 0000000000000030 8 .eh_frame
@ -45,8 +45,8 @@ local:
// CHECK-NEXT: 0000000000201014 0000000000000000 0 bah // CHECK-NEXT: 0000000000201014 0000000000000000 0 bah
// CHECK-NEXT: 0000000000201014 0000000000000001 4 {{.*}}{{/|\\}}map-file.s.tmp4.a(map-file.s.tmp4.o) // CHECK-NEXT: 0000000000201014 0000000000000001 4 {{.*}}{{/|\\}}map-file.s.tmp4.a(map-file.s.tmp4.o)
// CHECK-NEXT: 0000000000201014 0000000000000000 0 baz // CHECK-NEXT: 0000000000201014 0000000000000000 0 baz
// CHECK-NEXT: 0000000000202000 0000000000000004 4 .bss // CHECK-NEXT: 0000000000202000 0000000000000004 16 .bss
// CHECK-NEXT: 0000000000202000 0000000000000004 4 COMMON // CHECK-NEXT: 0000000000202000 0000000000000004 16 COMMON
// CHECK-NEXT: 0000000000000000 0000000000000008 1 .comment // CHECK-NEXT: 0000000000000000 0000000000000008 1 .comment
// CHECK-NEXT: 0000000000000000 00000000000000f0 8 .symtab // CHECK-NEXT: 0000000000000000 00000000000000f0 8 .symtab
// CHECK-NEXT: 0000000000000000 00000000000000f0 8 .symtab // CHECK-NEXT: 0000000000000000 00000000000000f0 8 .symtab