Changeset 107 for Deliverables/D4.1

Timestamp:

Sep 22, 2010, 3:52:58 PM (11 years ago)

Author:

mulligan

Message:

CLR instruction refactored.

File:

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

Deliverables/D4.1/ASMInterpret.ml

@@ -781 +781 @@
   function
     `BIT addr ->
-      (match addr with
-         (false,r1,r2,r3),n1 ->
-           let addr = (int_of_vect (mk_byte7 r1 r2 r3 n1)) in
+      let n1, n2 = from_byte addr in
+      (match from_nibble n1 with
+         (false,r1,r2,r3) ->
+           let addr = (int_of_vect (mk_byte7 r1 r2 r3 n2)) in
            let addr' = vect_of_int ((addr / 8) + 32) `Seven in
            let n_bit = set_bit (Byte7Map.find addr' status.low_internal_ram) (addr mod 8) v in
@@ -790 +791 @@
               | Some n_bit' ->
                   { status with low_internal_ram = Byte7Map.add addr' n_bit' status.low_internal_ram })
-                        | (true,r1,r2,r3),n1 ->
+                        | (true,r1,r2,r3) ->
            (*CSC: SFR access, TO BE IMPLEMENTED *)
            (* assert false for now. Try to understand what DEC really does *)
@@ -947 +948 @@
         let xor_val = get_arg_8 status (`DIRECT d) -^- get_arg_8 status ag in
           set_arg8 status xor_val `A
+   | `CLR `A -> set_arg8 status (zero `Eight) `A
+   | `CLR `C -> set_arg1 status false `C
+   | `CLR ((`BIT b) as a) -> set_arg1 status false a
 (*
- | CLR `A -> set_arg8 status 
-     ((false,false,false,false),(false,false,false,false)) `A
- | CLR `C ->
-     set_arg1 status false `C
- | CLR ((`BIT b) as a) ->
-     set_arg1 status false a
  | CPL `A ->
      let acc_val = get_arg_8 status `A in