GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-21 00:52:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

an explicit SAVE instruction

Browse Source
This commit is contained in:
kr.angelov
2014-10-26 11:40:12 +00:00
parent 6986f1acd7
commit efedec187c
5 changed files with 68 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/compiler/GF/Compile/GenerateBC.hs
View File

@@ -60,19 +60,21 @@ compileEquations gr arity st (i:is) eqs fl bs = whilePP eqs Map.empty
(bs2,instrs2) = compileEquations gr arity st (i:is) eqs fl (instrs2:bs1) (bs2,instrs2) = compileEquations gr arity st (i:is) eqs fl (instrs2:bs1)
in (bs2,instrs1) in (bs2,instrs1)
case_instr t n = case_instr t =
case t of case t of
(Q (_,id)) -> CASE (i2i id) n (Q (_,id)) -> CASE (i2i id)
(EInt n) -> CASE_LIT (LInt n) (EInt n) -> CASE_LIT (LInt n)
(K s) -> CASE_LIT (LStr s) (K s) -> CASE_LIT (LStr s)
(EFloat d) -> CASE_LIT (LFlt d) (EFloat d) -> CASE_LIT (LFlt d)
saves n = reverse [SAVE i | i <- [0..n-1]]
compileBranch0 fl bs ((t,n),eqs) = compileBranch0 fl bs ((t,n),eqs) =
let (bs1,instrs) = compileEquations gr arity (st+n) (push_is (st+n-1) n is) eqs fl bs let (bs1,instrs) = compileEquations gr arity (st+n) (push_is (st+n-1) n is) eqs fl bs
in (bs1, case_instr t n (length bs1) : instrs) in (bs1, case_instr t (length bs1) : saves n ++ instrs)
compileBranch l bs ((t,n),eqs) = compileBranch l bs ((t,n),eqs) =
let (bs1,instrs) = compileEquations gr arity (st+n) (push_is (st+n-1) n is) eqs fl ((case_instr t n (length bs1) : instrs) : bs) let (bs1,instrs) = compileEquations gr arity (st+n) (push_is (st+n-1) n is) eqs fl ((case_instr t (length bs1) : saves n ++ instrs) : bs)
in bs1 in bs1
mkFail arity st1 Nothing mkFail arity st1 Nothing

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

@@ -127,19 +127,20 @@ typedef enum {
PGF_INSTR_CHECK_ARGS = 0, PGF_INSTR_CHECK_ARGS = 0,
PGF_INSTR_CASE = 1, PGF_INSTR_CASE = 1,
PGF_INSTR_CASE_LIT = 2, PGF_INSTR_CASE_LIT = 2,
PGF_INSTR_ALLOC = 3, PGF_INSTR_SAVE = 3,
PGF_INSTR_PUT_CONSTR = 4, PGF_INSTR_ALLOC = 4,
PGF_INSTR_PUT_CLOSURE = 5, PGF_INSTR_PUT_CONSTR = 5,
PGF_INSTR_PUT_LIT = 6, PGF_INSTR_PUT_CLOSURE = 6,
PGF_INSTR_SET = 7, PGF_INSTR_PUT_LIT = 7,
PGF_INSTR_SET_PAD = 8, PGF_INSTR_SET = 8,
PGF_INSTR_PUSH_FRAME = 9, PGF_INSTR_SET_PAD = 9,
PGF_INSTR_PUSH = 10, PGF_INSTR_PUSH_FRAME = 10,
PGF_INSTR_EVAL = 11, PGF_INSTR_PUSH = 11,
PGF_INSTR_DROP = 14, PGF_INSTR_EVAL = 12,
PGF_INSTR_JUMP = 15, PGF_INSTR_DROP = 15,
PGF_INSTR_FAIL = 16, PGF_INSTR_JUMP = 16,
PGF_INSTR_ADD = 17, PGF_INSTR_FAIL = 17,
PGF_INSTR_ADD = 18,
} PgfInstruction; } PgfInstruction;
typedef GuSeq PgfConcrs; typedef GuSeq PgfConcrs;

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

@@ -689,10 +689,9 @@ pgf_jit_function(PgfReader* rdr, PgfAbstr* abstr,
} }
case PGF_INSTR_CASE: { case PGF_INSTR_CASE: {
PgfCId id = pgf_read_cid(rdr, rdr->tmp_pool); PgfCId id = pgf_read_cid(rdr, rdr->tmp_pool);
int n = pgf_read_int(rdr);
int target = pgf_read_int(rdr); int target = pgf_read_int(rdr);
#ifdef PGF_JIT_DEBUG #ifdef PGF_JIT_DEBUG
gu_printf(out, err, "CASE %s %d %03d\n", id, n, target); gu_printf(out, err, "CASE %s %03d\n", id, target);
#endif #endif
jit_insn *jump = jit_insn *jump =
jit_bnei_i(jit_forward(), JIT_RET, (int) jit_forward()); jit_bnei_i(jit_forward(), JIT_RET, (int) jit_forward());
@@ -707,11 +706,6 @@ pgf_jit_function(PgfReader* rdr, PgfAbstr* abstr,
call_patch.cid = id; call_patch.cid = id;
call_patch.ref = jump-6; call_patch.ref = jump-6;
gu_buf_push(rdr->jit_state->call_patches, PgfCallPatch, call_patch); gu_buf_push(rdr->jit_state->call_patches, PgfCallPatch, call_patch);
for (int i = n; i > 0; i--) {
jit_ldxi_p(JIT_R0, JIT_VHEAP, sizeof(PgfValue)+sizeof(PgfClosure*)*(i-1));
jit_pushr_p(JIT_R0);
}
break; break;
} }
case PGF_INSTR_CASE_LIT: { case PGF_INSTR_CASE_LIT: {
@@ -772,6 +766,15 @@ pgf_jit_function(PgfReader* rdr, PgfAbstr* abstr,
break; break;
} }
case PGF_INSTR_SAVE: {
int i = pgf_read_int(rdr);
#ifdef PGF_JIT_DEBUG
gu_printf(out, err, "SAVE %d\n", i);
#endif
jit_ldxi_p(JIT_R0, JIT_VHEAP, sizeof(PgfValue)+sizeof(PgfClosure*)*i);
jit_pushr_p(JIT_R0);
break;
}
case PGF_INSTR_ALLOC: { case PGF_INSTR_ALLOC: {
size_t size = pgf_read_int(rdr); size_t size = pgf_read_int(rdr);
#ifdef PGF_JIT_DEBUG #ifdef PGF_JIT_DEBUG

67
src/runtime/haskell/PGF/Binary.hs
View File

@@ -137,42 +137,43 @@ instance Binary Equation where
instance Binary Instr where instance Binary Instr where
put (CHECK_ARGS n) = putWord8 0 >> put n put (CHECK_ARGS n) = putWord8 0 >> put n
put (CASE id n l ) = putWord8 4 >> put (id,n,l) put (CASE id l) = putWord8 4 >> put (id,l)
put (CASE_LIT (LInt n) l) = putWord8 8 >> put (n,l) put (CASE_LIT (LInt n) l) = putWord8 8 >> put (n,l)
put (CASE_LIT (LStr s) l) = putWord8 9 >> put (s,l) put (CASE_LIT (LStr s) l) = putWord8 9 >> put (s,l)
put (CASE_LIT (LFlt d) l) = putWord8 10 >> put (d,l) put (CASE_LIT (LFlt d) l) = putWord8 10 >> put (d,l)
put (ALLOC n) = putWord8 12 >> put n put (SAVE n) = putWord8 12 >> put n
put (PUT_CONSTR id) = putWord8 16 >> put id put (ALLOC n) = putWord8 16 >> put n
put (PUT_CLOSURE l) = putWord8 20 >> put l put (PUT_CONSTR id) = putWord8 20 >> put id
put (PUT_LIT (LInt n)) = putWord8 24 >> put n put (PUT_CLOSURE l) = putWord8 24 >> put l
put (PUT_LIT (LStr s)) = putWord8 25 >> put s put (PUT_LIT (LInt n)) = putWord8 28 >> put n
put (PUT_LIT (LFlt d)) = putWord8 26 >> put d put (PUT_LIT (LStr s)) = putWord8 29 >> put s
put (SET (HEAP n)) = putWord8 28 >> put n put (PUT_LIT (LFlt d)) = putWord8 30 >> put d
put (SET (ARG_VAR n)) = putWord8 29 >> put n put (SET (HEAP n)) = putWord8 32 >> put n
put (SET (FREE_VAR n)) = putWord8 30 >> put n put (SET (ARG_VAR n)) = putWord8 33 >> put n
put (SET (GLOBAL id)) = putWord8 31 >> put id put (SET (FREE_VAR n)) = putWord8 34 >> put n
put (SET_PAD ) = putWord8 32 put (SET (GLOBAL id)) = putWord8 35 >> put id
put (PUSH_FRAME ) = putWord8 36 put (SET_PAD ) = putWord8 36
put (PUSH (HEAP n)) = putWord8 40 >> put n put (PUSH_FRAME ) = putWord8 40
put (PUSH (ARG_VAR n)) = putWord8 41 >> put n put (PUSH (HEAP n)) = putWord8 44 >> put n
put (PUSH (FREE_VAR n)) = putWord8 42 >> put n put (PUSH (ARG_VAR n)) = putWord8 45 >> put n
put (PUSH (GLOBAL id)) = putWord8 43 >> put id put (PUSH (FREE_VAR n)) = putWord8 46 >> put n
put (EVAL (HEAP n) (RecCall )) = putWord8 44 >> put n put (PUSH (GLOBAL id)) = putWord8 47 >> put id
put (EVAL (ARG_VAR n) (RecCall )) = putWord8 45 >> put n put (EVAL (HEAP n) (RecCall )) = putWord8 48 >> put n
put (EVAL (FREE_VAR n) (RecCall )) = putWord8 46 >> put n put (EVAL (ARG_VAR n) (RecCall )) = putWord8 49 >> put n
put (EVAL (GLOBAL id) (RecCall )) = putWord8 47 >> put id put (EVAL (FREE_VAR n) (RecCall )) = putWord8 50 >> put n
put (EVAL (HEAP n) (TailCall a b c)) = putWord8 48 >> put n >> put (a,b,c) put (EVAL (GLOBAL id) (RecCall )) = putWord8 51 >> put id
put (EVAL (ARG_VAR n) (TailCall a b c)) = putWord8 49 >> put n >> put (a,b,c) put (EVAL (HEAP n) (TailCall a b c)) = putWord8 52 >> put n >> put (a,b,c)
put (EVAL (FREE_VAR n) (TailCall a b c)) = putWord8 50 >> put n >> put (a,b,c) put (EVAL (ARG_VAR n) (TailCall a b c)) = putWord8 53 >> put n >> put (a,b,c)
put (EVAL (GLOBAL id) (TailCall a b c)) = putWord8 51 >> put id >> put (a,b,c) put (EVAL (FREE_VAR n) (TailCall a b c)) = putWord8 54 >> put n >> put (a,b,c)
put (EVAL (HEAP n) (UpdateCall b c)) = putWord8 52 >> put n >> put (b,c) put (EVAL (GLOBAL id) (TailCall a b c)) = putWord8 55 >> put id >> put (a,b,c)
put (EVAL (ARG_VAR n) (UpdateCall b c)) = putWord8 53 >> put n >> put (b,c) put (EVAL (HEAP n) (UpdateCall b c)) = putWord8 56 >> put n >> put (b,c)
put (EVAL (FREE_VAR n) (UpdateCall b c)) = putWord8 54 >> put n >> put (b,c) put (EVAL (ARG_VAR n) (UpdateCall b c)) = putWord8 57 >> put n >> put (b,c)
put (EVAL (GLOBAL id) (UpdateCall b c)) = putWord8 55 >> put id >> put (b,c) put (EVAL (FREE_VAR n) (UpdateCall b c)) = putWord8 58 >> put n >> put (b,c)
put (DROP n ) = putWord8 56 >> put n put (EVAL (GLOBAL id) (UpdateCall b c)) = putWord8 59 >> put id >> put (b,c)
put (JUMP l ) = putWord8 60 >> put l put (DROP n ) = putWord8 60 >> put n
put (FAIL ) = putWord8 64 put (JUMP l ) = putWord8 64 >> put l
put (ADD ) = putWord8 68 put (FAIL ) = putWord8 68
put (ADD ) = putWord8 72
instance Binary Type where instance Binary Type where
put (DTyp hypos cat exps) = put (hypos,cat,exps) put (DTyp hypos cat exps) = put (hypos,cat,exps)

6
src/runtime/haskell/PGF/ByteCode.hs
View File

@@ -16,8 +16,9 @@ type CodeLabel = Int
data Instr data Instr
= CHECK_ARGS {-# UNPACK #-} !Int = CHECK_ARGS {-# UNPACK #-} !Int
| CASE CId {-# UNPACK #-} !Int {-# UNPACK #-} !CodeLabel | CASE CId {-# UNPACK #-} !CodeLabel
| CASE_LIT Literal {-# UNPACK #-} !CodeLabel | CASE_LIT Literal {-# UNPACK #-} !CodeLabel
| SAVE {-# UNPACK #-} !Int
| ALLOC {-# UNPACK #-} !Int | ALLOC {-# UNPACK #-} !Int
| PUT_CONSTR CId | PUT_CONSTR CId
| PUT_CLOSURE {-# UNPACK #-} !CodeLabel | PUT_CLOSURE {-# UNPACK #-} !CodeLabel
@@ -52,8 +53,9 @@ ppCode l [] = empty
ppCode l (is:iss) = ppLabel l <+> vcat (map ppInstr is) $$ ppCode (l+1) iss ppCode l (is:iss) = ppLabel l <+> vcat (map ppInstr is) $$ ppCode (l+1) iss
ppInstr (CHECK_ARGS n) = text "CHECK_ARGS " <+> int n ppInstr (CHECK_ARGS n) = text "CHECK_ARGS " <+> int n
ppInstr (CASE id n l ) = text "CASE " <+> ppCId id <+> int n <+> ppLabel l ppInstr (CASE id l ) = text "CASE " <+> ppCId id <+> ppLabel l
ppInstr (CASE_LIT lit l ) = text "CASE_LIT " <+> ppLit lit <+> ppLabel l ppInstr (CASE_LIT lit l ) = text "CASE_LIT " <+> ppLit lit <+> ppLabel l
ppInstr (SAVE n) = text "SAVE " <+> int n
ppInstr (ALLOC n) = text "ALLOC " <+> int n ppInstr (ALLOC n) = text "ALLOC " <+> int n
ppInstr (PUT_CONSTR id) = text "PUT_CONSTR " <+> ppCId id ppInstr (PUT_CONSTR id) = text "PUT_CONSTR " <+> ppCId id
ppInstr (PUT_CLOSURE l) = text "PUT_CLOSURE" <+> ppLabel l ppInstr (PUT_CLOSURE l) = text "PUT_CLOSURE" <+> ppLabel l