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

add callinfo

This commit is contained in:
Yuichi Nishiwaki 2013-10-15 23:29:34 +09:00
parent ea6230e90c
commit 22abdae12a
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/picrin.h
View File

@ -7,11 +7,19 @@
#include "picconf.h" #include "picconf.h"
#include "picrin/value.h" #include "picrin/value.h"
typedef struct pic_callinfo {
struct pic_proc *proc;
int argc;
} pic_callinfo;
typedef struct { typedef struct {
pic_value *sp; pic_value *sp;
pic_value *stbase, *stend; pic_value *stbase, *stend;
pic_value sDEFINE, sCONS; pic_value sDEFINE, sCONS;
pic_callinfo *ci;
pic_callinfo *cibase, *ciend;
pic_value sADD, sSUB, sMUL, sDIV; pic_value sADD, sSUB, sMUL, sDIV;
struct pic_env *global_env; struct pic_env *global_env;

4
src/state.c
View File

@ -29,6 +29,10 @@ pic_open()
pic->stbase = pic->sp = (pic_value *)malloc(sizeof(pic_value) * PIC_STACK_SIZE); pic->stbase = pic->sp = (pic_value *)malloc(sizeof(pic_value) * PIC_STACK_SIZE);
pic->stend = pic->stbase + PIC_STACK_SIZE; pic->stend = pic->stbase + PIC_STACK_SIZE;
/* callinfo */
pic->cibase = pic->ci = (pic_callinfo *)malloc(sizeof(pic_callinfo) * PIC_STACK_SIZE);
pic->ciend = pic->ciend + PIC_STACK_SIZE;
/* memory heap */ /* memory heap */
pic->heap = (struct heap_page *)malloc(sizeof(struct heap_page)); pic->heap = (struct heap_page *)malloc(sizeof(struct heap_page));
init_heap_page(pic->heap); init_heap_page(pic->heap);

10
src/vm.c
View File

@ -317,6 +317,9 @@ pic_codegen(pic_state *pic, pic_value obj, struct pic_env *env)
#define PUSH(v) (*pic->sp++ = (v)) #define PUSH(v) (*pic->sp++ = (v))
#define POP() (*--pic->sp) #define POP() (*--pic->sp)
#define PUSHCI() (++pic->ci)
#define POPCI() (pic->ci--)
pic_value pic_value
pic_run(pic_state *pic, struct pic_proc *proc, pic_value args) pic_run(pic_state *pic, struct pic_proc *proc, pic_value args)
{ {
@ -324,6 +327,8 @@ pic_run(pic_state *pic, struct pic_proc *proc, pic_value args)
int ai = pic_gc_arena_preserve(pic); int ai = pic_gc_arena_preserve(pic);
pc = proc->u.irep->code; pc = proc->u.irep->code;
pic->ci->proc = proc;
pic->ci->argc = 0;
VM_LOOP { VM_LOOP {
CASE(OP_PUSHNIL) { CASE(OP_PUSHNIL) {
@ -349,12 +354,17 @@ pic_run(pic_state *pic, struct pic_proc *proc, pic_value args)
CASE(OP_CALL) { CASE(OP_CALL) {
pic_value c; pic_value c;
struct pic_proc *proc; struct pic_proc *proc;
pic_callinfo *ci;
int ai = pic_gc_arena_preserve(pic); int ai = pic_gc_arena_preserve(pic);
pic_gc_protect(pic, c = POP()); pic_gc_protect(pic, c = POP());
proc = pic_proc_ptr(c); proc = pic_proc_ptr(c);
ci = PUSHCI();
ci->proc = proc;
ci->argc = pc->u.i;
PUSH(proc->u.cfunc(pic)); PUSH(proc->u.cfunc(pic));
pic_gc_arena_restore(pic, ai); pic_gc_arena_restore(pic, ai);
POPCI();
NEXT; NEXT;
} }
CASE(OP_CONS) { CASE(OP_CONS) {