Changeset 1568 for Deliverables/D2.2/8051/src/ASM

Timestamp:

Nov 25, 2011, 7:43:39 PM (9 years ago)

Author:

tranquil

Message:

• Immediates introduced (but not fully used yet in RTLabs to RTL pass)
• translation streamlined
• BUGGY: interpretation fails in LTL, trying to fetch a function with incorrect address

Location:

Deliverables/D2.2/8051/src/ASM

Files:

• ASMInterpret.ml (modified) (4 diffs)
• I8051.ml (modified) (3 diffs)
• I8051.mli (modified) (1 diff)

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

@@ -1007 +1007 @@
             memory, we must increment by 5, as we added two new instructions. *)
         let to_ljmp = `REL (vect_of_int 2 `Eight) in
-        let offset = 5 in
+        (* let offset = 5 in *)
          let jmp_address, translated_jump =
            match i with
@@ -1452 +1452 @@
 ;;
 
+let unopt = function Some x -> x | None -> invalid_arg "None"
+
 let serial_port_input status in_cont =
       (* Serial port input *)
@@ -1495 +1497 @@
                            serial_v_in       = Some (`Eight b) }
                      else
-                           (* Warning about incomplete case analysis here, but safe as we've already tested for
-                              None. *)
-                       let Some e = status.serial_epsilon_in in
-                       let Some v = status.serial_v_in in
+                       (* safe as we've already tested for None. *)
+                       let e = unopt status.serial_epsilon_in in
+                       let v = unopt status.serial_v_in in
                        if status.clock >= e then
                          match v with
@@ -1534 +1535 @@
                            serial_v_in       = Some (`Nine (b, b')) }
                      else
-                           (* Warning about incomplete case analysis here, but safe as we've already tested for
-                              None. *)
-                       let Some e = status.serial_epsilon_in in
-                       let Some v = status.serial_v_in in
+                       (* safe as we've already tested for None. *)
+                       let e = unopt status.serial_epsilon_in in
+                       let v = unopt status.serial_v_in in
                        if status.clock >= e then
                          match v with

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

@@ -11 +11 @@
   | Cmpl
   | Inc
+  (* | Dec *)
+  | Rl
 
 type op2 =
@@ -27 +29 @@
   | Cmpl -> "cmpl"
   | Inc -> "inc"
+  | Rl -> "rotl"
 
 let print_op2 = function
@@ -57 +60 @@
     | Cmpl -> Val.cmpl
     | Inc -> Val.succ
+    | Rl -> Val.rotl
 
   let op2 carry op2 v1 v2 = match op2 with

Deliverables/D2.2/8051/src/ASM/I8051.mli

@@ -9 +9 @@
   | Cmpl
   | Inc
+  (* | Dec *)
+  | Rl
 
 type op2 =