Changeset 58 for Deliverables/D4.1/ASMInterpret.ml

Timestamp:

Sep 10, 2010, 3:37:44 PM (11 years ago)

Author:

mulligan

Message:

Bug fixed in CJNE instruction. More jump instructions implemented.

File:

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

Deliverables/D4.1/ASMInterpret.ml

@@ -803 +803 @@
  | CLR ((`BIT b) as a) ->
      set_arg1 status false a
+ | CPL `A ->
+     let acc_val = fetch_arg8 status `A in
+       { status with acc = complement acc_val }
+ | CPL `C ->
+     let ag_val = fetch_arg1 status `C in
+       set_arg1 status (not ag_val) `C
+ | CPL (`BIT b) ->
+     let ag_val = fetch_arg1 status (`BIT b) in
+       set_arg1 status (not ag_val) (`BIT b)
 (*
  | CPL of [ acc | carry | bit ]
@@ -860 +869 @@
      let old_acc = status.acc in
      let new_status = set_arg8 status old_acc arg in
-       { status with acc = old_arg }
+       { new_status with acc = old_arg }
 (*
  | XCHD of acc * indirect
@@ -906 +915 @@
      let ag_val = fetch_arg8 status ag in
      let acc_val = status.acc in
+     let (b1,b2,b3,b4),n2 = status.psw in
      let new_carry = acc_val < ag_val in
        if ag_val <> acc_val then
-         { status with pc = status.pc ++ (int_of_byte rel) }
+         { status with pc = status.pc ++ (int_of_byte rel); psw = (new_carry, b2, b3, b4),n2 }
        else
-         status
+         { status with psw = (new_carry, b2, b3, b4),n2 }
  | CJNE ((`U2 (ag, `DATA d)), `REL rel) ->
      let ag_val = fetch_arg8 status ag in
+     let (b1,b2,b3,b4),n2 = status.psw in
      let new_carry = ag_val < d in
        if ag_val <> d then
-         { status with pc = status.pc ++ (int_of_byte rel) }
+         { status with pc = status.pc ++ (int_of_byte rel); psw = (new_carry, b2, b3, b4),n2 }
        else
-         status
+         { status with psw = (new_carry, b2, b3, b4),n2 }
 (*
  | DJNZ of [ reg | direct ] * rel