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

perform tear-off operation lazily

This commit is contained in:
Yuichi Nishiwaki 2014-03-23 13:09:35 +09:00
parent 93414fac52
commit 12728df36f
2 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/picrin.h
View File

@ -51,6 +51,9 @@ typedef struct {
pic_code *ip;
pic_value *fp;
struct pic_env *env;
int regc;
pic_value *regs;
struct pic_env *up;
} pic_callinfo;
typedef struct pic_block {

41
src/vm.c
View File

@ -424,12 +424,25 @@ pic_defvar(pic_state *pic, const char *name, pic_value init)
pic_define(pic, name, pic_obj_value(pic_wrap_var(pic, var)));
}
static void
vm_push_env(pic_state *pic)
{
pic_callinfo *ci = pic->ci;
ci->env = (struct pic_env *)pic_obj_alloc(pic, offsetof(struct pic_env, storage) + sizeof(pic_value) * ci->regc, PIC_TT_ENV);
ci->env->up = ci->up;
ci->env->regc = ci->regc;
ci->env->regs = ci->regs;
}
static void
vm_tear_off(pic_state *pic)
{
struct pic_env *env;
int i;
assert(pic->ci->env != NULL);
env = pic->ci->env;
for (i = 0; i < env->regc; ++i) {
env->storage[i] = env->regs[i];
@ -596,8 +609,8 @@ pic_apply(pic_state *pic, struct pic_proc *proc, pic_value argv)
int depth = c.u.r.depth;
struct pic_env *env;
env = pic->ci->env;
while (depth--) {
env = pic->ci->up;
while (--depth) {
env = env->up;
}
PUSH(env->regs[c.u.r.idx]);
@ -607,8 +620,8 @@ pic_apply(pic_state *pic, struct pic_proc *proc, pic_value argv)
int depth = c.u.r.depth;
struct pic_env *env;
env = pic->ci->env;
while (depth--) {
env = pic->ci->up;
while (--depth) {
env = env->up;
}
env->regs[c.u.r.idx] = POP();
@ -720,10 +733,9 @@ pic_apply(pic_state *pic, struct pic_proc *proc, pic_value argv)
}
/* prepare env */
ci->env = (struct pic_env *)pic_obj_alloc(pic, offsetof(struct pic_env, storage) + sizeof(pic_value) * irep->capturec, PIC_TT_ENV);
ci->env->up = proc->env;
ci->env->regc = irep->capturec;
ci->env->regs = ci->fp + irep->argc + irep->localc;
ci->up = proc->env;
ci->regc = irep->capturec;
ci->regs = ci->fp + irep->argc + irep->localc;
pic->ip = irep->code;
pic_gc_arena_restore(pic, ai);
@ -735,7 +747,9 @@ pic_apply(pic_state *pic, struct pic_proc *proc, pic_value argv)
pic_value *argv;
pic_callinfo *ci;
vm_tear_off(pic);
if (pic->ci->env != NULL) {
vm_tear_off(pic);
}
if (c.u.i == -1) {
pic->sp += pic->ci[1].retc - 1;
@ -765,7 +779,9 @@ pic_apply(pic_state *pic, struct pic_proc *proc, pic_value argv)
goto L_STOP;
}
vm_tear_off(pic);
if (pic->ci->env != NULL) {
vm_tear_off(pic);
}
pic->ci->retc = c.u.i;
@ -797,6 +813,11 @@ pic_apply(pic_state *pic, struct pic_proc *proc, pic_value argv)
if (! pic_proc_irep_p(pic_proc_ptr(self))) {
pic_error(pic, "logic flaw");
}
if (pic->ci->env == NULL) {
vm_push_env(pic);
}
proc = pic_proc_new_irep(pic, irep->irep[c.u.i], pic->ci->env);
PUSH(pic_obj_value(proc));
pic_gc_arena_restore(pic, ai);