Changeset 630 for Deliverables/D2.2

Timestamp:

Mar 3, 2011, 6:27:12 PM (9 years ago)

Author:

ayache

Message:

Paris update in D2.2.

Location:

Deliverables/D2.2/8051

Files:

• myocamlbuild_config.ml (modified) (1 diff)
• src/ASM/ASMCosts.ml (modified) (2 diffs)
• src/acc.ml (modified) (1 diff)
• src/clight/clightInterpret.ml (modified) (1 diff)
• src/common/intValue.ml (modified) (1 diff)

Deliverables/D2.2/8051/myocamlbuild_config.ml

@@ -1 @@
-let parser_lib = "/home/dpm/Projects/Cerco/Deliverables/D2.2/8051/lib"
+let parser_lib = "/home/ayache/Downloads/Bol/Deliverables/D2.2/8051/lib"

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

@@ -32 +32 @@
       let _, addr = BitVectors.half_add pc (BitVectors.sign_extension addr) in
        Branch addr
-  | `RET -> Return
+  | `RET | `RETI -> Return
   | _ -> Other
 
@@ -53 +53 @@
       (Printf.sprintf
          "Warning: branching to %s has cost %d, branching to %s has cost %d"
-         "*fixme*"(* pc1 *) cost1 "*fixme*" (* pc2 *) cost2) ;
+         "*fixme*" (* pc1 *) cost1 "*fixme*" (* pc2 *) cost2) ;
   max cost1 cost2
 

Deliverables/D2.2/8051/src/acc.ml

@@ -8 +8 @@
     1. Parse.
 
-    2. Labellize. 
-       (Only if {!Options.annotation_requested})
+    2. Labelize.
 
     3. Compile to the target language. 

Deliverables/D2.2/8051/src/clight/clightInterpret.ml

@@ -296 +296 @@
 
 let eval_div = function
-(*
   | ((v1,t1),(v2,t2)) when t1=t2 && is_int_type t1 -> Value.div v1 v2
-*)
-  (* TODO: temporary hack! *)
-  | ((v1,t1),(v2,t2)) when t1=t2 && is_int_type t1 -> Value.divu v1 v2
   | ((v1,t1),(v2,t2)) when t1=t2 && is_float_type t1 -> 
       assert false (*Not supported*)

Deliverables/D2.2/8051/src/common/intValue.ml

@@ -117 +117 @@
 
   (* Signed value of [a]. *)
-  let signed a = sub_big_int (cast a) half_bound
+  let signed a =
+    let a = cast a in
+    if lt_big_int a half_bound then a
+    else sub_big_int a _mod
 
   let signed_op op a b = op (signed a) (signed b)