Changeset 109 for Deliverables/D4.1

Timestamp:

Sep 22, 2010, 4:28:19 PM (10 years ago)

Author:

mulligan

Message:

Rotation and SWAP instructions refactored.

File:

• Deliverables/D4.1/ASMInterpret.ml (modified) (2 diffs)

Deliverables/D4.1/ASMInterpret.ml

@@ -898 +898 @@
       let b = int_of_vect status.b in
       if b = 0 then
-        (* CSC: acc and b undefined! we leave them as they are... *)
+        (* CSC: ACC and B undefined! We leave them as they are. *)
         set_flags status false None true
       else
@@ -954 +954 @@
    | `CPL `C -> set_arg1 status (not (get_arg_1 status `C)) `C
    | `CPL (`BIT b) -> set_arg1 status (not (get_arg_1 status (`BIT b))) (`BIT b)
+   | `RL `A -> { status with acc = rotate_left status.acc }
+   | `RLC `A ->
+        let old_cy = get_cy_flag status in
+        let n1, n2 = from_byte status.acc in
+        let (b1,b2,b3,b4),(b5,b6,b7,b8) = from_nibble n1, from_nibble n2 in
+        let status = set_arg1 status b1 `C in
+          { status with acc = mk_byte (mk_nibble b2 b3 b4 b5) (mk_nibble b6 b7 b8 old_cy) }
+   | `RR `A -> { status with acc = rotate_right status.acc }
+   | `RRC `A ->
+        let old_cy = get_cy_flag status in
+        let n1, n2 = from_byte status.acc in
+        let (b1,b2,b3,b4),(b5,b6,b7,b8) = from_nibble n1, from_nibble n2 in
+        let status = set_arg1 status b8 `C in
+          { status with acc = mk_byte (mk_nibble old_cy b1 b2 b3) (mk_nibble b4 b5 b6 b7) }
+   | `SWAP `A ->
+        let (acc_nibble_upper, acc_nibble_lower) = from_byte status.acc in
+          { status with acc = mk_byte acc_nibble_lower acc_nibble_upper }
 (*
- | RL `A ->
-     let (b1,b2,b3,b4),(b5,b6,b7,b8) = status.acc in
-       { status with acc = (b2,b3,b4,b5),(b6,b7,b8,b1) }
- | RLC `A ->
-     let old_carry = carr status in
-     let (b1,b2,b3,b4),(b5,b6,b7,b8) = status.acc in
-     let new_status = set_arg1 status b1 `C in
-       { new_status with acc = (b2,b3,b4,b5),(b6,b7,b8,old_carry) }
- | RR `A ->
-     let (b1,b2,b3,b4),(b5,b6,b7,b8) = status.acc in
-       { status with acc = (b8,b1,b2,b3),(b4,b5,b6,b7) }
- | RRC `A ->
-     let old_carry = carr status in
-     let (b1,b2,b3,b4),(b5,b6,b7,b8) = status.acc in
-     let new_status = set_arg1 status b8 `C in
-       { new_status with acc = (old_carry,b1,b2,b3),(b4,b5,b6,b7) }
- | SWAP `A ->
-     let (acc_n_1, acc_n_2) = status.acc in
-       { status with acc = (acc_n_2, acc_n_1) }
  | MOV(`U1(b1, b2)) ->
                 let arg = get_arg_8 status b2 in