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

pic_env -> pic_context

This commit is contained in:
Yuichi Nishiwaki 2015-05-30 22:34:51 +09:00
parent bebda9407f
commit d0e10b49a7
7 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/03.callcc/callcc.c
View File

@ -66,8 +66,8 @@ cont_mark(pic_state *pic, void *data, void (*mark)(pic_state *, pic_value))
/* callinfo */ /* callinfo */
for (ci = cont->ci_ptr + cont->ci_offset; ci != cont->ci_ptr; --ci) { for (ci = cont->ci_ptr + cont->ci_offset; ci != cont->ci_ptr; --ci) {
if (ci->env) { if (ci->cxt) {
mark(pic, pic_obj_value(ci->env)); mark(pic, pic_obj_value(ci->cxt));
} }
} }

22
extlib/benz/gc.c
View File

@ -354,22 +354,22 @@ gc_mark_object(pic_state *pic, struct pic_object *obj)
gc_mark(pic, ((struct pic_pair *)obj)->cdr); gc_mark(pic, ((struct pic_pair *)obj)->cdr);
break; break;
} }
case PIC_TT_ENV: { case PIC_TT_CXT: {
struct pic_env *env = (struct pic_env *)obj; struct pic_context *cxt = (struct pic_context *)obj;
int i; int i;
for (i = 0; i < env->regc; ++i) { for (i = 0; i < cxt->regc; ++i) {
gc_mark(pic, env->regs[i]); gc_mark(pic, cxt->regs[i]);
} }
if (env->up) { if (cxt->up) {
gc_mark_object(pic, (struct pic_object *)env->up); gc_mark_object(pic, (struct pic_object *)cxt->up);
} }
break; break;
} }
case PIC_TT_PROC: { case PIC_TT_PROC: {
struct pic_proc *proc = (struct pic_proc *)obj; struct pic_proc *proc = (struct pic_proc *)obj;
if (proc->env) { if (proc->cxt) {
gc_mark_object(pic, (struct pic_object *)proc->env); gc_mark_object(pic, (struct pic_object *)proc->cxt);
} }
if (pic_proc_irep_p(proc)) { if (pic_proc_irep_p(proc)) {
gc_mark_object(pic, (struct pic_object *)proc->u.irep); gc_mark_object(pic, (struct pic_object *)proc->u.irep);
@ -542,8 +542,8 @@ gc_mark_phase(pic_state *pic)
/* callinfo */ /* callinfo */
for (ci = pic->ci; ci != pic->cibase; --ci) { for (ci = pic->ci; ci != pic->cibase; --ci) {
if (ci->env) { if (ci->cxt) {
gc_mark_object(pic, (struct pic_object *)ci->env); gc_mark_object(pic, (struct pic_object *)ci->cxt);
} }
} }
@ -619,7 +619,7 @@ gc_finalize_object(pic_state *pic, struct pic_object *obj)
case PIC_TT_PAIR: { case PIC_TT_PAIR: {
break; break;
} }
case PIC_TT_ENV: { case PIC_TT_CXT: {
break; break;
} }
case PIC_TT_PROC: { case PIC_TT_PROC: {

4
extlib/benz/include/picrin.h
View File

@ -59,10 +59,10 @@ typedef struct {
int argc, retc; int argc, retc;
pic_code *ip; pic_code *ip;
pic_value *fp; pic_value *fp;
struct pic_env *env; struct pic_context *cxt;
int regc; int regc;
pic_value *regs; pic_value *regs;
struct pic_env *up; struct pic_context *up;
} pic_callinfo; } pic_callinfo;
typedef void *(*pic_allocf)(void *, size_t); typedef void *(*pic_allocf)(void *, size_t);

12
extlib/benz/include/picrin/proc.h
View File

@ -15,11 +15,11 @@ struct pic_func {
pic_sym *name; pic_sym *name;
}; };
struct pic_env { struct pic_context {
PIC_OBJECT_HEADER PIC_OBJECT_HEADER
pic_value *regs; pic_value *regs;
int regc; int regc;
struct pic_env *up; struct pic_context *up;
pic_value storage[1]; pic_value storage[1];
}; };
@ -30,7 +30,7 @@ struct pic_proc {
struct pic_func func; struct pic_func func;
struct pic_irep *irep; struct pic_irep *irep;
} u; } u;
struct pic_env *env; struct pic_context *cxt;
}; };
#define PIC_PROC_KIND_FUNC 1 #define PIC_PROC_KIND_FUNC 1
@ -42,11 +42,11 @@ struct pic_proc {
#define pic_proc_p(o) (pic_type(o) == PIC_TT_PROC) #define pic_proc_p(o) (pic_type(o) == PIC_TT_PROC)
#define pic_proc_ptr(o) ((struct pic_proc *)pic_ptr(o)) #define pic_proc_ptr(o) ((struct pic_proc *)pic_ptr(o))
#define pic_env_p(o) (pic_type(o) == PIC_TT_ENV) #define pic_context_p(o) (pic_type(o) == PIC_TT_CXT)
#define pic_env_ptr(o) ((struct pic_env *)pic_ptr(o)) #define pic_context_ptr(o) ((struct pic_context *)pic_ptr(o))
struct pic_proc *pic_make_proc(pic_state *, pic_func_t, const char *); struct pic_proc *pic_make_proc(pic_state *, pic_func_t, const char *);
struct pic_proc *pic_make_proc_irep(pic_state *, struct pic_irep *, struct pic_env *); struct pic_proc *pic_make_proc_irep(pic_state *, struct pic_irep *, struct pic_context *);
pic_sym *pic_proc_name(struct pic_proc *); pic_sym *pic_proc_name(struct pic_proc *);

6
extlib/benz/include/picrin/value.h
View File

@ -155,7 +155,7 @@ enum pic_tt {
PIC_TT_PROC, PIC_TT_PROC,
PIC_TT_PORT, PIC_TT_PORT,
PIC_TT_ERROR, PIC_TT_ERROR,
PIC_TT_ENV, PIC_TT_CXT,
PIC_TT_SENV, PIC_TT_SENV,
PIC_TT_LIB, PIC_TT_LIB,
PIC_TT_IREP, PIC_TT_IREP,
@ -306,8 +306,8 @@ pic_type_repr(enum pic_tt tt)
return "port"; return "port";
case PIC_TT_ERROR: case PIC_TT_ERROR:
return "error"; return "error";
case PIC_TT_ENV: case PIC_TT_CXT:
return "env"; return "cxt";
case PIC_TT_PROC: case PIC_TT_PROC:
return "proc"; return "proc";
case PIC_TT_SENV: case PIC_TT_SENV:

6
extlib/benz/proc.c
View File

@ -18,19 +18,19 @@ pic_make_proc(pic_state *pic, pic_func_t func, const char *name)
proc->kind = PIC_PROC_KIND_FUNC; proc->kind = PIC_PROC_KIND_FUNC;
proc->u.func.f = func; proc->u.func.f = func;
proc->u.func.name = sym; proc->u.func.name = sym;
proc->env = NULL; proc->cxt = NULL;
return proc; return proc;
} }
struct pic_proc * struct pic_proc *
pic_make_proc_irep(pic_state *pic, struct pic_irep *irep, struct pic_env *env) pic_make_proc_irep(pic_state *pic, struct pic_irep *irep, struct pic_context *cxt)
{ {
struct pic_proc *proc; struct pic_proc *proc;
proc = (struct pic_proc *)pic_obj_alloc(pic, sizeof(struct pic_proc), PIC_TT_PROC); proc = (struct pic_proc *)pic_obj_alloc(pic, sizeof(struct pic_proc), PIC_TT_PROC);
proc->kind = PIC_PROC_KIND_IREP; proc->kind = PIC_PROC_KIND_IREP;
proc->u.irep = irep; proc->u.irep = irep;
proc->env = env; proc->cxt = cxt;
return proc; return proc;
} }

66
extlib/benz/vm.c
View File

@ -473,33 +473,33 @@ pic_defvar(pic_state *pic, const char *name, pic_value init, struct pic_proc *co
} }
static void static void
vm_push_env(pic_state *pic) vm_push_cxt(pic_state *pic)
{ {
pic_callinfo *ci = pic->ci; pic_callinfo *ci = pic->ci;
ci->env = (struct pic_env *)pic_obj_alloc(pic, sizeof(struct pic_env) + sizeof(pic_value) * (size_t)(ci->regc), PIC_TT_ENV); ci->cxt = (struct pic_context *)pic_obj_alloc(pic, sizeof(struct pic_context) + sizeof(pic_value) * (size_t)(ci->regc), PIC_TT_CXT);
ci->env->up = ci->up; ci->cxt->up = ci->up;
ci->env->regc = ci->regc; ci->cxt->regc = ci->regc;
ci->env->regs = ci->regs; ci->cxt->regs = ci->regs;
} }
static void static void
vm_tear_off(pic_callinfo *ci) vm_tear_off(pic_callinfo *ci)
{ {
struct pic_env *env; struct pic_context *cxt;
int i; int i;
assert(ci->env != NULL); assert(ci->cxt != NULL);
env = ci->env; cxt = ci->cxt;
if (env->regs == env->storage) { if (cxt->regs == cxt->storage) {
return; /* is torn off */ return; /* is torn off */
} }
for (i = 0; i < env->regc; ++i) { for (i = 0; i < cxt->regc; ++i) {
env->storage[i] = env->regs[i]; cxt->storage[i] = cxt->regs[i];
} }
env->regs = env->storage; cxt->regs = cxt->storage;
} }
void void
@ -508,7 +508,7 @@ 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 (ci->env != NULL) { if (ci->cxt != NULL) {
vm_tear_off(ci); vm_tear_off(ci);
} }
} }
@ -764,10 +764,10 @@ pic_apply(pic_state *pic, struct pic_proc *proc, pic_value args)
pic_callinfo *ci = pic->ci; pic_callinfo *ci = pic->ci;
struct pic_irep *irep; struct pic_irep *irep;
if (ci->env != NULL && ci->env->regs == ci->env->storage) { if (ci->cxt != NULL && ci->cxt->regs == ci->cxt->storage) {
irep = pic_get_proc(pic)->u.irep; irep = pic_get_proc(pic)->u.irep;
if (c.u.i >= irep->argc + irep->localc) { if (c.u.i >= irep->argc + irep->localc) {
PUSH(ci->env->regs[c.u.i - (ci->regs - ci->fp)]); PUSH(ci->cxt->regs[c.u.i - (ci->regs - ci->fp)]);
NEXT; NEXT;
} }
} }
@ -778,10 +778,10 @@ pic_apply(pic_state *pic, struct pic_proc *proc, pic_value args)
pic_callinfo *ci = pic->ci; pic_callinfo *ci = pic->ci;
struct pic_irep *irep; struct pic_irep *irep;
if (ci->env != NULL && ci->env->regs == ci->env->storage) { if (ci->cxt != NULL && ci->cxt->regs == ci->cxt->storage) {
irep = pic_get_proc(pic)->u.irep; irep = pic_get_proc(pic)->u.irep;
if (c.u.i >= irep->argc + irep->localc) { if (c.u.i >= irep->argc + irep->localc) {
ci->env->regs[c.u.i - (ci->regs - ci->fp)] = POP(); ci->cxt->regs[c.u.i - (ci->regs - ci->fp)] = POP();
NEXT; NEXT;
} }
} }
@ -790,24 +790,24 @@ pic_apply(pic_state *pic, struct pic_proc *proc, pic_value args)
} }
CASE(OP_CREF) { CASE(OP_CREF) {
int depth = c.u.r.depth; int depth = c.u.r.depth;
struct pic_env *env; struct pic_context *cxt;
env = pic->ci->up; cxt = pic->ci->up;
while (--depth) { while (--depth) {
env = env->up; cxt = cxt->up;
} }
PUSH(env->regs[c.u.r.idx]); PUSH(cxt->regs[c.u.r.idx]);
NEXT; NEXT;
} }
CASE(OP_CSET) { CASE(OP_CSET) {
int depth = c.u.r.depth; int depth = c.u.r.depth;
struct pic_env *env; struct pic_context *cxt;
env = pic->ci->up; cxt = pic->ci->up;
while (--depth) { while (--depth) {
env = env->up; cxt = cxt->up;
} }
env->regs[c.u.r.idx] = POP(); cxt->regs[c.u.r.idx] = POP();
NEXT; NEXT;
} }
CASE(OP_JMP) { CASE(OP_JMP) {
@ -858,7 +858,7 @@ pic_apply(pic_state *pic, struct pic_proc *proc, pic_value args)
ci->retc = 1; ci->retc = 1;
ci->ip = pic->ip; ci->ip = pic->ip;
ci->fp = pic->sp - c.u.i; ci->fp = pic->sp - c.u.i;
ci->env = NULL; ci->cxt = NULL;
if (pic_proc_func_p(pic_proc_ptr(x))) { if (pic_proc_func_p(pic_proc_ptr(x))) {
/* invoke! */ /* invoke! */
@ -899,8 +899,8 @@ pic_apply(pic_state *pic, struct pic_proc *proc, pic_value args)
} }
} }
/* prepare env */ /* prepare cxt */
ci->up = proc->env; ci->up = proc->cxt;
ci->regc = irep->capturec; ci->regc = irep->capturec;
ci->regs = ci->fp + irep->argc + irep->localc; ci->regs = ci->fp + irep->argc + irep->localc;
@ -914,7 +914,7 @@ pic_apply(pic_state *pic, struct pic_proc *proc, pic_value args)
pic_value *argv; pic_value *argv;
pic_callinfo *ci; pic_callinfo *ci;
if (pic->ci->env != NULL) { if (pic->ci->cxt != NULL) {
vm_tear_off(pic->ci); vm_tear_off(pic->ci);
} }
@ -940,7 +940,7 @@ pic_apply(pic_state *pic, struct pic_proc *proc, pic_value args)
pic_value *retv; pic_value *retv;
pic_callinfo *ci; pic_callinfo *ci;
if (pic->ci->env != NULL) { if (pic->ci->cxt != NULL) {
vm_tear_off(pic->ci); vm_tear_off(pic->ci);
} }
@ -974,11 +974,11 @@ pic_apply(pic_state *pic, struct pic_proc *proc, pic_value args)
pic_errorf(pic, "logic flaw"); pic_errorf(pic, "logic flaw");
} }
if (pic->ci->env == NULL) { if (pic->ci->cxt == NULL) {
vm_push_env(pic); vm_push_cxt(pic);
} }
proc = pic_make_proc_irep(pic, irep->irep[c.u.i], pic->ci->env); proc = pic_make_proc_irep(pic, irep->irep[c.u.i], pic->ci->cxt);
PUSH(pic_obj_value(proc)); PUSH(pic_obj_value(proc));
pic_gc_arena_restore(pic, ai); pic_gc_arena_restore(pic, ai);
NEXT; NEXT;