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

rename pic_callinfo.pc -> ip

This commit is contained in:
Yuichi Nishiwaki 2014-02-04 10:46:36 +09:00
parent f090eae241
commit a3b0fa701b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/picrin.h
View File

@ -57,7 +57,7 @@ struct pic_code;
typedef struct { typedef struct {
int argc; int argc;
struct pic_code *pc; struct pic_code *ip;
pic_value *fp; pic_value *fp;
struct pic_env *env; struct pic_env *env;
} pic_callinfo; } pic_callinfo;

8
src/vm.c
View File

@ -577,13 +577,13 @@ pic_apply(pic_state *pic, struct pic_proc *proc, pic_value argv)
ci = PUSHCI(); ci = PUSHCI();
ci->argc = c.u.i; ci->argc = c.u.i;
ci->pc = pic->ip; ci->ip = pic->ip;
ci->fp = pic->sp - c.u.i; ci->fp = pic->sp - c.u.i;
ci->env = NULL; ci->env = NULL;
if (pic_proc_cfunc_p(x)) { if (pic_proc_cfunc_p(x)) {
v = proc->u.cfunc(pic); v = proc->u.cfunc(pic);
ci = POPCI(); ci = POPCI();
pic->ip = ci->pc; pic->ip = ci->ip;
pic->sp = ci->fp; pic->sp = ci->fp;
PUSH(v); PUSH(v);
pic_gc_arena_restore(pic, ai); pic_gc_arena_restore(pic, ai);
@ -643,7 +643,7 @@ pic_apply(pic_state *pic, struct pic_proc *proc, pic_value argv)
pic->ci->fp[i] = argv[i]; pic->ci->fp[i] = argv[i];
} }
pic->sp = pic->ci->fp + argc; pic->sp = pic->ci->fp + argc;
pic->ip = POPCI()->pc; pic->ip = POPCI()->ip;
/* c is not changed */ /* c is not changed */
goto L_CALL; goto L_CALL;
@ -660,7 +660,7 @@ pic_apply(pic_state *pic, struct pic_proc *proc, pic_value argv)
else { else {
v = POP(); v = POP();
ci = POPCI(); ci = POPCI();
pic->ip = ci->pc; pic->ip = ci->ip;
pic->sp = ci->fp; pic->sp = ci->fp;
PUSH(v); PUSH(v);
} }