<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Thu, Feb 5, 2015 at 8:15 PM, Shankar Easwaran <span dir="ltr"><<a href="mailto:shankare@codeaurora.org" target="_blank">shankare@codeaurora.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: shankare<br>
Date: Thu Feb  5 22:15:04 2015<br>
New Revision: 228377<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=228377&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=228377&view=rev</a><br>
Log:<br>
[ELF] Speedup creating program headers.<br>
<br>
After the total number of program headers are determined, virtual addresses<br>
and file offsets need not be reassigned for sections whose virtual addresses and<br>
fileoffsets remained the same.<br>
<br>
This doesnot change any functionality.<br>
<br>
Modified:<br>
    lld/trunk/lib/ReaderWriter/ELF/DefaultLayout.h<br>
<br>
Modified: lld/trunk/lib/ReaderWriter/ELF/DefaultLayout.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/DefaultLayout.h?rev=228377&r1=228376&r2=228377&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/DefaultLayout.h?rev=228377&r1=228376&r2=228377&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/lib/ReaderWriter/ELF/DefaultLayout.h (original)<br>
+++ lld/trunk/lib/ReaderWriter/ELF/DefaultLayout.h Thu Feb  5 22:15:04 2015<br>
@@ -755,7 +755,7 @@ DefaultLayout<ELFT>::assignVirtualAddres<br>
<br>
   std::sort(_segments.begin(), _segments.end(), Segment<ELFT>::compareSegments);<br>
<br>
-  uint64_t virtualAddress = _context.getBaseAddress();<br>
+  uint64_t baseAddress = _context.getBaseAddress();<br>
<br>
   // HACK: This is a super dirty hack. The elf header and program header are<br>
   // not part of a section, but we need them to be loaded at the base address<br>
@@ -774,6 +774,7 @@ DefaultLayout<ELFT>::assignVirtualAddres<br>
   firstLoadSegment->prepend(_elfHeader);<br>
   bool newSegmentHeaderAdded = true;<br>
   bool virtualAddressAssigned = false;<br>
+  bool fileOffsetAssigned = false;<br>
   while (true) {<br>
     for (auto si : _segments) {<br>
       si->finalize();<br>
@@ -783,8 +784,8 @@ DefaultLayout<ELFT>::assignVirtualAddres<br>
     }<br>
     if (!newSegmentHeaderAdded && virtualAddressAssigned)<br>
       break;<br>
-    virtualAddressAssigned = true;<br>
-    uint64_t address = virtualAddress;<br>
+    uint64_t address = baseAddress;<br>
+    ;<br></blockquote><div><br></div><div>Stray ';' here.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
     // start assigning virtual addresses<br>
     for (auto &si : _segments) {<br>
       if ((si->segmentType() != llvm::ELF::PT_LOAD) &&<br>
@@ -794,18 +795,27 @@ DefaultLayout<ELFT>::assignVirtualAddres<br>
       if (si->segmentType() == llvm::ELF::PT_NULL) {<br>
         si->assignVirtualAddress(0 /*non loadable*/);<br>
       } else {<br>
+        if (virtualAddressAssigned && (address != baseAddress) &&<br>
+            (address == si->virtualAddr()))<br>
+          break;<br>
         si->assignVirtualAddress(address);<br>
       }<br>
       address = si->virtualAddr() + si->memSize();<br>
     }<br>
-    uint64_t fileoffset = 0;<br>
+    uint64_t baseFileOffset = 0;<br>
+    uint64_t fileoffset = baseFileOffset;<br>
     for (auto &si : _segments) {<br>
       if ((si->segmentType() != llvm::ELF::PT_LOAD) &&<br>
           (si->segmentType() != llvm::ELF::PT_NULL))<br>
         continue;<br>
+      if (fileOffsetAssigned && (fileoffset != baseFileOffset) &&<br>
+          (fileoffset == si->fileOffset()))<br>
+        break;<br>
       si->assignFileOffsets(fileoffset);<br>
       fileoffset = si->fileOffset() + si->fileSize();<br>
     }<br>
+    virtualAddressAssigned = true;<br>
+    fileOffsetAssigned = true;<br>
     _programHeader->resetProgramHeaders();<br>
   }<br>
   Section<ELFT> *section;<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>