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

Deliverables/D2.2/8051-indexed-labels-branch/src/clight/clightAnnotator.ml

@@ -296 +296 @@
         (id, uint) :: loop_indexes_defs prefix max_depth
 
+let max_depth =
+        let f_expr _ _ = () in
+        let f_stmt stmt _ res_stmts =
+                let curr_max = List.fold_left max 0 res_stmts in
+                if curr_max > 0 then curr_max else      
+                match stmt with
+                | Clight.Swhile(Some x,_,_) | Clight.Sdowhile(Some x,_,_)
+                | Clight.Sfor(Some x,_,_,_,_) -> x + 1
+                | _ -> 0 in
+        ClightFold.statement2 f_expr f_stmt
+
 (* Instrument a function. *)
 
@@ -301 +312 @@
   let def = match def with
     | Clight.Internal def ->
-        let max_depth = ClightUtils.max_loop_index_lbld def.Clight.fn_body in
+        let max_depth = max_depth def.Clight.fn_body in
         let vars = loop_indexes_defs l_ind max_depth in
         let vars = List.rev_append vars def.Clight.fn_vars in