Changeset 80 for Deliverables/D4.1

Timestamp:

Sep 15, 2010, 4:26:22 PM (10 years ago)

Author:

mulligan

Message:

ANL, ORL and XRL instructions implemented.

File:

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

Deliverables/D4.1/ASMInterpret.ml

@@ -732 +732 @@
 ;;
 
+let xor b1 b2 =
+  if b1 = true && b2 = true then
+    false
+  else if b1 = false && b2 = false then
+    false
+  else true
+;;
+
 let execute1 status =
  let instr,pc,ticks = fetch status.code_memory status.pc in
@@ -816 +824 @@
          let lower_nibble = nibble_of_int lower_nibble_int_val in
            { status with acc = (upper_nibble, lower_nibble) }
+ (* logical operations *)
  | ANL (`U1(`A, ag)) ->
      let (ac1,ac2,ac3,ac4),(ac5,ac6,ac7,ac8) = fetch_arg8 status `A in
@@ -822 +831 @@
                    (ac5 && ag5, ac6 && ag6, ac7 && ag7, ac8 && ag8)) in
        set_arg8 status and_val `A
-(*
- (* logical operations *)
- | ANL of
-    (acc * [ reg | direct | indirect | data ],
-     direct * [ acc | data ],
-     carry * [ bit | nbit]) union3
- | ORL of
-    (acc * [ reg | direct | indirect ],
-     direct * [ acc | data ],
-     carry * [ bit | nbit]) union3
- | XRL of
-    (acc * [ reg | direct | indirect ],
-     direct * [ acc | data ]) union2 *)
+ | ANL (`U2((`DIRECT d), ag)) ->
+     let (d1,d2,d3,d4),(d5,d6,d7,d8) = fetch_arg8 status (`DIRECT d) in
+     let (ag1,ag2,ag3,ag4),(ag5,ag6,ag7,ag8) = fetch_arg8 status ag in
+     let and_val = ((d1 && ag1, d2 && ag2, d3 && ag3, d4 && ag4),
+                   (d5 && ag5, d6 && ag6, d7 && ag7, d8 && ag8)) in
+       set_arg8 status and_val `A
+ | ANL (`U3 (`C, (`BIT b))) ->
+     let (cy,ac,fo,rs1),(rs0,ov,ud,p) = status.psw in
+     let c = fetch_arg1 status `C in
+     let ag_val = fetch_arg1 status (`BIT b) in
+       { status with psw = (c && ag_val,ac,fo,rs1),(rs0,ov,ud,p) }
+ | ANL (`U3 (`C, (`NBIT b))) ->
+     let (cy,ac,fo,rs1),(rs0,ov,ud,p) = status.psw in
+     let c = fetch_arg1 status `C in
+     let ag_val = not (fetch_arg1 status (`NBIT b)) in
+       { status with psw = (c && ag_val,ac,fo,rs1),(rs0,ov,ud,p) }
+ | ORL (`U1(`A, ag)) ->
+     let (ac1,ac2,ac3,ac4),(ac5,ac6,ac7,ac8) = fetch_arg8 status `A in
+     let (ag1,ag2,ag3,ag4),(ag5,ag6,ag7,ag8) = fetch_arg8 status ag in
+     let and_val = ((ac1 || ag1, ac2 || ag2, ac3 || ag3, ac4 || ag4),
+                   (ac5 || ag5, ac6 || ag6, ac7 || ag7, ac8 || ag8)) in
+       set_arg8 status and_val `A
+ | ORL (`U2((`DIRECT d), ag)) ->
+     let (d1,d2,d3,d4),(d5,d6,d7,d8) = fetch_arg8 status (`DIRECT d) in
+     let (ag1,ag2,ag3,ag4),(ag5,ag6,ag7,ag8) = fetch_arg8 status ag in
+     let and_val = ((d1 || ag1, d2 || ag2, d3 || ag3, d4 || ag4),
+                   (d5 || ag5, d6 || ag6, d7 || ag7, d8 || ag8)) in
+       set_arg8 status and_val `A
+ | ORL (`U3 (`C, (`BIT b))) ->
+     let (cy,ac,fo,rs1),(rs0,ov,ud,p) = status.psw in
+     let c = fetch_arg1 status `C in
+     let ag_val = fetch_arg1 status (`BIT b) in
+       { status with psw = (c || ag_val,ac,fo,rs1),(rs0,ov,ud,p) }
+ | ORL (`U3 (`C, (`NBIT b))) ->
+     let (cy,ac,fo,rs1),(rs0,ov,ud,p) = status.psw in
+     let c = fetch_arg1 status `C in
+     let ag_val = not (fetch_arg1 status (`NBIT b)) in
+       { status with psw = (c || ag_val,ac,fo,rs1),(rs0,ov,ud,p) }
+ | XRL (`U1(`A, ag)) ->
+     let (ac1,ac2,ac3,ac4),(ac5,ac6,ac7,ac8) = fetch_arg8 status `A in
+     let (ag1,ag2,ag3,ag4),(ag5,ag6,ag7,ag8) = fetch_arg8 status ag in
+     let and_val = ((xor ac1 ag1, xor ac2 ag2, xor ac3 ag3, xor ac4 ag4),
+                   (xor ac5 ag5, xor ac6 ag6, xor ac7 ag7, xor ac8 ag8)) in
+       set_arg8 status and_val `A
+ | XRL (`U2((`DIRECT d), ag)) ->
+     let (d1,d2,d3,d4),(d5,d6,d7,d8) = fetch_arg8 status (`DIRECT d) in
+     let (ag1,ag2,ag3,ag4),(ag5,ag6,ag7,ag8) = fetch_arg8 status ag in
+     let and_val = ((xor d1 ag1, xor d2 ag2, xor d3 ag3, xor d4 ag4),
+                   (xor d5 ag5, xor d6 ag6, xor d7 ag7, xor d8 ag8)) in
+       set_arg8 status and_val `A
  | CLR `A -> set_arg8 status 
      ((false,false,false,false),(false,false,false,false)) `A