Changeset 632 for Deliverables/D2.2/8051/src/ASM

Timestamp:

Mar 4, 2011, 3:59:42 PM (10 years ago)

Author:

ayache

Message:

Small change in ASMCosts.

File:

• Deliverables/D2.2/8051/src/ASM/ASMCosts.ml (modified) (3 diffs)

Deliverables/D2.2/8051/src/ASM/ASMCosts.ml

@@ -66 +66 @@
 let block_cost mem costs pc =
   let treat = treat mem costs in
-  let (init_cost, next_pcs) = treat pc in
   let rec aux = function
     | [] -> 0
-    | [pc] when BitVectors.WordMap.mem pc costs ->0
+    | [pc] when BitVectors.WordMap.mem pc costs -> 0
     | [pc] -> full_cost pc
     | [pc1 ; pc2] when BitVectors.WordMap.mem pc1 costs &&
@@ -87 +86 @@
     let (cost, next_pcs) = treat pc in
     cost + (aux next_pcs) in
-  init_cost + (aux next_pcs)
+  full_cost pc
 
 
@@ -113 +112 @@
 let first_cost_label mem costs =
   let rec aux oldpc =
-    try (BitVectors.WordMap.find oldpc costs, 0)
-    with
-      | Not_found ->
-        let inst,pc,inst_cost = ASMInterpret.fetch mem oldpc in
-        match inst_nature oldpc inst with
-          | Direct_fun_call pc ->
-            let (lbl, cost) = aux pc in
-            (lbl, inst_cost + cost)
-          | Return
-          | Goto _
-          | Branch _ ->
-            assert false (* no such instructions before calling main *)
-          | Other ->
-            let (lbl, cost) = aux pc in
-            (lbl, inst_cost + cost)
+    if BitVectors.WordMap.mem oldpc costs then
+      (BitVectors.WordMap.find oldpc costs, 0)
+    else
+      let (inst, pc, inst_cost) = ASMInterpret.fetch mem oldpc in
+      match inst_nature oldpc inst with
+        | Direct_fun_call pc ->
+          let (lbl, cost) = aux pc in
+          (lbl, inst_cost + cost)
+        | Return
+        | Goto _
+        | Branch _ ->
+          assert false (* no such instructions before calling main *)
+        | Other ->
+          let (lbl, cost) = aux pc in
+          (lbl, inst_cost + cost)
   in
   aux (BitVectors.zero `Sixteen)