working on getting the stacklets working with the JIT

halgari · halgari · commit bc61b91dfdea · 2014-10-02T22:05:04.000-06:00
diff --git a/pixie/vm/stacklet.py b/pixie/vm/stacklet.py
@@ -22,6 +22,8 @@ def type(self):
 
 box = Box()
 box._val = None
+fn_box = Box()
+arg_box = Box()
 
 class WrappedHandler(BaseCode):
     _type = object.Type("Stacklet")
@@ -41,15 +43,18 @@ def _invoke(self, args):
 
 
 def new_stacklet(f, val):
-    global box
+    global box, fn_box, arg_box
     box._val = Box()
     self_box = box._val
+    fn_box._val = f
+    arg_box._val = val
     def default_handler(h, o):
-        global box
+        global box, fn_box, arg_box
         handler = WrappedHandler(h, box._val)
         box._val = None
         handler._h = th.switch(handler._h)
-        retval = f.invoke([handler, val])
+        retval = fn_box._val.invoke([handler, arg_box._val])
+
         return handler._h
 
     h = th.new(default_handler)
diff --git a/pixie/vm/test/test_compile.py b/pixie/vm/test/test_compile.py
@@ -110,8 +110,8 @@ def test_build_vector():
 
 def test_stacklets():
     retval = eval_string("""
-                             (def foo (fn [h v] (h 42)))
-                             ((create-stacklet foo) 0)
+                             (do (def foo (fn [h v] (h 42)))
+                             ((create-stacklet foo) 0))
     """)
 
     assert isinstance(retval, Integer) and retval.int_val() == 42
