1
0
mirror of https://github.com/golang/go synced 2024-10-02 12:18:33 -06:00

cmd/link: introduce and use peSection.pad

Change-Id: I068e9bb6e692b5eff193ddb46af3f04785f98518
Reviewed-on: https://go-review.googlesource.com/56316
Reviewed-by: Ian Lance Taylor <iant@golang.org>
This commit is contained in:
Alex Brainman 2017-06-05 15:40:32 +10:00
parent c3552a9050
commit 2c3d13b210

View File

@ -428,6 +428,13 @@ func (sect *peSection) checkSegment(seg *Segment) {
} }
} }
// pad adds zeros to the section sect. It writes as many bytes
// as necessary to make section sect.SizeOfRawData bytes long.
// It assumes that n bytes are already written to the file.
func (sect *peSection) pad(n uint32) {
strnput("", int(sect.SizeOfRawData-n))
}
// write writes COFF section sect into the output file. // write writes COFF section sect into the output file.
func (sect *peSection) write() error { func (sect *peSection) write() error {
h := pe.SectionHeader32{ h := pe.SectionHeader32{
@ -727,7 +734,7 @@ func addimports(ctxt *Link, datsect *peSection) {
isect := pefile.addSection(".idata", int(n), int(n)) isect := pefile.addSection(".idata", int(n), int(n))
isect.Characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE isect.Characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE
isect.checkOffset(startoff) isect.checkOffset(startoff)
strnput("", int(uint64(isect.SizeOfRawData)-n)) isect.pad(uint32(n))
endoff := coutbuf.Offset() endoff := coutbuf.Offset()
// write FirstThunks (allocated in .data section) // write FirstThunks (allocated in .data section)
@ -861,7 +868,7 @@ func addexports(ctxt *Link) {
for i := 0; i < nexport; i++ { for i := 0; i < nexport; i++ {
strnput(dexport[i].Extname, len(dexport[i].Extname)+1) strnput(dexport[i].Extname, len(dexport[i].Extname)+1)
} }
strnput("", int(sect.SizeOfRawData-uint32(size))) sect.pad(uint32(size))
} }
// perelocsect relocates symbols from first in section sect, and returns // perelocsect relocates symbols from first in section sect, and returns
@ -1124,7 +1131,7 @@ func addpesymtable(ctxt *Link) {
// write COFF string table // write COFF string table
pefile.stringTable.write() pefile.stringTable.write()
if Linkmode != LinkExternal { if Linkmode != LinkExternal {
strnput("", int(h.SizeOfRawData-uint32(size))) h.pad(uint32(size))
} }
} }
@ -1163,7 +1170,7 @@ func addpersrc(ctxt *Link) {
} }
Cwrite(rsrcsym.P) Cwrite(rsrcsym.P)
strnput("", int(int64(h.SizeOfRawData)-rsrcsym.Size)) h.pad(uint32(rsrcsym.Size))
// update data directory // update data directory
dd[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = h.VirtualAddress dd[IMAGE_DIRECTORY_ENTRY_RESOURCE].VirtualAddress = h.VirtualAddress