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

Deliverables/D2.2/8051-indexed-labels-branch/src/ASM/ASMInterpret.ml

@@ -132 +132 @@
   exit_addr   : BitVectors.word;
         
+(*
         ind_0s      : int BitVectors.WordMap.t;
   ind_incs    : int BitVectors.WordMap.t;
   cost_labels : CostLabel.t BitVectors.WordMap.t
+*)      
 }
 
@@ -287 +289 @@
 
   exit_addr = BitVectors.zero `Sixteen;
+(*
   ind_0s = BitVectors.WordMap.empty;
   ind_incs = BitVectors.WordMap.empty;
   cost_labels = BitVectors.WordMap.empty
+*)
 }
 
@@ -1981 +1985 @@
 let load_program p =
   let st = load p.ASM.code initialize in
-  { st with exit_addr = p.ASM.exit_addr ; cost_labels = p.ASM.cost_labels }
+  { st with exit_addr = p.ASM.exit_addr (* ; cost_labels = p.ASM.cost_labels *)}
 
 type cost_trace = {
@@ -1988 +1992 @@
 }
 
-(* TODO: indexes *)
-let observe_trace trace st =
-        let update_ct_labels =
-          try
-                        let cost_label = BitVectors.WordMap.find st.pc st.cost_labels in
-            trace.ct_labels <- cost_label :: trace.ct_labels
-          with Not_found -> () in
-        update_ct_labels;
+(* TODO: supposing only one index reset or increment per instruction *)
+let update_indexes trace p st =
+  try
+    let i = BitVectors.WordMap.find st.pc p.ASM.inds in
+                CostLabel.enter_loop trace.ct_inds i
+  with Not_found -> ();
+  try
+    let i = BitVectors.WordMap.find st.pc p.ASM.incs in
+    CostLabel.continue_loop trace.ct_inds i
+  with Not_found -> ();
+  let instr,_,_ = fetch st.code_memory st.pc in
+        match instr with
+                | `ACALL _ | `LCALL _ ->
+      trace.ct_inds <- CostLabel.new_const_ind trace.ct_inds
+                | `RET ->
+                        trace.ct_inds <- CostLabel.forget_const_ind trace.ct_inds
+                | _ -> ()
+
+let update_labels trace p st =
+  try
+    let cost_label = BitVectors.WordMap.find st.pc p.cost_labels in
+        let ind = CostLabel.curr_const_ind trace.ct_inds in
+        let cost_label = CostLabel.ev_indexing ind cost_label in
+        trace.ct_labels <- cost_label :: trace.ct_labels
+  with Not_found -> ()
+
+
+
+let update_trace trace p st =
+        update_labels trace p st;
+        update_indexes trace p st;
   if st.pc = st.exit_addr (* <=> end of program *) then raise Halt else st
 
@@ -2014 +2041 @@
     let st = load_program p in
     let trace = {ct_labels = []; ct_inds = []} in
-    let callback = observe_trace trace in
+    let callback = update_trace trace p in
     let st = execute callback st in
     let res = result st in