Changeset 740 for Deliverables/D2.2/8051/src/utilities

Timestamp:

Apr 4, 2011, 5:18:15 PM (10 years ago)

Author:

ayache

Message:

New memory model and bug fixes in 8051 branch. Added primitive operations in interpreters from Clight to LIN.

Location:

Deliverables/D2.2/8051/src/utilities

Files:

• interference.mli (modified) (1 diff)
• miscPottier.ml (modified) (2 diffs)
• miscPottier.mli (modified) (1 diff)

Deliverables/D2.2/8051/src/utilities/interference.mli

@@ -44 +44 @@
      the key to be present in the map -- it will fail otherwise. *)
 
-  module Map : Map.S with type key = t
+  module Map : MyMap.S with type key = t
 
 end

Deliverables/D2.2/8051/src/utilities/miscPottier.ml

@@ +1 @@
+
+let rec max_list = function
+  | [] -> raise (Invalid_argument "MiscPottier.max_list")
+  | [a] -> a
+  | a :: l -> max a (max_list l)
+
+let pow a b =
+  if b < 0 then raise (Invalid_argument "MiscPottier.pow2")
+  else
+    let rec aux = function
+      | 0 -> 1
+      | i -> a * aux (i-1) in
+    aux b
 
 let rec make a n =
@@ -11 +24 @@
   aux 0
 
-let foldi f a =
+let rec remove_n_first n =
+  let rec aux i = function
+  | [] -> []
+  | l when i = n -> l
+  | _ :: l -> aux (i+1) l in
+  aux 0
+
+let foldi_from_until n m f a l =
   let rec aux i res = function
     | [] -> res
-    | e :: l -> aux (i+1) (f i res e) l
-  in
-  aux 0 a
+    | _ when i >= m -> res
+    | e :: l -> aux (i+1) (f i res e) l in
+  aux 0 a (remove_n_first n l)
+
+let foldi_from n f a l = foldi_from_until n (List.length l) f a l
+
+let foldi_until m f a l = foldi_from_until 0 m f a l
+
+let foldi f a l = foldi_from_until 0 (List.length l) f a l
 
 let iteri f l =

Deliverables/D2.2/8051/src/utilities/miscPottier.mli

@@ -1 +1 @@
 
-(** This module provides some additional functions on lists. *)
+(** This module provides some additional functions on lists or arithmetics. *)
+
+val max_list : 'a list -> 'a
+
+val pow : int -> int -> int
 
 val make: 'a -> int -> 'a list
 
 val index_of : 'a -> 'a list -> int
+
+val foldi_until : int -> (int -> 'a -> 'b -> 'a) -> 'a -> 'b list -> 'a
 
 val foldi : (int -> 'a -> 'b -> 'a) -> 'a -> 'b list -> 'a