[ELF] - (-Map file) Implement printing of LMA for assignments outside of section declarations.

[grimar]

Summary

This was a missing piece.
We started to print LMAs and information about assignments,
but did not do that for assignments outside of section declarations yet.
The patch implements it.

[grimar]

• Rebased. Ping.

[ruiu]

LGTM

ELF/MapFile.cpp

void elf::writeMapFile() {
   SymbolMapTy SectionSyms = getSectionSyms(Syms);
   DenseMap<Symbol *, std::string> SymStr = getSymbolStrings(Syms);
 
   // Print out the header line.
   int W = Config->Is64 ? 16 : 8;
   OS << right_justify("VMA", W) << ' ' << right_justify("LMA", 9) << ' '
      << right_justify("Size", W) << " Align Out     In      Symbol\n";
 
+  OutputSection* LastOS = nullptr;
   for (BaseCommand *Base : Script->SectionCommands) {
     if (auto *Cmd = dyn_cast<SymbolAssignment>(Base)) {
       if (Cmd->Provide && !Cmd->Sym)
         continue;
-      //FIXME: calculate and print LMA.
-      writeHeader(OS, Cmd->Addr, 0, Cmd->Size, 1);
+      uint64_t LMA =
+          LastOS ? LastOS->getLMA() + Cmd->Addr - LastOS->getVA(0) : 0;
+      writeHeader(OS, Cmd->Addr, LMA, Cmd->Size, 1);
       OS << Cmd->CommandString << '\n';
       continue;
     }
 
     auto *OSec = dyn_cast<OutputSection>(Base);
     if (!OSec)
       continue;
+    LastOS = OSec;
 
     writeHeader(OS, OSec->Addr, OSec->getLMA(), OSec->Size, OSec->Alignment);
     OS << OSec->Name << '\n';
 
     // Dump symbols for each input section.
     for (BaseCommand *Base : OSec->SectionCommands) {
       if (auto *ISD = dyn_cast<InputSectionDescription>(Base)) {
         for (InputSection *IS : ISD->Sections) {

test/ELF/linkerscript/map-file.test

 # CHECK-NEXT:   1007      1007                8     1         QUAD ( 0x1122334455667788 )
 # CHECK-NEXT:   100f      100f                0     1         PROVIDE_HIDDEN ( sym4 = . )
 # CHECK-NEXT:   100f      100f             1000     1         . += 0x1000
 # CHECK-NEXT:   200f      200f                8     1         {{.*}}{{/|\\}}map-file.test.tmp.o:(.foo.1)
 # CHECK-NEXT:   2017      2017                0     1         HIDDEN ( sym6 = . )
 # CHECK-NEXT:   2017      2017              246     1         . += 0x123 * ( 1 + 1 )
 # CHECK-NEXT:   225d      225d                0     1         foo = .
 # CHECK-NEXT:   225d      225d                0     1         bar = 0x42 - 0x26
-# CHECK-NEXT:   225d         0                0     1 sym1 = .
-# CHECK-NEXT:   225d         0              500     1 . += 0x500
-# CHECK-NEXT:   275d         0                0     1 sym2 = .
-# CHECK-NEXT:   275d         0                0     1 PROVIDE ( sym3 = 42 )
+# CHECK-NEXT:   225d      225d                0     1 sym1 = .
+# CHECK-NEXT:   225d      225d              500     1 . += 0x500
+# CHECK-NEXT:   275d      275d                0     1 sym2 = .
+# CHECK-NEXT:   275d      275d                0     1 PROVIDE ( sym3 = 42 )
 # CHECK-NEXT:   2760      2760               10     4 .text
 # CHECK-NEXT:   2760      2760               10     4         {{.*}}{{/|\\}}map-file.test.tmp.o:(.text)
 # CHECK-NEXT:      0         0                8     1 .comment
 # CHECK-NEXT:      0         0                8     1         <internal>:(.comment)
 # CHECK-NEXT:      0         0               c0     8 .symtab
 # CHECK-NEXT:      0         0               c0     8         <internal>:(.symtab)
 # CHECK-NEXT:      0         0               2f     1 .shstrtab
 # CHECK-NEXT:      0         0               2f     1         <internal>:(.shstrtab)
 # CHECK-NEXT:      0         0               22     1 .strtab
 # CHECK-NEXT:      0         0               22     1         <internal>:(.strtab)

test/ELF/linkerscript/map-file2.test

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/map-file2.s -o %t.o
 # RUN: ld.lld -o %t %t.o -Map=%t.map --script %s
 # RUN: FileCheck -strict-whitespace %s < %t.map
 
 SECTIONS {
   . = 0x1000;
   .aaa : { *(.aaa.*) }
   .bbb : AT(0x2000) { *(.bbb.*) }
   .ccc : AT(0x3000) { *(.ccc.*) }
+  . += 0x100;
   .ddd : {
     BYTE(0x11)
     . += 0x100;
     *(.ddd.*)
   }
   .text : { *(.text.*) }
 }
 
 # CHECK:             VMA       LMA             Size Align Out     In      Symbol
 # CHECK-NEXT:          0         0             1000     1 . = 0x1000
 # CHECK-NEXT:       1000      1000                8     1 .aaa
 # CHECK-NEXT:       1000      1000                8     1         {{.*}}{{/|\\}}map-file2.test.tmp.o:(.aaa)
 # CHECK-NEXT:       1008      2000                8     1 .bbb
 # CHECK-NEXT:       1008      2000                8     1         {{.*}}{{/|\\}}map-file2.test.tmp.o:(.bbb)
 # CHECK-NEXT:       1010      3000                8     1 .ccc
 # CHECK-NEXT:       1010      3000                8     1         {{.*}}{{/|\\}}map-file2.test.tmp.o:(.ccc)
-# CHECK-NEXT:       1018      3008              109     1 .ddd
-# CHECK-NEXT:       1018      3008                1     1         BYTE ( 0x11 )
-# CHECK-NEXT:       1019      3009              100     1         . += 0x100
-# CHECK-NEXT:       1119      3109                8     1         {{.*}}{{/|\\}}map-file2.test.tmp.o:(.ddd)
-# CHECK-NEXT:       1124      3114                1     4 .text
-# CHECK-NEXT:       1124      3114                1     4         {{.*}}{{/|\\}}map-file2.test.tmp.o:(.text)
-# CHECK-NEXT:       1124      3114                0     1                 f(int)
-# CHECK-NEXT:       1124      3114                0     1                 _start
-# CHECK-NEXT:       1128      3118               30     8 .eh_frame
-# CHECK-NEXT:       1128      3118               30     1         {{.*}}{{/|\\}}map-file2.test.tmp.o:(.eh_frame+0x0)
+# CHECK-NEXT:       1018      3008              100     1 . += 0x100
+# CHECK-NEXT:       1118      3108              109     1 .ddd
+# CHECK-NEXT:       1118      3108                1     1         BYTE ( 0x11 )
+# CHECK-NEXT:       1119      3109              100     1         . += 0x100
+# CHECK-NEXT:       1219      3209                8     1         {{.*}}{{/|\\}}map-file2.test.tmp.o:(.ddd)
+# CHECK-NEXT:       1224      3214                1     4 .text
+# CHECK-NEXT:       1224      3214                1     4         {{.*}}{{/|\\}}map-file2.test.tmp.o:(.text)
+# CHECK-NEXT:       1224      3214                0     1                 f(int)
+# CHECK-NEXT:       1224      3214                0     1                 _start
+# CHECK-NEXT:       1228      3218               30     8 .eh_frame
+# CHECK-NEXT:       1228      3218               30     1         {{.*}}{{/|\\}}map-file2.test.tmp.o:(.eh_frame+0x0)
 # CHECK-NEXT:          0         0                8     1 .comment
 # CHECK-NEXT:          0         0                8     1         <internal>:(.comment)
 # CHECK-NEXT:          0         0               48     8 .symtab
 # CHECK-NEXT:          0         0               48     8         <internal>:(.symtab)
 # CHECK-NEXT:          0         0               48     1 .shstrtab
 # CHECK-NEXT:          0         0               48     1         <internal>:(.shstrtab)
 # CHECK-NEXT:          0         0                e     1 .strtab
 # CHECK-NEXT:          0         0                e     1         <internal>:(.strtab)