conservatory
/
picrin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix vm_tear_off is broken

This commit is contained in:
Yuichi Nishiwaki 2014-07-27 18:29:45 +09:00
parent d8692c1cc0
commit 730a827d0e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/vm.c
View File

@ -495,14 +495,14 @@ vm_push_env(pic_state *pic)
} }
static void static void
vm_tear_off(pic_state *pic) vm_tear_off(pic_callinfo *ci)
{ {
struct pic_env *env; struct pic_env *env;
int i; int i;
assert(pic->ci->env != NULL); assert(ci->env != NULL);
env = pic->ci->env; env = ci->env;
if (env->regs == env->storage) { if (env->regs == env->storage) {
return; /* is torn off */ return; /* is torn off */
@ -519,8 +519,8 @@ pic_vm_tear_off(pic_state *pic)
pic_callinfo *ci; pic_callinfo *ci;
for (ci = pic->ci; ci > pic->cibase; ci--) { for (ci = pic->ci; ci > pic->cibase; ci--) {
if (pic->ci->env != NULL) { if (ci->env != NULL) {
vm_tear_off(pic); vm_tear_off(ci);
} }
} }
} }
@ -844,7 +844,7 @@ pic_apply(pic_state *pic, struct pic_proc *proc, pic_value argv)
pic_callinfo *ci; pic_callinfo *ci;
if (pic->ci->env != NULL) { if (pic->ci->env != NULL) {
vm_tear_off(pic); vm_tear_off(pic->ci);
} }
if (c.u.i == -1) { if (c.u.i == -1) {
@ -870,7 +870,7 @@ pic_apply(pic_state *pic, struct pic_proc *proc, pic_value argv)
pic_callinfo *ci; pic_callinfo *ci;
if (pic->ci->env != NULL) { if (pic->ci->env != NULL) {
vm_tear_off(pic); vm_tear_off(pic->ci);
} }
pic->ci->retc = c.u.i; pic->ci->retc = c.u.i;