Changeset 741 for Deliverables/D2.2/8051

Timestamp:

Apr 4, 2011, 6:24:22 PM (10 years ago)

Author:

ayache

Message:

Bug fix in LINToASM in D2.2's 8051 (negative integers).

File:

• Deliverables/D2.2/8051/src/LIN/LINToASM.ml (modified) (3 diffs)

Deliverables/D2.2/8051/src/LIN/LINToASM.ml

@@ -2 +2 @@
 (** This module translates a [LIN] program into a [ASM] program. *)
 
+
+(* Fetch the labels found in a LIN program. *)
 
 let statement_labels = function
@@ -16 +18 @@
   | _ -> Label.Set.empty
 
-(* Fetch the labels found in a LIN program. *)
-
 let prog_labels p =
   let f labels funct = Label.Set.union labels (funct_labels funct) in
@@ -23 +23 @@
 
 
-let byte_of_int i = BitVectors.vect_of_int i `Eight
+let size_of_vect_size = function
+  | `Four -> 4
+  | `Seven -> 7
+  | `Eight -> 8
+  | `Eleven -> 11
+  | `Sixteen -> 16
+
+let vect_of_int i size =
+  let i' =
+    if i < 0 then (MiscPottier.pow 2 (size_of_vect_size size)) + i else i in
+  BitVectors.vect_of_int i' size
+
+let byte_of_int i = vect_of_int i `Eight
 let data_of_int i = `DATA (byte_of_int i)
-let data16_of_int i = `DATA16 (BitVectors.vect_of_int i `Sixteen)
+let data16_of_int i = `DATA16 (vect_of_int i `Sixteen)
 let acc_addr = I8051.reg_addr I8051.a