32-bit stack switching bug fix

R=ken
OCL=29412
CL=29412

diff --git a/src/runtime/386/asm.s b/src/runtime/386/asm.s
index 9dd9c11a98cd20028320e0e2cf9f950d0aebbbd7..b7138105f704081b01eead1da126c35321f6494c 100644 (file)
--- 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 d52adf94c06049a6b07ee6f53741ebd74e1bc492..d51a6c013e8792b4dcc39fc4272a5cd4eefb2628 100644 (file)
--- 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