Changeset 1357 for Deliverables/D2.2/8051-indexed-labels-branch/src/LIN/LINInterpret.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/LIN/LINInterpret.ml (modified) (3 diffs)

Deliverables/D2.2/8051-indexed-labels-branch/src/LIN/LINInterpret.ml

@@ -48 +48 @@
 let change_trace st trace = { st with trace = trace }
 let add_trace st cost_lbl = change_trace st (cost_lbl :: st.trace)
-
-let forget_ind st = match st.inds with
-    | _ :: tail -> {st with inds = tail}
-    | _ -> assert false (* indexing list must be non-empty *)
-let curr_ind st = match st.inds with
-    | ind :: _ -> ind
-    | _ -> assert false (* indexing list must be non-empty *)
-let allocate_ind st n = { st with inds = Array.make n 0 :: st.inds }
-
-let max_depth =
-    let f_stmt j = function
-        | LIN.St_ind_0 i | LIN.St_ind_inc i -> max (i + 1) j 
-        | _ -> j in
-    List.fold_left f_stmt 0 
+let ev_label st = CostLabel.ev_indexing (CostLabel.curr_const_ind st.inds)
+let new_ind st = { st with inds = CostLabel.new_const_ind st.inds }
+let forget_ind st = { st with inds = CostLabel.forget_const_ind st.inds }
+let enter_loop st = CostLabel.enter_loop st.inds
+let continue_loop st = CostLabel.continue_loop st.inds
 
 let empty_state =
@@ -91 +82 @@
 
 let init_fun_call st ptr def =
-        let st = allocate_ind st (max_depth def) in
+        let st = new_ind st in
   change_pc st (Val.change_address_offset ptr Val.Offset.zero)
 
@@ -217 +208 @@
 
     | LIN.St_cost cost_lbl ->
-                        let cost_lbl = CostLabel.apply_const_indexing (curr_ind st) cost_lbl in
+                        let cost_lbl = ev_label st cost_lbl in
       let st = add_trace st cost_lbl in
       next_pc st
                         
                 | LIN.St_ind_0 i ->
-                        CostLabel.enter_loop (Some i) (curr_ind st);
+                        enter_loop st i;
                         next_pc st
 
     | LIN.St_ind_inc i ->
-            CostLabel.continue_loop (Some i) (curr_ind st);
+            continue_loop st i;
             next_pc st