Changeset 641

Timestamp:

Mar 7, 2011, 2:18:53 PM (9 years ago)

Author:

ayache

Message:

Improvement in the code of the cost computation in D2.2.

File:

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

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

@@ -44 +44 @@
 
 
-let compare pc1 cost1 pc2 cost2 =
-  if cost1 <> cost2 then
+let rec compare = function
+  | [] -> assert false (* do not use an this argument *)
+  | [(_, cost)] -> cost
+  | (pc1, cost1) :: (pc2, cost2) :: l when cost1 <> cost2 ->
     warning
       (Printf.sprintf
          "Warning: branching to %s has cost %d, branching to %s has cost %d"
-         "*fixme*" (* pc1 *) cost1 "*fixme*" (* pc2 *) cost2) ;
-  max cost1 cost2
+         (string_of_int (BitVectors.int_of_vect pc1)) cost1
+         (string_of_int (BitVectors.int_of_vect pc2)) cost2) ;
+    max cost1 (compare ((pc2, cost2) :: l))
+  | _ :: l -> compare l
 
 let rec block_costl mem costs = function
   | [] -> 0
   | [pc] when BitVectors.WordMap.mem pc costs -> 0
-  | [pc] ->
-    let (_, _, next_pcs, cost) = inst_infos mem pc in
-    cost + (block_costl mem costs next_pcs)
-  | pc1 :: pc2 :: _ ->
-    let cost1 = block_costl mem costs [pc1] in
-    let cost2 = block_costl mem costs [pc2] in
-    compare pc1 cost1 pc2 cost2
+  | next_pcs ->
+    compare (List.map (fun pc -> (pc, block_cost mem costs pc)) next_pcs)
 
-let block_cost mem costs pc = block_costl mem costs [pc]
+and block_cost mem costs pc =
+  let (_, _, next_pcs, cost) = inst_infos mem pc in
+  cost + (block_costl mem costs next_pcs)
 
 
@@ -73 +74 @@
       | _::tl when BitVectors.WordMap.mem pc p.ASM.cost_labels ->
         let lbl = BitVectors.WordMap.find pc p.ASM.cost_labels in
-        let cost = block_cost mem p.ASM.cost_labels newpc in
+        let cost = block_cost mem p.ASM.cost_labels pc in
         let costs_mapping = aux newpc tl in
         CostLabel.Map.add lbl cost costs_mapping