Changeset 110 for Deliverables/D4.1

Timestamp:

Sep 22, 2010, 5:06:12 PM (10 years ago)

Author:

mulligan

Message:

MOV instructions refactored.

File:

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

Deliverables/D4.1/ASMInterpret.ml

@@ -831 +831 @@
 ;;
 
-let set_arg16 status (dh, dl) =
+let set_arg16 status wrd =
         function
                 `DPTR ->
-                        { status with dph = dh; dpl = dl }
+       let (dh, dl) = from_word wrd in
+         { status with dph = dh; dpl = dl }
 
 let set_flags status c ac ov =
@@ -971 +972 @@
         let (acc_nibble_upper, acc_nibble_lower) = from_byte status.acc in
           { status with acc = mk_byte acc_nibble_lower acc_nibble_upper }
+  | `MOV(`U1(b1, b2)) -> set_arg8 status (get_arg_8 status b2) b1
+  | `MOV(`U2(b1, b2)) -> set_arg8 status (get_arg_8 status b2) b1
+  | `MOV(`U3(b1, b2)) -> set_arg8 status (get_arg_8 status b2) b1
+  | `MOV(`U4(b1,b2)) -> set_arg16 status (get_arg_16 status b2) b1
+  | `MOV(`U5(b1,b2)) -> set_arg1 status (get_arg_1 status b2) b1
+  | `MOV(`U6(b1,b2)) -> set_arg1 status (get_arg_1 status b2) b1
 (*
- | MOV(`U1(b1, b2)) ->
-                let arg = get_arg_8 status b2 in
-      set_arg8 status arg b1
- | MOV(`U2(b1, b2)) ->
-                let arg = get_arg_8 status b2 in
-      set_arg8 status arg b1
- | MOV(`U3(b1, b2)) ->
-                let arg = get_arg_8 status b2 in
-      set_arg8 status arg b1
- | MOV(`U4(b1,b2)) ->
-    let arg = get_arg_16 status b2 in
-      set_arg16 status arg b1
- | MOV(`U5(b1,b2))->
-    let arg = get_arg_1 status b2 in
-      set_arg1 status arg b1
- | MOV(`U6(b1,b2))->
-    let arg = get_arg_1 status b2 in
-      set_arg1 status arg b1
  | MOVC (`A, `A_DPTR) ->
      let acc_int_val = int_of_byte status.acc in