cc: disallow ... argument unless NOSPLIT is set.

check that NOSPLIT functions don't use too much stack.
correct some missing NOSPLITs in the runtime library.

Fixes bug reported in
https://groups.google.com/group/golang-nuts/t/efff68b73941eccf

R=ken2
CC=golang-dev
https://golang.org/cl/236041

diff --git a/src/cmd/5c/sgen.c b/src/cmd/5c/sgen.c
index 1584ecff33dff7ab528c38f3300f5638a49c41aa..92a0f64f831caa9aa43e20bdd02ef3fac5d5c190 100644 (file)
--- a/src/cmd/5c/sgen.c
+++ b/src/cmd/5c/sgen.c
@@ -34,9 +34,17 @@
 Prog*
 gtext(Sym *s, int32 stkoff)
 {
+       int32 a;
+       
+       a = 0;
+       if(!(textflag & NOSPLIT))
+               a = argsize();
+       else if(stkoff >= 128)
+               yyerror("stack frame too large for NOSPLIT function");
+
        gpseudo(ATEXT, s, nodconst(stkoff));
        p->to.type = D_CONST2;
-       p->to.offset2 = argsize();
+       p->to.offset2 = a;
        return p;
 }
 

diff --git a/src/cmd/6c/sgen.c b/src/cmd/6c/sgen.c
index 1a5987f0998f48aad2c1dc8c7a9ef753a16ff9d7..b8247a1b703d3815fdc6df41099dc4b178d6adf0 100644 (file)
--- a/src/cmd/6c/sgen.c
+++ b/src/cmd/6c/sgen.c
@@ -34,9 +34,13 @@ Prog*
 gtext(Sym *s, int32 stkoff)
 {
        vlong v;
-
-       v = argsize() << 32;
+       
+       v = 0;
+       if(!(textflag & NOSPLIT))
+               v |= argsize() << 32;
        v |= stkoff & 0xffffffff;
+       if((textflag & NOSPLIT) && stkoff >= 128)
+               yyerror("stack frame too large for NOSPLIT function");
 
        gpseudo(ATEXT, s, nodgconst(v, types[TVLONG]));
        return p;

diff --git a/src/cmd/8c/sgen.c b/src/cmd/8c/sgen.c
index c4f91987caf34306951f8642b7c66858bb0703ac..b0f2bc544c4f14349365c9155722a0767534b82f 100644 (file)
--- a/src/cmd/8c/sgen.c
+++ b/src/cmd/8c/sgen.c
@@ -33,9 +33,17 @@
 Prog*
 gtext(Sym *s, int32 stkoff)
 {
+       int32 a;
+       
+       a = 0;
+       if(!(textflag & NOSPLIT))
+               a = argsize();
+       else if(stkoff >= 128)
+               yyerror("stack frame too large for NOSPLIT function");
+
        gpseudo(ATEXT, s, nodconst(stkoff));
        p->to.type = D_CONST2;
-       p->to.offset2 = argsize();
+       p->to.offset2 = a;
        return p;
 }
 

diff --git a/src/cmd/cc/pgen.c b/src/cmd/cc/pgen.c
index d430ec91b9c85882a9d825d3f7fe1ecf5931d8e8..cd6fffc578754089b2bf6b90d58a6c017f25c5e1 100644 (file)
--- a/src/cmd/cc/pgen.c
+++ b/src/cmd/cc/pgen.c
@@ -43,6 +43,7 @@ argsize(void)
                case TVOID:
                        break;
                case TDOT:
+                       yyerror("function takes ... without textflag NOSPLIT");
                        s += 64;
                        break;
                default:

diff --git a/src/pkg/runtime/chan.c b/src/pkg/runtime/chan.c
index bee033fa11b75078d6fa32c32710803b2cc93127..ea3b493b62395c88ff9e26713a328c9843471e7c 100644 (file)
--- a/src/pkg/runtime/chan.c
+++ b/src/pkg/runtime/chan.c
@@ -393,6 +393,7 @@ closed:
 }
 
 // chansend1(hchan *chan any, elem any);
+#pragma textflag 7
 void
 ·chansend1(Hchan* c, ...)
 {
@@ -405,6 +406,7 @@ void
 }
 
 // chansend2(hchan *chan any, elem any) (pres bool);
+#pragma textflag 7
 void
 ·chansend2(Hchan* c, ...)
 {
@@ -420,6 +422,7 @@ void
 }
 
 // chanrecv1(hchan *chan any) (elem any);
+#pragma textflag 7
 void
 ·chanrecv1(Hchan* c, ...)
 {
@@ -433,6 +436,7 @@ void
 }
 
 // chanrecv2(hchan *chan any) (elem any, pres bool);
+#pragma textflag 7
 void
 ·chanrecv2(Hchan* c, ...)
 {
@@ -448,6 +452,7 @@ void
 }
 
 // newselect(size uint32) (sel *byte);
+#pragma textflag 7
 void
 ·newselect(int32 size, ...)
 {
@@ -476,6 +481,7 @@ void
 }
 
 // selectsend(sel *byte, hchan *chan any, elem any) (selected bool);
+#pragma textflag 7
 void
 ·selectsend(Select *sel, Hchan *c, ...)
 {
@@ -521,6 +527,7 @@ void
 }
 
 // selectrecv(sel *byte, hchan *chan any, elem *any) (selected bool);
+#pragma textflag 7
 void
 ·selectrecv(Select *sel, Hchan *c, ...)
 {
@@ -563,6 +570,7 @@ void
 
 
 // selectdefaul(sel *byte) (selected bool);
+#pragma textflag 7
 void
 ·selectdefault(Select *sel, ...)
 {

diff --git a/src/pkg/runtime/hashmap.c b/src/pkg/runtime/hashmap.c
index 848aa650c90c5a08984420b8d3d7cec09a43ef3c..281601fbc767165467292611827a4ddf35e7859f 100644 (file)
--- a/src/pkg/runtime/hashmap.c
+++ b/src/pkg/runtime/hashmap.c
@@ -758,6 +758,7 @@ mapaccess(Hmap *h, byte *ak, byte *av, bool *pres)
 }
 
 // mapaccess1(hmap *map[any]any, key any) (val any);
+#pragma textflag 7
 void
 ·mapaccess1(Hmap *h, ...)
 {
@@ -785,6 +786,7 @@ void
 }
 
 // mapaccess2(hmap *map[any]any, key any) (val any, pres bool);
+#pragma textflag 7
 void
 ·mapaccess2(Hmap *h, ...)
 {
@@ -844,6 +846,7 @@ mapassign(Hmap *h, byte *ak, byte *av)
 }
 
 // mapassign1(hmap *map[any]any, key any, val any);
+#pragma textflag 7
 void
 ·mapassign1(Hmap *h, ...)
 {
@@ -856,6 +859,7 @@ void
 }
 
 // mapassign2(hmap *map[any]any, key any, val any, pres bool);
+#pragma textflag 7
 void
 ·mapassign2(Hmap *h, ...)
 {
@@ -934,6 +938,7 @@ mapiternext(struct hash_iter *it)
 }
 
 // mapiter1(hiter *any) (key any);
+#pragma textflag 7
 void
 ·mapiter1(struct hash_iter *it, ...)
 {
@@ -973,6 +978,7 @@ mapiterkey(struct hash_iter *it, void *ak)
 }
 
 // mapiter2(hiter *any) (key any, val any);
+#pragma textflag 7
 void
 ·mapiter2(struct hash_iter *it, ...)
 {

diff --git a/src/pkg/runtime/print.c b/src/pkg/runtime/print.c
index d721f395356135b9026000c82eb5bfac07ebe13d..92f49fba96a40740971faf093dbf31216662ed72 100644 (file)
--- a/src/pkg/runtime/print.c
+++ b/src/pkg/runtime/print.c
@@ -157,6 +157,7 @@ vprintf(int8 *s, byte *arg)
 //     unlock(&debuglock);
 }
 
+#pragma textflag 7
 void
 ·printf(String s, ...)
 {

diff --git a/src/pkg/runtime/proc.c b/src/pkg/runtime/proc.c
index 9b4e34f6f7a50cac09b2d3145525c2284c9d5579..c85e347e206f1f3c7101e55e972ef5d250dbb5ce 100644 (file)
--- a/src/pkg/runtime/proc.c
+++ b/src/pkg/runtime/proc.c
@@ -666,6 +666,7 @@ oldstack(void)
        uint32 args;
        byte *sp;
        G *g1;
+       static int32 goid;
 
 //printf("oldstack m->cret=%p\n", m->cret);
 
@@ -678,6 +679,7 @@ oldstack(void)
                sp -= args;
                mcpy(top->fp, sp, args);
        }
+       goid = old.gobuf.g->goid;       // fault if g is bad, before gogo
 
        stackfree(g1->stackguard - StackGuard);
        g1->stackbase = old.stackbase;
@@ -765,9 +767,9 @@ malg(int32 stacksize)
  */
 #pragma textflag 7
 void
-·newproc(int32 siz, byte* fn, byte* arg0)
+·newproc(int32 siz, byte* fn, ...)
 {
-       newproc1(fn, (byte*)&arg0, siz, 0);
+       newproc1(fn, (byte*)(&fn+1), siz, 0);
 }
 
 void
@@ -815,13 +817,13 @@ newproc1(byte *fn, byte *argp, int32 narg, int32 nret)
 
 #pragma textflag 7
 void
-·deferproc(int32 siz, byte* fn, byte* arg0)
+·deferproc(int32 siz, byte* fn, ...)
 {
        Defer *d;
 
        d = malloc(sizeof(*d) + siz - sizeof(d->args));
        d->fn = fn;
-       d->sp = (byte*)&arg0;
+       d->sp = (byte*)(&fn+1);
        d->siz = siz;
        mcpy(d->args, d->sp, d->siz);