qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-22 01:54:42 -07:00
Code Releases Activity

runtime: fix build

Browse Source 
On systems where the mmap succeeds
(e.g., sysctl -w vm.mmap_min_addr=0)
it changes the signal code delivered for a
nil fault from ``page not mapped'' to
``invalid permissions for page.''

TBR=r
CC=golang-dev
https://golang.org/cl/2294041
This commit is contained in:
Russ Cox 2010-09-28 20:50:00 -04:00
parent 649aab835f
commit 81041369b2
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pkg/runtime/darwin/thread.c
View File

@ -456,7 +456,7 @@ sigpanic(void)
printf("unexpected fault address %p\n", g->sigcode1); printf("unexpected fault address %p\n", g->sigcode1);
throw("fault"); throw("fault");
case SIGSEGV: case SIGSEGV:
if((g->sigcode0 == 0 || g->sigcode0 == SEGV_MAPERR) && g->sigcode1 < 0x1000) if((g->sigcode0 == 0 || g->sigcode0 == SEGV_MAPERR || g->sigcode0 == SEGV_ACCERR) && g->sigcode1 < 0x1000)
panicstring("invalid memory address or nil pointer dereference"); panicstring("invalid memory address or nil pointer dereference");
printf("unexpected fault address %p\n", g->sigcode1); printf("unexpected fault address %p\n", g->sigcode1);
throw("fault"); throw("fault");

2
src/pkg/runtime/freebsd/thread.c
View File

@ -182,7 +182,7 @@ sigpanic(void)
printf("unexpected fault address %p\n", g->sigcode1); printf("unexpected fault address %p\n", g->sigcode1);
throw("fault"); throw("fault");
case SIGSEGV: case SIGSEGV:
if((g->sigcode0 == 0 || g->sigcode0 == SEGV_MAPERR) && g->sigcode1 < 0x1000) if((g->sigcode0 == 0 || g->sigcode0 == SEGV_MAPERR || g->sigcode0 == SEGV_ACCERR) && g->sigcode1 < 0x1000)
panicstring("invalid memory address or nil pointer dereference"); panicstring("invalid memory address or nil pointer dereference");
printf("unexpected fault address %p\n", g->sigcode1); printf("unexpected fault address %p\n", g->sigcode1);
throw("fault"); throw("fault");

4
src/pkg/runtime/linux/thread.c
View File

@ -168,7 +168,7 @@ unlock(Lock *l)
} }
void void
destroylock(Lock *l) destroylock(Lock*)
{ {
} }
@ -282,7 +282,7 @@ sigpanic(void)
printf("unexpected fault address %p\n", g->sigcode1); printf("unexpected fault address %p\n", g->sigcode1);
throw("fault"); throw("fault");
case SIGSEGV: case SIGSEGV:
if((g->sigcode0 == 0 || g->sigcode0 == SEGV_MAPERR) && g->sigcode1 < 0x1000) if((g->sigcode0 == 0 || g->sigcode0 == SEGV_MAPERR || g->sigcode0 == SEGV_ACCERR) && g->sigcode1 < 0x1000)
panicstring("invalid memory address or nil pointer dereference"); panicstring("invalid memory address or nil pointer dereference");
printf("unexpected fault address %p\n", g->sigcode1); printf("unexpected fault address %p\n", g->sigcode1);
throw("fault"); throw("fault");