partial implementation for recursive def rules

4 files changed, 61 insertions, 4 deletions

diff --git a/src/runtime/c/pgf/data.h b/src/runtime/c/pgf/data.h
index 552856995..bbf3351cb 100644
--- a/src/runtime/c/pgf/data.h
+++ b/src/runtime/c/pgf/data.h
@@ -117,6 +117,8 @@ typedef enum {
   PGF_INSTR_PUT_FLT,
   PGF_INSTR_SET_VALUE,
   PGF_INSTR_SET_VARIABLE,
+  PGF_INSTR_PUSH_VALUE,
+  PGF_INSTR_PUSH_VARIABLE,
   PGF_INSTR_TAIL_CALL,
   PGF_INSTR_FAIL,
   PGF_INSTR_RET
diff --git a/src/runtime/c/pgf/jit.c b/src/runtime/c/pgf/jit.c
index 646115c4e..0efaa7fd2 100644
--- a/src/runtime/c/pgf/jit.c
+++ b/src/runtime/c/pgf/jit.c
@@ -527,11 +527,60 @@ pgf_jit_function(PgfReader* rdr, PgfAbstr* abstr,
 			curr_offset++;
 			break;
 		}
+		case PGF_INSTR_PUSH_VALUE: {
+			size_t offset = pgf_read_int(rdr);
+#ifdef PGF_JIT_DEBUG
+			gu_printf(out, err, "PUSH_VALUE    %d\n", offset);
+#endif
+
+			jit_getarg_p(JIT_V0, es_arg);
+			jit_ldxi_p(JIT_V0, JIT_V0, offsetof(PgfEvalState,stack));
+			jit_prepare(1);
+			jit_pusharg_p(JIT_V0);
+			jit_finish(gu_buf_extend);
+			if (offset == 0) {
+				jit_str_p(JIT_RET, JIT_V1);
+			} else {
+				jit_addi_p(JIT_V0, JIT_V1, offset*sizeof(void*));
+				jit_str_p(JIT_RET, JIT_V0);
+			}
+			break;
+		}
+		case PGF_INSTR_PUSH_VARIABLE: {
+			size_t index = pgf_read_int(rdr);
+#ifdef PGF_JIT_DEBUG
+			gu_printf(out, err, "PUSH_VARIABLE %d\n", index);
+#endif
+
+			jit_getarg_p(JIT_V0, es_arg);
+			jit_ldxi_p(JIT_V0, JIT_V0, offsetof(PgfEvalState,stack));
+			jit_prepare(1);
+			jit_pusharg_p(JIT_V0);
+			jit_finish(gu_buf_extend);
+			jit_ldxi_p(JIT_V0, JIT_RET, -(index+1)*sizeof(PgfClosure*));
+			jit_str_p(JIT_RET, JIT_V0);
+			break;
+		}
 		case PGF_INSTR_TAIL_CALL: {
 			PgfCId id = pgf_read_cid(rdr, rdr->tmp_pool);
 #ifdef PGF_JIT_DEBUG
 			gu_printf(out, err, "TAIL_CALL    %s\n", id);
 #endif
+			
+			jit_getarg_p(JIT_V0, es_arg);
+			jit_getarg_p(JIT_V1, closure_arg);
+			jit_prepare(2);
+			jit_pusharg_p(JIT_V1);
+			jit_pusharg_p(JIT_V0);
+
+			PgfCallPatch patch;
+			patch.cid = id;
+			patch.ref = jit_movi_p(JIT_V0, jit_forward());
+			gu_buf_push(rdr->jit_state->call_patches, PgfCallPatch, patch);			
+			jit_ldxi_p(JIT_V0, JIT_V0, offsetof(PgfAbsFun,function));
+
+			jit_finishr(JIT_V0);
+			jit_retval_p(JIT_V1);
 			break;
 		}
 		case PGF_INSTR_FAIL:
diff --git a/src/runtime/haskell/PGF/Binary.hs b/src/runtime/haskell/PGF/Binary.hs
index b2bfda069..b5c301e3b 100644
--- a/src/runtime/haskell/PGF/Binary.hs
+++ b/src/runtime/haskell/PGF/Binary.hs
@@ -149,9 +149,11 @@ instance Binary Instr where
   put (PUT_FLT      d) = putWord8 10 >> put d

   put (SET_VALUE    n) = putWord8 11 >> put n

   put (SET_VARIABLE n) = putWord8 12 >> put n

-  put (TAIL_CALL   id) = putWord8 13 >> put id

-  put (FAIL          ) = putWord8 14

-  put (RET          n) = putWord8 15 >> put n

+  put (PUSH_VALUE    n)= putWord8 13 >> put n

+  put (PUSH_VARIABLE n)= putWord8 14 >> put n

+  put (TAIL_CALL   id) = putWord8 15 >> put id

+  put (FAIL          ) = putWord8 16

+  put (RET          n) = putWord8 17 >> put n

 

 

 instance Binary Type where

diff --git a/src/runtime/haskell/PGF/ByteCode.hs b/src/runtime/haskell/PGF/ByteCode.hs
index b8e7d889d..bcf21ed9b 100644
--- a/src/runtime/haskell/PGF/ByteCode.hs
+++ b/src/runtime/haskell/PGF/ByteCode.hs
@@ -19,6 +19,8 @@ data Instr
   | PUT_FLT {-# UNPACK #-} !Double
   | SET_VALUE {-# UNPACK #-} !Int
   | SET_VARIABLE    {-# UNPACK #-} !Int
+  | PUSH_VALUE {-# UNPACK #-} !Int
+  | PUSH_VARIABLE    {-# UNPACK #-} !Int
   | TAIL_CALL    CId
   | FAIL
   | RET {-# UNPACK #-} !Int
@@ -33,13 +35,15 @@ ppInstr l (CASE_INT n o  ) = text "CASE_INT    " <+> int n <+> ppLabel (l+o+1)
 ppInstr l (CASE_STR s o  ) = text "CASE_STR    " <+> text (show s) <+> ppLabel (l+o+1)
 ppInstr l (CASE_FLT d o  ) = text "CASE_FLT    " <+> double d <+> ppLabel (l+o+1)
 ppInstr l (ALLOC        n) = text "ALLOC       " <+> int n
-ppInstr l (SET_VALUE    n) = text "SET_VALUE   " <+> int n
 ppInstr l (PUT_CONSTR  id) = text "PUT_CONSTR  " <+> ppCId id
 ppInstr l (PUT_CLOSURE  c) = text "PUT_CLOSURE " <+> ppLabel c
 ppInstr l (PUT_INT n     ) = text "PUT_INT     " <+> int n
 ppInstr l (PUT_STR s     ) = text "PUT_STR     " <+> text (show s)
 ppInstr l (PUT_FLT d     ) = text "PUT_FLT     " <+> double d
+ppInstr l (SET_VALUE    n) = text "SET_VALUE   " <+> int n
 ppInstr l (SET_VARIABLE n) = text "SET_VARIABLE" <+> int n
+ppInstr l (PUSH_VALUE   n) = text "PUSH_VALUE  " <+> int n
+ppInstr l (PUSH_VARIABLE n)= text "PUSH_VARIABLE"<+> int n
 ppInstr l (TAIL_CALL   id) = text "TAIL_CALL   " <+> ppCId id
 ppInstr l (FAIL          ) = text "FAIL"
 ppInstr l (RET          n) = text "RET         " <+> int n