code review 3391044: runtime: fix build for nacl

runtime: fix build for nacl

[adg, 2010-12-07 04:19:53]

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

I'd like you to review this change.

[lvd, 2010-12-07 04:22:53]

LGTM. not the whole story yet tho.

On Tue, Dec 7, 2010 at 05:19, <adg@golang.org> wrote:

> Reviewers: lvd,
>
> Message:
> Hello lvd (cc: golang-dev@googlegroups.com),
>
> I'd like you to review this change.
>
>
> Description:
> runtime: fix build for nacl
>
> Please review this at http://codereview.appspot.com/3391044/
>
> Affected files:
>  M src/pkg/runtime/nacl/386/closure.c
>
>
> Index: src/pkg/runtime/nacl/386/closure.c
> ===================================================================
> --- a/src/pkg/runtime/nacl/386/closure.c
> +++ b/src/pkg/runtime/nacl/386/closure.c
> @@ -38,7 +38,7 @@
>  #include "malloc.h"
>
>  // NaCl system call to copy data into text segment.
> -extern int32 dyncode_copy(void*, void*, int32);
> +extern int32 runtime·dyncode_copy(void*, void*, int32);
>
>  enum{
>        // Allocate chunks of 4096 bytes worth of closures:
> @@ -168,8 +168,8 @@
>                        // segment and beginning of data.
>                        clos.code = (byte*)(((uintptr)etext + 65535) &
> ~65535);
>                        clos.ecode = clos.code;
> -                       mheap.closure_min = clos.code;
> -                       mheap.closure_max = rodata;
> +                       runtime·mheap.closure_min = clos.code;
> +                       runtime·mheap.closure_max = rodata;
>                }
>                if(clos.ecode+ClosureChunk > rodata) {
>                        // Last ditch effort: garbage collect and hope.
> @@ -218,7 +218,7 @@
>
>                e = runtime·dyncode_copy(clos.ecode, clos.buf,
> ClosureChunk);
>                if(e != 0) {
> -                       fd = 2;
> +                       runtime·fd = 2;
>                        if(e == -22)
>                                runtime·throw("NaCl running with
> dyncode_copy disabled; export NACLDYNCODE=1 in your environment");
>                        runtime·printf("dyncode_copy: error %d\n", e);
> @@ -240,7 +240,7 @@
>        d->siz = siz;
>        runtime·mcpy((byte*)(d+1), (byte*)&arg0, siz);
>        *codeptr(p) = d;
> -       runtime·addfinalizer(f, finclosure, 0);
> +       runtime·addfinalizer(f, runtime·finclosure, 0);
>        runtime·unlock(&clos);
>
>        *ret = p;
>
>
>

[adg, 2010-12-07 04:24:51]

By no means. Just a piece of the puzzle.

On 7 December 2010 15:22, Luuk van Dijk <lvd@google.com> wrote:
> LGTM. not the whole story yet tho.
>
> On Tue, Dec 7, 2010 at 05:19, <adg@golang.org> wrote:
>>
>> Reviewers: lvd,
>>
>> Message:
>> Hello lvd (cc: golang-dev@googlegroups.com),
>>
>> I'd like you to review this change.
>>
>>
>> Description:
>> runtime: fix build for nacl
>>
>> Please review this at http://codereview.appspot.com/3391044/
>>
>> Affected files:
>>  M src/pkg/runtime/nacl/386/closure.c
>>
>>
>> Index: src/pkg/runtime/nacl/386/closure.c
>> ===================================================================
>> --- a/src/pkg/runtime/nacl/386/closure.c
>> +++ b/src/pkg/runtime/nacl/386/closure.c
>> @@ -38,7 +38,7 @@
>>  #include "malloc.h"
>>
>>  // NaCl system call to copy data into text segment.
>> -extern int32 dyncode_copy(void*, void*, int32);
>> +extern int32 runtime·dyncode_copy(void*, void*, int32);
>>
>>  enum{
>>        // Allocate chunks of 4096 bytes worth of closures:
>> @@ -168,8 +168,8 @@
>>                        // segment and beginning of data.
>>                        clos.code = (byte*)(((uintptr)etext + 65535) &
>> ~65535);
>>                        clos.ecode = clos.code;
>> -                       mheap.closure_min = clos.code;
>> -                       mheap.closure_max = rodata;
>> +                       runtime·mheap.closure_min = clos.code;
>> +                       runtime·mheap.closure_max = rodata;
>>                }
>>                if(clos.ecode+ClosureChunk > rodata) {
>>                        // Last ditch effort: garbage collect and hope.
>> @@ -218,7 +218,7 @@
>>
>>                e = runtime·dyncode_copy(clos.ecode, clos.buf,
>> ClosureChunk);
>>                if(e != 0) {
>> -                       fd = 2;
>> +                       runtime·fd = 2;
>>                        if(e == -22)
>>                                runtime·throw("NaCl running with
>> dyncode_copy disabled; export NACLDYNCODE=1 in your environment");
>>                        runtime·printf("dyncode_copy: error %d\n", e);
>> @@ -240,7 +240,7 @@
>>        d->siz = siz;
>>        runtime·mcpy((byte*)(d+1), (byte*)&arg0, siz);
>>        *codeptr(p) = d;
>> -       runtime·addfinalizer(f, finclosure, 0);
>> +       runtime·addfinalizer(f, runtime·finclosure, 0);
>>        runtime·unlock(&clos);
>>
>>        *ret = p;
>>
>>
>
>

[adg, 2010-12-07 04:24:55]

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

runtime: fix build for nacl

R=lvd
CC=golang-dev
http://codereview.appspot.com/3391044