diff options
| author | kr.angelov <kr.angelov@gmail.com> | 2014-09-29 15:00:04 +0000 |
|---|---|---|
| committer | kr.angelov <kr.angelov@gmail.com> | 2014-09-29 15:00:04 +0000 |
| commit | 80acad444792b77a77b6fa232989e1d2caf8c673 (patch) | |
| tree | 6f29193042700a0f3423156dc9fe28f3b4a9061d /src/runtime/haskell/PGF/Binary.hs | |
| parent | 1ecd61f7f58ca148024d8d40b7bd046142d0e9ad (diff) | |
bugfix in the pattern matching compiler and a number of other fixes that I somehow did not push before
Diffstat (limited to 'src/runtime/haskell/PGF/Binary.hs')
| -rw-r--r-- | src/runtime/haskell/PGF/Binary.hs | 66 |
1 files changed, 36 insertions, 30 deletions
diff --git a/src/runtime/haskell/PGF/Binary.hs b/src/runtime/haskell/PGF/Binary.hs index ae9a7e358..3f8515179 100644 --- a/src/runtime/haskell/PGF/Binary.hs +++ b/src/runtime/haskell/PGF/Binary.hs @@ -136,36 +136,42 @@ instance Binary Equation where get = liftM2 Equ get get
instance Binary Instr where
- put (ENTER ) = putWord8 0
- put (CASE id l ) = putWord8 8 >> put (id,l)
- put (CASE_LIT (LInt n) l) = putWord8 16 >> put (n,l)
- put (CASE_LIT (LStr s) l) = putWord8 17 >> put (s,l)
- put (CASE_LIT (LFlt d) l) = putWord8 18 >> put (d,l)
- put (ALLOC n) = putWord8 24 >> put n
- put (PUT_CONSTR id) = putWord8 32 >> put id
- put (PUT_FUN id) = putWord8 40 >> put id
- put (PUT_CLOSURE l) = putWord8 48 >> put l
- put (PUT_LIT (LInt n)) = putWord8 56 >> put n
- put (PUT_LIT (LStr s)) = putWord8 57 >> put s
- put (PUT_LIT (LFlt d)) = putWord8 58 >> put d
- put (SET (HEAP n)) = putWord8 64 >> put n
- put (SET (ARG_VAR n)) = putWord8 65 >> put n
- put (SET (FREE_VAR n)) = putWord8 66 >> put n
- put (SET_PAD ) = putWord8 72
- put (PUSH (HEAP n)) = putWord8 80 >> put n
- put (PUSH (ARG_VAR n)) = putWord8 81 >> put n
- put (PUSH (FREE_VAR n)) = putWord8 82 >> put n
- put (EVAL (HEAP n) RecCall ) = putWord8 88 >> put n
- put (EVAL (ARG_VAR n) RecCall ) = putWord8 89 >> put n
- put (EVAL (FREE_VAR n) RecCall ) = putWord8 90 >> put n
- put (EVAL (HEAP n) (TailCall a b)) = putWord8 92 >> put n >> put a >> put b
- put (EVAL (ARG_VAR n) (TailCall a b)) = putWord8 93 >> put n >> put a >> put b
- put (EVAL (FREE_VAR n) (TailCall a b)) = putWord8 94 >> put n >> put a >> put b
- put (CALL id RecCall ) = putWord8 96 >> put id
- put (CALL id (TailCall a b)) = putWord8 100 >> put id >> put a >> put b
- put (FAIL ) = putWord8 104
- put (UPDATE ) = putWord8 112
- put (RET n) = putWord8 120 >> put n
+ put (CHECK_ARGS n) = putWord8 0 >> put n
+ put (CASE id n l ) = putWord8 4 >> put (id,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 (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 (HEAP n)) = putWord8 36 >> put n
+ put (PUSH (ARG_VAR n)) = putWord8 37 >> put n
+ put (PUSH (FREE_VAR n)) = putWord8 38 >> put n
+ put (PUSH (GLOBAL id)) = putWord8 39 >> put id
+ put (EVAL (HEAP n) (RecCall )) = putWord8 40 >> put n
+ put (EVAL (ARG_VAR n) (RecCall )) = putWord8 41 >> put n
+ put (EVAL (FREE_VAR n) (RecCall )) = putWord8 42 >> put n
+ put (EVAL (GLOBAL id) (RecCall )) = putWord8 43 >> put id
+ put (EVAL (HEAP n) (TailCall a b c)) = putWord8 44 >> put n >> put (a,b,c)
+ put (EVAL (ARG_VAR n) (TailCall a b c)) = putWord8 45 >> put n >> put (a,b,c)
+ put (EVAL (FREE_VAR n) (TailCall a b c)) = putWord8 46 >> put n >> put (a,b,c)
+ put (EVAL (GLOBAL id) (TailCall a b c)) = putWord8 47 >> put id >> put (a,b,c)
+ put (EVAL (HEAP n) (UpdateCall b c)) = putWord8 48 >> put n >> put (b,c)
+ put (EVAL (ARG_VAR n) (UpdateCall b c)) = putWord8 49 >> put n >> put (b,c)
+ put (EVAL (FREE_VAR n) (UpdateCall b c)) = putWord8 50 >> put n >> put (b,c)
+ put (EVAL (GLOBAL id) (UpdateCall b c)) = putWord8 51 >> put id >> put (b,c)
+ put (RET h (TailCall a b c)) = putWord8 53 >> put h >> put a >> put b
+ put (RET h (UpdateCall b c)) = putWord8 54 >> put h >> put b
+ put (DROP n l ) = putWord8 60 >> put (n,l)
+ put (FAIL ) = putWord8 64
instance Binary Type where
put (DTyp hypos cat exps) = put (hypos,cat,exps)
|