From efedec187cef6e422c4dbcd50454dd2e29f1a3f8 Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Sun, 26 Oct 2014 11:40:12 +0000 Subject: [PATCH] an explicit SAVE instruction --- src/compiler/GF/Compile/GenerateBC.hs | 10 ++-- src/runtime/c/pgf/data.h | 27 +++++------ src/runtime/c/pgf/jit.c | 17 ++++--- src/runtime/haskell/PGF/Binary.hs | 67 ++++++++++++++------------- src/runtime/haskell/PGF/ByteCode.hs | 6 ++- 5 files changed, 68 insertions(+), 59 deletions(-) diff --git a/src/compiler/GF/Compile/GenerateBC.hs b/src/compiler/GF/Compile/GenerateBC.hs index d8edac270..7050abd55 100644 --- a/src/compiler/GF/Compile/GenerateBC.hs +++ b/src/compiler/GF/Compile/GenerateBC.hs @@ -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) in (bs2,instrs1) - case_instr t n = + case_instr t = case t of - (Q (_,id)) -> CASE (i2i id) n + (Q (_,id)) -> CASE (i2i id) (EInt n) -> CASE_LIT (LInt n) (K s) -> CASE_LIT (LStr s) (EFloat d) -> CASE_LIT (LFlt d) + saves n = reverse [SAVE i | i <- [0..n-1]] + compileBranch0 fl bs ((t,n),eqs) = 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) = - 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 mkFail arity st1 Nothing diff --git a/src/runtime/c/pgf/data.h b/src/runtime/c/pgf/data.h index 154679ac8..864cf9b27 100644 --- a/src/runtime/c/pgf/data.h +++ b/src/runtime/c/pgf/data.h @@ -127,19 +127,20 @@ typedef enum { PGF_INSTR_CHECK_ARGS = 0, PGF_INSTR_CASE = 1, PGF_INSTR_CASE_LIT = 2, - PGF_INSTR_ALLOC = 3, - PGF_INSTR_PUT_CONSTR = 4, - PGF_INSTR_PUT_CLOSURE = 5, - PGF_INSTR_PUT_LIT = 6, - PGF_INSTR_SET = 7, - PGF_INSTR_SET_PAD = 8, - PGF_INSTR_PUSH_FRAME = 9, - PGF_INSTR_PUSH = 10, - PGF_INSTR_EVAL = 11, - PGF_INSTR_DROP = 14, - PGF_INSTR_JUMP = 15, - PGF_INSTR_FAIL = 16, - PGF_INSTR_ADD = 17, + PGF_INSTR_SAVE = 3, + PGF_INSTR_ALLOC = 4, + PGF_INSTR_PUT_CONSTR = 5, + PGF_INSTR_PUT_CLOSURE = 6, + PGF_INSTR_PUT_LIT = 7, + PGF_INSTR_SET = 8, + PGF_INSTR_SET_PAD = 9, + PGF_INSTR_PUSH_FRAME = 10, + PGF_INSTR_PUSH = 11, + PGF_INSTR_EVAL = 12, + PGF_INSTR_DROP = 15, + PGF_INSTR_JUMP = 16, + PGF_INSTR_FAIL = 17, + PGF_INSTR_ADD = 18, } PgfInstruction; typedef GuSeq PgfConcrs; diff --git a/src/runtime/c/pgf/jit.c b/src/runtime/c/pgf/jit.c index dbb441454..9886c648a 100644 --- a/src/runtime/c/pgf/jit.c +++ b/src/runtime/c/pgf/jit.c @@ -689,10 +689,9 @@ pgf_jit_function(PgfReader* rdr, PgfAbstr* abstr, } case PGF_INSTR_CASE: { PgfCId id = pgf_read_cid(rdr, rdr->tmp_pool); - int n = pgf_read_int(rdr); int target = pgf_read_int(rdr); #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 jit_insn *jump = 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.ref = jump-6; 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; } case PGF_INSTR_CASE_LIT: { @@ -772,6 +766,15 @@ pgf_jit_function(PgfReader* rdr, PgfAbstr* abstr, 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: { size_t size = pgf_read_int(rdr); #ifdef PGF_JIT_DEBUG diff --git a/src/runtime/haskell/PGF/Binary.hs b/src/runtime/haskell/PGF/Binary.hs index 3dcf9e163..87946a7cb 100644 --- a/src/runtime/haskell/PGF/Binary.hs +++ b/src/runtime/haskell/PGF/Binary.hs @@ -137,42 +137,43 @@ instance Binary Equation where instance Binary Instr where 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 (LStr s) l) = putWord8 9 >> put (s,l) put (CASE_LIT (LFlt d) l) = putWord8 10 >> put (d,l) - put (ALLOC n) = putWord8 12 >> put n - put (PUT_CONSTR id) = putWord8 16 >> put id - put (PUT_CLOSURE l) = putWord8 20 >> put l - put (PUT_LIT (LInt n)) = putWord8 24 >> put n - put (PUT_LIT (LStr s)) = putWord8 25 >> put s - put (PUT_LIT (LFlt d)) = putWord8 26 >> put d - put (SET (HEAP n)) = putWord8 28 >> put n - put (SET (ARG_VAR n)) = putWord8 29 >> put n - put (SET (FREE_VAR n)) = putWord8 30 >> put n - put (SET (GLOBAL id)) = putWord8 31 >> put id - put (SET_PAD ) = putWord8 32 - put (PUSH_FRAME ) = putWord8 36 - put (PUSH (HEAP n)) = putWord8 40 >> put n - put (PUSH (ARG_VAR n)) = putWord8 41 >> put n - put (PUSH (FREE_VAR n)) = putWord8 42 >> put n - put (PUSH (GLOBAL id)) = putWord8 43 >> put id - put (EVAL (HEAP n) (RecCall )) = putWord8 44 >> put n - put (EVAL (ARG_VAR n) (RecCall )) = putWord8 45 >> put n - put (EVAL (FREE_VAR n) (RecCall )) = putWord8 46 >> put n - put (EVAL (GLOBAL id) (RecCall )) = putWord8 47 >> put id - put (EVAL (HEAP n) (TailCall a b c)) = putWord8 48 >> put n >> put (a,b,c) - put (EVAL (ARG_VAR n) (TailCall a b c)) = putWord8 49 >> 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 (GLOBAL id) (TailCall a b c)) = putWord8 51 >> put id >> put (a,b,c) - put (EVAL (HEAP n) (UpdateCall b c)) = putWord8 52 >> put n >> put (b,c) - put (EVAL (ARG_VAR n) (UpdateCall b c)) = putWord8 53 >> put n >> put (b,c) - put (EVAL (FREE_VAR n) (UpdateCall b c)) = putWord8 54 >> put n >> put (b,c) - put (EVAL (GLOBAL id) (UpdateCall b c)) = putWord8 55 >> put id >> put (b,c) - put (DROP n ) = putWord8 56 >> put n - put (JUMP l ) = putWord8 60 >> put l - put (FAIL ) = putWord8 64 - put (ADD ) = putWord8 68 + put (SAVE n) = putWord8 12 >> put n + put (ALLOC n) = putWord8 16 >> put n + put (PUT_CONSTR id) = putWord8 20 >> put id + put (PUT_CLOSURE l) = putWord8 24 >> put l + put (PUT_LIT (LInt n)) = putWord8 28 >> put n + put (PUT_LIT (LStr s)) = putWord8 29 >> put s + put (PUT_LIT (LFlt d)) = putWord8 30 >> put d + put (SET (HEAP n)) = putWord8 32 >> put n + put (SET (ARG_VAR n)) = putWord8 33 >> put n + put (SET (FREE_VAR n)) = putWord8 34 >> put n + put (SET (GLOBAL id)) = putWord8 35 >> put id + put (SET_PAD ) = putWord8 36 + put (PUSH_FRAME ) = putWord8 40 + put (PUSH (HEAP n)) = putWord8 44 >> put n + put (PUSH (ARG_VAR n)) = putWord8 45 >> put n + put (PUSH (FREE_VAR n)) = putWord8 46 >> put n + put (PUSH (GLOBAL id)) = putWord8 47 >> put id + put (EVAL (HEAP n) (RecCall )) = putWord8 48 >> put n + put (EVAL (ARG_VAR n) (RecCall )) = putWord8 49 >> put n + put (EVAL (FREE_VAR n) (RecCall )) = putWord8 50 >> put n + put (EVAL (GLOBAL id) (RecCall )) = putWord8 51 >> put id + put (EVAL (HEAP n) (TailCall a b c)) = putWord8 52 >> 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 (FREE_VAR n) (TailCall a b c)) = putWord8 54 >> put n >> put (a,b,c) + put (EVAL (GLOBAL id) (TailCall a b c)) = putWord8 55 >> put id >> put (a,b,c) + put (EVAL (HEAP n) (UpdateCall b c)) = putWord8 56 >> put n >> put (b,c) + put (EVAL (ARG_VAR n) (UpdateCall b c)) = putWord8 57 >> put n >> put (b,c) + put (EVAL (FREE_VAR n) (UpdateCall b c)) = putWord8 58 >> put n >> put (b,c) + put (EVAL (GLOBAL id) (UpdateCall b c)) = putWord8 59 >> put id >> put (b,c) + put (DROP n ) = putWord8 60 >> put n + put (JUMP l ) = putWord8 64 >> put l + put (FAIL ) = putWord8 68 + put (ADD ) = putWord8 72 instance Binary Type where put (DTyp hypos cat exps) = put (hypos,cat,exps) diff --git a/src/runtime/haskell/PGF/ByteCode.hs b/src/runtime/haskell/PGF/ByteCode.hs index f4aebfd92..6cf7daffd 100644 --- a/src/runtime/haskell/PGF/ByteCode.hs +++ b/src/runtime/haskell/PGF/ByteCode.hs @@ -16,8 +16,9 @@ type CodeLabel = Int data Instr = CHECK_ARGS {-# UNPACK #-} !Int - | CASE CId {-# UNPACK #-} !Int {-# UNPACK #-} !CodeLabel + | CASE CId {-# UNPACK #-} !CodeLabel | CASE_LIT Literal {-# UNPACK #-} !CodeLabel + | SAVE {-# UNPACK #-} !Int | ALLOC {-# UNPACK #-} !Int | PUT_CONSTR CId | 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 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 (SAVE n) = text "SAVE " <+> int n ppInstr (ALLOC n) = text "ALLOC " <+> int n ppInstr (PUT_CONSTR id) = text "PUT_CONSTR " <+> ppCId id ppInstr (PUT_CLOSURE l) = text "PUT_CLOSURE" <+> ppLabel l