klisp

commit 4818301932f8b46af495f56055768838c9e8ce31
parent 31418a7d171590b0121a7f695443127555265608
Author: Andres Navarro <canavarro82@gmail.com>
Date:   Sun, 17 Apr 2011 23:37:24 -0300

Bugfix: assert for kget_dummy1 was actually checking dummy2... Also added assertions to apply_cont & tail call to see that all gc protection resources are freed before exiting any function.

Diffstat:
M
src/kpair.h
 | 
2
+-
M
src/kstate.h
 | 
19
+++++++++++++++++++

2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/src/kpair.h b/src/kpair.h
@@ -69,7 +69,7 @@ bool kpairp(TValue obj);
 
 inline TValue kget_dummy1(klisp_State *K) 
 { 
-    klisp_assert(ttispair(K->dummy_pair2) && ttisnil(kcdr(K->dummy_pair2)));
+    klisp_assert(ttispair(K->dummy_pair1) && ttisnil(kcdr(K->dummy_pair1)));
     return K->dummy_pair1; 
 }
 
diff --git a/src/kstate.h b/src/kstate.h
@@ -335,14 +335,26 @@ typedef void (*klisp_Cfunc) (klisp_State*K, TValue *ud, TValue val);
 typedef void (*klisp_Ofunc) (klisp_State *K, TValue *ud, TValue ptree, 
 			     TValue env);
 
+/* XXX: this is ugly but we can't include kpair.h here so... */
+/* MAYBE: move car & cdr to kobject.h */
+#define kstate_car(p_) (tv2pair(p_)->car)
+#define kstate_cdr(p_) (tv2pair(p_)->cdr)
+
 /*
 ** Functions to manipulate the current continuation and calling 
 ** operatives
 */
 inline void klispS_apply_cc(klisp_State *K, TValue val)
 {
+    /* various assert to check the freeing of gc protection methods */
     klisp_assert(K->rooted_tvs_top == 0);
     klisp_assert(K->rooted_vars_top == 0);
+    klisp_assert(ttispair(K->dummy_pair1) && 
+		 ttisnil(kstate_cdr(K->dummy_pair1)));
+    klisp_assert(ttispair(K->dummy_pair2) && 
+		 ttisnil(kstate_cdr(K->dummy_pair2)));
+    klisp_assert(ttispair(K->dummy_pair3) && 
+		 ttisnil(kstate_cdr(K->dummy_pair3)));
 
     K->next_obj = K->curr_cont; /* save it from GC */
     Continuation *cont = tv2cont(K->curr_cont);
@@ -373,8 +385,15 @@ inline void klispS_set_cc(klisp_State *K, TValue new_cont)
 inline void klispS_tail_call(klisp_State *K, TValue top, TValue ptree, 
 			     TValue env)
 {
+    /* various assert to check the freeing of gc protection methods */
     klisp_assert(K->rooted_tvs_top == 0);
     klisp_assert(K->rooted_vars_top == 0);
+    klisp_assert(ttispair(K->dummy_pair1) && 
+		 ttisnil(kstate_cdr(K->dummy_pair1)));
+    klisp_assert(ttispair(K->dummy_pair2) && 
+		 ttisnil(kstate_cdr(K->dummy_pair2)));
+    klisp_assert(ttispair(K->dummy_pair3) && 
+		 ttisnil(kstate_cdr(K->dummy_pair3)));
 
     K->next_obj = top; /* save it from GC */
     Operative *op = tv2op(top);