diff options
| author | Russ Cox <rsc@golang.org> | 2009-05-26 17:13:39 -0700 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2009-05-26 17:13:39 -0700 |
| commit | b9579d30bb3f88fbd168c70f9c5dc6a9ef318b98 (patch) | |
| tree | c168645dd3cc7ee786eac885a0072a0a13299a52 /src | |
| parent | 6a6c0d6aca3ae7d0cbe624201c925180eac80219 (diff) | |
| download | golang-b9579d30bb3f88fbd168c70f9c5dc6a9ef318b98.tar.gz | |
32-bit stack switching bug fix
R=ken
OCL=29412
CL=29412
Diffstat (limited to 'src')
| -rw-r--r-- | src/runtime/386/asm.s | 2 | ||||
| -rw-r--r-- | src/runtime/proc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/runtime/386/asm.s b/src/runtime/386/asm.s index 9dd9c11a9..b7138105f 100644 --- a/src/runtime/386/asm.s +++ b/src/runtime/386/asm.s @@ -135,7 +135,7 @@ TEXT setspgoto(SB), 7, $0 MOVL AX, SP PUSHL CX JMP BX - POPL AX + POPL AX // not reached RET // bool cas(int32 *val, int32 old, int32 new) diff --git a/src/runtime/proc.c b/src/runtime/proc.c index d52adf94c..d51a6c013 100644 --- a/src/runtime/proc.c +++ b/src/runtime/proc.c @@ -705,7 +705,7 @@ newstack(void) #pragma textflag 7 void -sys·morestack(uint64 u) +sys·morestack(uintptr u) { while(g == m->g0) { // very bad news |