<div dir="ltr">Can you make the same change for COFF so that the two are not going to unnecessarily diverge?</div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Aug 14, 2015 at 12:54 AM, Rafael Espindola via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rafael<br>
Date: Thu Aug 13 10:54:36 2015<br>
New Revision: 244904<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=244904&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=244904&view=rev</a><br>
Log:<br>
Store the offset in the output section, no in the file.<br>
<br>
That is the value that is stable as the we layout the output sections.<br>
<br>
Modified:<br>
lld/trunk/ELF/Chunks.cpp<br>
lld/trunk/ELF/Chunks.h<br>
lld/trunk/ELF/Writer.cpp<br>
<br>
Modified: lld/trunk/ELF/Chunks.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Chunks.cpp?rev=244904&r1=244903&r2=244904&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Chunks.cpp?rev=244904&r1=244903&r2=244904&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/Chunks.cpp (original)<br>
+++ lld/trunk/ELF/Chunks.cpp Thu Aug 13 10:54:36 2015<br>
@@ -33,7 +33,7 @@ template <class ELFT> void SectionChunk<<br>
return;<br>
// Copy section contents from source object file to output file.<br>
ArrayRef<uint8_t> Data = *Obj->getSectionContents(Header);<br>
- memcpy(Buf + FileOff, Data.data(), Data.size());<br>
+ memcpy(Buf + OutputSectionOff, Data.data(), Data.size());<br>
<br>
// FIXME: Relocations<br>
}<br>
<br>
Modified: lld/trunk/ELF/Chunks.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Chunks.h?rev=244904&r1=244903&r2=244904&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Chunks.h?rev=244904&r1=244903&r2=244904&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/Chunks.h (original)<br>
+++ lld/trunk/ELF/Chunks.h Thu Aug 13 10:54:36 2015<br>
@@ -37,17 +37,18 @@ public:<br>
virtual void writeTo(uint8_t *Buf) = 0;<br>
<br>
// The writer sets and uses the addresses.<br>
- uint64_t getFileOff() { return FileOff; }<br>
+ uint64_t getOutputSectionOff() { return OutputSectionOff; }<br>
uint32_t getAlign() { return Align; }<br>
- void setFileOff(uint64_t V) { FileOff = V; }<br>
+ void setOutputSectionOff(uint64_t V) { OutputSectionOff = V; }<br>
<br>
// Returns the section name if this is a section chunk.<br>
// It is illegal to call this function on non-section chunks.<br>
virtual StringRef getSectionName() const = 0;<br>
<br>
protected:<br>
- // The offset from beginning of the output file. The writer sets a value.<br>
- uint64_t FileOff = 0;<br>
+ // The offset from beginning of the output sections this chunk was assigned<br>
+ // to. The writer sets a value.<br>
+ uint64_t OutputSectionOff = 0;<br>
<br>
// The alignment of this chunk. The writer uses the value.<br>
uint32_t Align = 1;<br>
<br>
Modified: lld/trunk/ELF/Writer.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.cpp?rev=244904&r1=244903&r2=244904&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.cpp?rev=244904&r1=244903&r2=244904&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/ELF/Writer.cpp (original)<br>
+++ lld/trunk/ELF/Writer.cpp Thu Aug 13 10:54:36 2015<br>
@@ -50,8 +50,8 @@ public:<br>
<br>
// Returns the size of the section in the output file.<br>
uintX_t getSize() { return Header.sh_size; }<br>
-<br>
uintX_t getFlags() { return Header.sh_flags; }<br>
+ uintX_t getOffset() { return Header.sh_offset; }<br>
<br>
private:<br>
StringRef Name;<br>
@@ -122,8 +122,6 @@ template <class ELFT> void OutputSection<br>
if (Header.sh_size == 0)<br>
return;<br>
Header.sh_offset = Off;<br>
- for (Chunk *C : Chunks)<br>
- C->setFileOff(C->getFileOff() + Off);<br>
}<br>
<br>
template <class ELFT><br>
@@ -131,7 +129,7 @@ void OutputSection<ELFT>::addSectionChun<br>
Chunks.push_back(C);<br>
uintX_t Off = Header.sh_size;<br>
Off = RoundUpToAlignment(Off, C->getAlign());<br>
- C->setFileOff(Off);<br>
+ C->setOutputSectionOff(Off);<br>
Off += C->getSize();<br>
Header.sh_size = Off;<br>
Header.sh_type = C->getSectionHdr()->sh_type;<br>
@@ -275,8 +273,9 @@ template <class ELFT> void Writer<ELFT>:<br>
template <class ELFT> void Writer<ELFT>::writeSections() {<br>
uint8_t *Buf = Buffer->getBufferStart();<br>
for (OutputSection<ELFT> *Sec : OutputSections) {<br>
+ uint8_t *SecBuf = Buf + Sec->getOffset();<br>
for (Chunk *C : Sec->getChunks())<br>
- C->writeTo(Buf);<br>
+ C->writeTo(SecBuf);<br>
}<br>
<br>
// String table.<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>