Defunctorize the ResJIT module.

[SXSI/xpathcomp.git] / src / runtime.ml

diff --git a/src/runtime.ml b/src/runtime.ml
index 5ca556b..498a1dc 100644 (file)
--- a/src/runtime.ml
+++ b/src/runtime.ml
@@ -217,7 +217,7 @@ DEFINE LOOP_TAG (t, states, tag, ctx) = (
 
       in *)
       let l3jit_dispatch trl s1 s2 t sl1 sl2 =
-       U.update cache3 auto trl s1 s2 empty_slot sl1 sl2 tree t
+       ResJIT.update U.exec cache3 auto trl s1 s2 empty_slot sl1 sl2 tree t
       in
       let cache2 = L2JIT.create () in
 
@@ -648,3 +648,113 @@ let dispatch_param1 conf id2 y0 y1 =
 
   end
 
+
+type 'a result_ops = {
+  empty : 'a;
+  subtree_tags : Tree.t -> Tree.node -> Tag.t -> 'a;
+  subtree_elements : Tree.t -> Tree.node -> 'a;
+  exec : 'a array -> 'a array -> 'a array -> Tree.node -> ResJIT.code -> unit;
+}
+
+let top_down_run rs auto tree root states ctx =
+  let res_len = StateSet.max_elt auto.states + 1 in
+  let empty_slot = Array.create res_len rs.empty in
+  let nil_res = auto.bottom_states, empty_slot in
+  let cache3 = ResJIT.create () in
+  let mark_subtree s subtree =
+    if subtree != rs.empty then
+      let r = Array.copy empty_slot in
+      r.(auto.last) <- subtree;
+      s,r
+    else
+      s,empty_slot
+  in
+      (*      let l3jit_dispatch trl s1 s2 t sl1 sl2 =
+             let f = L3JIT.find cache3 trl s1 s2 in
+             if f == l3jit_dummy then
+
+             (L3JIT.cache_apply cache3 auto trl s1 s2) empty_slot sl1 sl2 tree t
+             else f empty_slot sl1 sl2 tree t
+
+             in *)
+  let l3jit_dispatch trl s1 s2 t sl1 sl2 =
+    ResJIT.update rs.exec cache3 auto trl s1 s2 empty_slot sl1 sl2 tree t
+  in
+  let cache2 = L2JIT.create () in
+
+  let rec l2jit_dispatch t tag states ctx opcode =
+    match opcode with
+    | L2JIT.RETURN -> nil_res
+    | L2JIT.CACHE ->
+      let opcode = L2JIT.compile cache2 auto tree tag states in
+      l2jit_dispatch t tag states ctx opcode
+
+    | L2JIT.LEFT (tr_list, instr) ->
+      let res1, slot1 =
+               l2jit_dispatch_instr t (Tree.closing tree t) instr
+      in
+      l3jit_dispatch tr_list res1 auto.bottom_states t slot1 empty_slot
+
+    | L2JIT.RIGHT (tr_list, instr) ->
+           let res2, slot2 =
+             l2jit_dispatch_instr t ctx instr
+           in
+           l3jit_dispatch tr_list auto.bottom_states res2 t empty_slot slot2
+
+    | L2JIT.BOTH (tr_list, instr1, instr2) ->
+      let res1, slot1 =
+       l2jit_dispatch_instr t (Tree.closing tree t) instr1
+      in
+      let res2, slot2 =
+       l2jit_dispatch_instr t ctx instr2
+      in
+      l3jit_dispatch tr_list res1 res2 t slot1 slot2
+
+  and l2jit_dispatch_instr t ctx instr =
+    match instr with
+    | L2JIT.FIRST_CHILD s -> LOOP ((Tree.first_child tree t), s, ctx)
+    | L2JIT.NEXT_SIBLING s -> LOOP ((Tree.next_sibling tree t), s, ctx)
+
+    | L2JIT.FIRST_ELEMENT s -> LOOP ((Tree.first_element tree t), s, ctx)
+    | L2JIT.NEXT_ELEMENT s -> LOOP ((Tree.next_element tree t), s, ctx)
+
+    | L2JIT.TAGGED_DESCENDANT (s, tag) ->
+      LOOP_TAG ((Tree.tagged_descendant tree t tag), s, tag, ctx)
+
+    | L2JIT.TAGGED_FOLLOWING (s, tag) ->
+      LOOP_TAG((Tree.tagged_following_before tree t tag ctx), s, tag, ctx)
+
+    | L2JIT.SELECT_DESCENDANT (s, _, us) ->
+      LOOP((Tree.select_descendant tree t us), s, ctx)
+
+    | L2JIT.SELECT_FOLLOWING (s, pt, us) ->
+      LOOP ((Tree.select_following_before tree t us ctx), s, ctx)
+
+    | L2JIT.TAGGED_CHILD (s, tag) ->
+      LOOP_TAG((Tree.tagged_child tree t tag), s, tag, ctx)
+
+    | L2JIT.TAGGED_FOLLOWING_SIBLING (s, tag) ->
+      LOOP_TAG((Tree.tagged_following_sibling tree t tag), s, tag, ctx)
+
+    | L2JIT.SELECT_CHILD (s, _, us) ->
+      LOOP ((Tree.select_child tree t us), s, ctx)
+
+    | L2JIT.SELECT_FOLLOWING_SIBLING (s, _, us) ->
+      LOOP ((Tree.select_following_sibling tree t us), s, ctx)
+
+    | L2JIT.TAGGED_SUBTREE(s, tag) ->
+      mark_subtree s (rs.subtree_tags tree t tag)
+
+    | L2JIT.ELEMENT_SUBTREE(s) ->
+      mark_subtree s (rs.subtree_elements tree t)
+  in
+  let r = LOOP (root, states, ctx) in
+      (*L3JIT.stats err_formatter cache3; *)
+  r
+
+let full_top_down_run rs auto states tree root =
+  top_down_run rs auto tree root states (Tree.closing tree root)
+
+let top_down_run rs auto tree root =
+  let res, slot = full_top_down_run rs auto auto.init tree root in
+  slot.(StateSet.min_elt auto.topdown_marking_states)