From efedec187cef6e422c4dbcd50454dd2e29f1a3f8 Mon Sep 17 00:00:00 2001 From: "kr.angelov" Date: Sun, 26 Oct 2014 11:40:12 +0000 Subject: an explicit SAVE instruction --- src/runtime/haskell/PGF/Binary.hs | 67 +++++++++++++++++++------------------ src/runtime/haskell/PGF/ByteCode.hs | 6 ++-- 2 files changed, 38 insertions(+), 35 deletions(-) (limited to 'src/runtime/haskell') 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 -- cgit v1.2.3