code review 2595041: 8l: fix windows build

8l: fix windows build

[brainman, 2010-10-20 00:55:25]

Hello rsc (cc: golang-dev@googlegroups.com),

I'd like you to review this change.

[brainman, 2010-10-20 00:56:56]

Russ,

If you can suggest a better place to round up data section, just let me know.

[rsc, 2010-10-20 01:22:37]

Is the issue just that the data segment needs to
have a bunch of zeros on the end so that the file
is big enough?  datblk is just going to write extra
zeros.

Russ

[brainman, 2010-10-20 01:28:01]

> Is the issue just that the data segment needs to
> have a bunch of zeros on the end so that the file
> is big enough?  

Yes, that is the rule. But we have another section after ".data", it is for
linker to find and load all required dlls, the section has to be aligned on
INITRND.

> ... datblk is just going to write extra
> zeros.

That is OK.

[rsc, 2010-10-20 01:33:58]

> Yes, that is the rule. But we have another section after ".data", it is
> for linker to find and load all required dlls, the section has to be
> aligned on INITRND.

I see.  Maybe what writes that section could seek to
the right place instead of changing the datblk call?

Russ

[brainman, 2010-10-20 02:02:47]

Hello rsc (cc: golang-dev@googlegroups.com),

Please take another look.

[rsc1, 2010-10-20 02:08:01]

http://codereview.appspot.com/2595041/diff/10001/src/cmd/ld/pe.c
File src/cmd/ld/pe.c (right):

http://codereview.appspot.com/2595041/diff/10001/src/cmd/ld/pe.c#newcode209
src/cmd/ld/pe.c:209: strnput("", rnd(eof, INITRND) - eof);
please put the variable declaration (vlong eof;) at top of function, followed by
a blank line.

but you probably don't need the strnput or eof.  instead:

// seek to INITRND-aligned boundary at or past end of file.
seek(cout, rnd(seek(cout, 0, 2), INITRND), 0);

fine to split into two statements too.

[brainman, 2010-10-20 02:49:08]

Hello rsc (cc: golang-dev@googlegroups.com),

Please take another look.

[brainman, 2010-10-20 02:49:17]

http://codereview.appspot.com/2595041/diff/10001/src/cmd/ld/pe.c
File src/cmd/ld/pe.c (right):

http://codereview.appspot.com/2595041/diff/10001/src/cmd/ld/pe.c#newcode209
src/cmd/ld/pe.c:209: strnput("", rnd(eof, INITRND) - eof);
> please put the variable declaration (vlong eof;) at top of function, followed
by
> a blank line.

Done.

> but you probably don't need the strnput or eof.  instead:
> 
> // seek to INITRND-aligned boundary at or past end of file.
> seek(cout, rnd(seek(cout, 0, 2), INITRND), 0);
> 

Tried that before, but I have another seek(cout, 0, 2) in add_import_table that
erase any effect of this seek, so my end of file doesn't get adjusted. Or if we
decide to drop add_import_table altogether. I don't want my program to be
dependent on what happens somewhere else.

[rsc, 2010-10-20 03:02:09]

LGTM

Thanks for cleaning up after me.

[brainman, 2010-10-20 03:06:08]

*** Submitted as http://code.google.com/p/go/source/detail?r=80170f1a115d ***

8l: fix windows build

R=rsc
CC=golang-dev
http://codereview.appspot.com/2595041

[brainman, 2010-10-20 04:07:27]

On 2010/10/20 03:02:09, rsc wrote:
> Thanks for cleaning up after me.

I don't mind the change - code is much cleaner / simpler now <g>.