Changeset 1357 for Deliverables/D2.2/8051-indexed-labels-branch/src/common/costLabel.ml

Timestamp:

Oct 11, 2011, 5:42:20 PM (9 years ago)

Author:

tranquil

Message:

• changed implementation of constant indexings with extensible arrays
• work on ASM completed
• next: optimizations!

File:

• Deliverables/D2.2/8051-indexed-labels-branch/src/common/costLabel.ml (modified) (3 diffs)

Deliverables/D2.2/8051-indexed-labels-branch/src/common/costLabel.ml

@@ -20 +20 @@
 type indexing = sexpr list
 
-type const_indexing = int array
+type const_indexing = int ExtArray.t
 
-(** [enter_loop n indexing] is used to update indexing when one is entering a
-    loop indexed by [n].
-                The function recycles the same constant indexing *)
-let rec enter_loop n indexing = match n with
-        | None -> ()
-        | Some x -> try indexing.(x) <- 0 with | _ -> assert false
+let const_ind_iter = ExtArray.iter
 
-(** [enter_loop n indexing] is used to update indexing when one is continuing a
-    loop indexed by [n]. *)
-let rec continue_loop n indexing = match n with
-        | None -> ()
-        | Some x -> try indexing.(x) <- indexing.(x) + 1 with | _ -> assert false
+let curr_const_ind = function
+    | hd :: _ -> hd
+    | _ -> invalid_arg "curr_const_ind applied to non-empty list"
+
+let init_const_indexing () = ExtArray.make ~buff:1 0 0 
+
+let enter_loop_single indexing n = ExtArray.set indexing n 0
+
+let continue_loop_single indexing n =
+        try
+                ExtArray.set indexing n (ExtArray.get indexing n + 1)
+        with | _ ->
+          invalid_arg "uninitialized loop index" 
+
+let curr_ind = function
+    | hd :: _ -> hd
+    | _ -> invalid_arg "non-empty indexing stack"
+
+let enter_loop inds = enter_loop_single (curr_ind inds)
+
+let continue_loop inds = continue_loop_single (curr_ind inds)
+
+let enter_loop_opt indexing = Option.iter (enter_loop indexing) 
+
+let continue_loop_opt indexing = Option.iter (continue_loop indexing)
+
+let new_const_ind inds = init_const_indexing () :: inds
+
+let forget_const_ind = function
+        | _ :: inds -> inds
+        | _ -> invalid_arg "non-empty indexing stack"
 
 let sexpr_of i l = 
@@ -69 +90 @@
         | s :: l ->
                 try
-                  const_sexpr (ev_sexpr c.(i) s) :: compose_const_indexing_i (i+1) c l
+                  const_sexpr (ev_sexpr (ExtArray.get c i) s) ::
+                         compose_const_indexing_i (i+1) c l
                 with
-                        | Invalid_argument _ -> assert false
+                        | Invalid_argument _ ->
+                                invalid_arg "constant indexing not enough to be applied" 
 
 module IndexingSet = Set.Make(struct
@@ -83 +106 @@
 }
 
-let apply_const_indexing c lbl =
+let ev_indexing c lbl =
     {lbl with i = compose_const_indexing_i 0 c lbl.i}