GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-20 18:29:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

the code for def rules now uses proper graph update to preserve lazyness

Browse Source
This commit is contained in:
kr.angelov
2014-09-05 11:53:02 +00:00
parent 5e5ad8f2db
commit d7dc541f74
7 changed files with 67 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/runtime/c/pgf/data.h
View File

@@ -121,11 +121,13 @@ typedef enum {
PGF_INSTR_SET_VALUE,
PGF_INSTR_SET_ARG_VAR,
PGF_INSTR_SET_FREE_VAR,
PGF_INSTR_SET_PAD,
PGF_INSTR_PUSH_VALUE,
PGF_INSTR_PUSH_ARG_VAR,
PGF_INSTR_PUSH_FREE_VAR,
PGF_INSTR_TAIL_CALL,
PGF_INSTR_FAIL,
PGF_INSTR_UPDATE,
PGF_INSTR_RET
} PgfInstruction;

2
src/runtime/c/pgf/evaluator.c
View File

@@ -40,7 +40,7 @@ typedef struct {
PgfLiteral lit;
} PgfValueLit;
static PgfClosure*
PgfClosure*
pgf_evaluate_indirection(PgfEvalState* state, PgfClosure* closure)
{
PgfIndirection* indir = (PgfIndirection*) closure;

3
src/runtime/c/pgf/evaluator.h
View File

@@ -23,6 +23,9 @@ typedef struct {
PgfClosure* args[];
} PgfValue;
PgfClosure*
pgf_evaluate_indirection(PgfEvalState* state, PgfClosure* closure);
PgfClosure*
pgf_evaluate_value(PgfEvalState* state, PgfClosure* closure);

39
src/runtime/c/pgf/jit.c
View File

@@ -405,6 +405,13 @@ pgf_jit_function(PgfReader* rdr, PgfAbstr* abstr,
jit_ldxi_p(JIT_V0, JIT_V1, offsetof(PgfValue, absfun));
break;
}
case PGF_INSTR_EVAL_FREE_VAR: {
size_t index = pgf_read_int(rdr);
#ifdef PGF_JIT_DEBUG
gu_printf(out, err, "EVAL_FREE_VAR %d\n", index);
#endif
break;
}
case PGF_INSTR_CASE: {
PgfCId id = pgf_read_cid(rdr, rdr->opool);
int target = pgf_read_int(rdr);
@@ -572,6 +579,27 @@ pgf_jit_function(PgfReader* rdr, PgfAbstr* abstr,
curr_offset++;
break;
}
case PGF_INSTR_SET_FREE_VAR: {
size_t index = pgf_read_int(rdr);
#ifdef PGF_JIT_DEBUG
gu_printf(out, err, "SET_FREE_VAR %d\n", index);
#endif
jit_getarg_p(JIT_V0, closure_arg);
jit_ldxi_p(JIT_V0, JIT_V0, sizeof(PgfClosure)+index*sizeof(PgfClosure*));
jit_stxi_p(curr_offset*sizeof(void*), JIT_V1, JIT_V0);
curr_offset++;
break;
}
case PGF_INSTR_SET_PAD: {
#ifdef PGF_JIT_DEBUG
gu_printf(out, err, "SET_PAD\n");
#endif
jit_movi_p(JIT_V0, NULL);
jit_stxi_p(curr_offset*sizeof(void*), JIT_V1, JIT_V0);
curr_offset++;
break;
}
case PGF_INSTR_PUSH_VALUE: {
size_t offset = pgf_read_int(rdr);
#ifdef PGF_JIT_DEBUG
@@ -649,6 +677,17 @@ pgf_jit_function(PgfReader* rdr, PgfAbstr* abstr,
gu_printf(out, err, "FAIL\n");
#endif
break;
case PGF_INSTR_UPDATE: {
#ifdef PGF_JIT_DEBUG
gu_printf(out, err, "UPDATE\n");
#endif
jit_getarg_p(JIT_V0, closure_arg);
jit_movi_p(JIT_V2, pgf_evaluate_indirection);
jit_stxi_p(0, JIT_V0, JIT_V2);
jit_stxi_p(sizeof(PgfClosure), JIT_V0, JIT_V1);
break;
}
case PGF_INSTR_RET: {
size_t count = pgf_read_int(rdr);