Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

runtime: add lr, ctxt, ret to Gobuf

Browse source 
Add gostartcall and gostartcallfn.
The old gogocall = gostartcall + gogo.
The old gogocallfn = gostartcallfn + gogo.

R=dvyukov, minux.ma
CC=golang-dev
https://golang.org/cl/10036044
This commit is contained in:
Russ Cox 2013-06-12 15:22:26 -04:00
parent a8ad859c30
commit d67e7e3acf
14 changed files with 188 additions and 187 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/pkg/runtime/stack.c
View file

@ -130,7 +130,6 @@ runtime·oldstack(void)
Stktop *top;
Gobuf label;
uint32 argsize;
uintptr cret;
byte *sp, *old;
uintptr *src, *dst, *dstend;
G *gp;
@ -161,9 +160,9 @@ runtime·oldstack(void)
if(top->free != 0)
runtime·stackfree(old, top->free);
cret = m->cret;
label.ret = m->cret;
m->cret = 0; // drop reference
runtime·gogo(&label, cret);
runtime·gogo(&label);
}
// Called from reflect·call or from runtime·morestack when a new
@ -270,13 +269,26 @@ runtime·newstack(void)
// Continue as if lessstack had just called m->morepc
// (the PC that decided to grow the stack).
runtime·memclr((byte*)&label, sizeof label);
label.sp = sp;
label.pc = (uintptr)runtime·lessstack;
label.g = m->curg;
if(reflectcall)
runtime·gogocallfn(&label, (FuncVal*)m->morepc);
else
runtime·gogocall(&label, m->morepc, m->cret);
runtime·gostartcallfn(&label, (FuncVal*)m->morepc);
else {
// The stack growth code saves ctxt (not ret) in m->cret.
runtime·gostartcall(&label, m->morepc, (void*)m->cret);
m->cret = 0;
}
runtime·gogo(&label);
*(int32*)345 = 123; // never return
}
// adjust Gobuf as if it executed a call to fn
// and then did an immediate gosave.
void
runtime·gostartcallfn(Gobuf *gobuf, FuncVal *fv)
{
runtime·gostartcall(gobuf, fv->fn, fv);
}