Move the L3JIT to the ResJIT module.

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

diff --git a/src/runtime.ml b/src/runtime.ml
index a02f7a8..5ca556b 100644 (file)
--- a/src/runtime.ml
+++ b/src/runtime.ml
@@ -1,6 +1,7 @@
 INCLUDE "debug.ml"
 INCLUDE "trace.ml"
 INCLUDE "utils.ml"
+let l3jit_dummy _ _ _ _ _ = failwith "Uninitialized L3JIT"
 
 open Format
 open Ata
@@ -57,34 +58,32 @@ module Make (U : ResJIT.S) : S with type result_set = U.NS.t =
             | _ -> assert false
        ) trans (StateSet.empty, [], [])
 
-
-
     module L3JIT =
       struct
 
-       type opcode = (t -> t -> t -> Tree.t -> Tree.node -> StateSet.t * t)
+       type opcode = (U.t -> U.t -> U.t -> Tree.t -> Tree.node -> StateSet.t * U.t)
 
        type t = opcode Cache.Lvl3.t
-
        let dummy _ _ _ _ _ = failwith "Uninitialized L3JIT"
 
 
-       let show_stats a =
+       let show_stats (a : t) =
          let count = ref 0 in
          Cache.Lvl3.iteri (fun _ _ _ _ b -> if not b then incr count) a;
          eprintf "%!L3JIT: %i used entries\n%!" !count
+
        let create () =
          let v = Cache.Lvl3.create 1024 dummy in
          if !Options.verbose then at_exit (fun () -> show_stats v);
          v
 
-       let find t tlist s1 s2 =
+       let find (t : t) tlist s1 s2 =
          Cache.Lvl3.find t
            (Uid.to_int s2.StateSet.Node.id)
            (Uid.to_int s1.StateSet.Node.id)
            (Uid.to_int tlist.Translist.Node.id)
 
-       let add t tlist s1 s2 v =
+       let add (t : t) tlist s1 s2 v =
          Cache.Lvl3.add t
            (Uid.to_int s2.StateSet.Node.id)
            (Uid.to_int s1.StateSet.Node.id)
@@ -95,7 +94,7 @@ module Make (U : ResJIT.S) : S with type result_set = U.NS.t =
          let orig_s1, orig_s2 =
            Translist.fold (fun t (a1, a2) ->
                          let _, _, _, f = Transition.node t in
-                         let (_, _, fs1), (_, _, fs2) = Formula.st f in
+                         let  fs1, fs2 = Formula.st f in
                            (StateSet.union a1 fs1, StateSet.union a2 fs2)
                       ) trl (StateSet.empty, StateSet.empty)
          in
@@ -165,8 +164,6 @@ module Make (U : ResJIT.S) : S with type result_set = U.NS.t =
 
        let cache_apply cache auto tlist s1 s2 =
          let f = gen_code auto tlist s1 s2 in
-         TRACE("grammar", 2, __ "Inserting: %i, %a, %a\n%!"
-           (Uid.to_int tlist.Translist.Node.id) StateSet.print s1 StateSet.print s2);
          add cache tlist s1 s2 f; f
       end
 
@@ -198,42 +195,33 @@ DEFINE LOOP_TAG (t, states, tag, ctx) = (
     l2jit_dispatch
       _t (tag) (states) (ctx) (L2JIT.find cache2 (tag) (states)))
 
-DEFINE LOOP(t, states, ctx) = loop (t) (states) (ctx)
-DEFINE LOOP_TAG(t, states, tag, ctx) = loop_tag (t) (states) (ctx) (tag)
-
     let top_down_run auto tree root states ctx =
       let res_len = StateSet.max_elt auto.states + 1 in
       let empty_slot = Array.create res_len U.NS.empty in
       let nil_res = auto.bottom_states, empty_slot in
-      let cache3 = L3JIT.create () in
-      let mark_subtree  =
-       fun s subtree -> if subtree != U.NS.empty then
+      let cache3 = ResJIT.create () in
+      let mark_subtree s subtree =
+       if subtree != U.NS.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 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
+       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 =
+       U.update cache3 auto trl s1 s2 empty_slot sl1 sl2 tree t
       in
       let cache2 = L2JIT.create () in
 
-      let rec loop t states ctx =
-       if t == Tree.nil then nil_res
-       else
-         let tag = Tree.tag tree t in
-         l2jit_dispatch
-            t tag (states) (ctx) (L2JIT.find cache2 tag (states))
-      and loop_tag t states ctx tag =
-       if t == Tree.nil then nil_res
-       else
-         l2jit_dispatch
-           t (tag) (states) (ctx) (L2JIT.find cache2 (tag) (states))
-      and l2jit_dispatch t tag states ctx opcode =
+      let rec l2jit_dispatch t tag states ctx opcode =
        match opcode with
          | L2JIT.RETURN -> nil_res
          | L2JIT.CACHE ->
@@ -328,9 +316,6 @@ DEFINE LOOP_TAG(t, states, tag, ctx) = loop_tag (t) (states) (ctx) (tag)
        Format.eprintf "%a -> %a\n" State.print state ns_print ns;
       end t
 
-
-    let eval_trans auto tree parent res1 res2 = assert false
-
     let rec uniq = function
       | ([] | [ _ ]) as l -> l
       | e1 :: ((e2 :: ll) as l) -> if e1 == e2 then uniq l
@@ -422,7 +407,7 @@ let get_trans g auto tag states =
          then acc
              else
             let _, _, _, phi = Transition.node trs in
-                let (_,_,l), (_,_,r) = Formula.st phi in
+                let l, r = Formula.st phi in
                 (StateSet.union l lstates,
                  StateSet.union r rstates,
                  Translist.cons trs tacc)