Changeset 49 for Deliverables/D4.1

Timestamp:

Sep 9, 2010, 1:19:58 PM (10 years ago)

Author:

mulligan

Message:

Fixed bug in ASMInterpret functions: CPL functions were not implemented.
More work on pretty printing.

Location:

Deliverables/D4.1

Files:

• ASMInterpret.ml (modified) (2 diffs)
• Pretty.ml (modified) (2 diffs)

Deliverables/D4.1/ASMInterpret.ml

@@ -130 +130 @@
        let pc,b1 = next pc in
          CLR (`BIT b1), pc, 1
+   | (true,true,true,true),(false,true,false,false) ->
+         CPL `A, pc, 1
+   | (true,false,true,true),(false,false,true,true) ->
+         CPL `C, pc, 1
+   | (true,false,true,true),(false,false,true,false) ->
+       let pc,b1 = next pc in
+         CPL (`BIT b1), pc, 1
    | (true,true,false,true),(false,true,false,false) ->
          DA `A, pc, 1
@@ -405 +412 @@
   | CLR (`BIT b1) ->
     [(true,true,false,false),(false,false,true,false);  b1]
+  | CPL `A ->
+    [(true,true,true,true),(false,true,false,false)]
+  | CPL `C ->
+    [(true,false,true,true),(false,false,true,true)]
+  | CPL (`BIT b1) ->
+    [(true,false,true,true),(false,false,true,false); b1]
   | DA `A ->
     [(true,true,false,true),(false,true,false,false)]

Deliverables/D4.1/Pretty.ml

@@ -19 +19 @@
     "word11: " ^ pretty_word (((false,false,false,false),(false,b1,b2,b3)),b)
 
-let pretty_instruction =
+let pretty_instruction_debug =
  function
     ACALL (`ADDR11 (a10,a9,a8,b1)) ->
@@ -57 +57 @@
   | ANL (`U3 (`C,`NBIT b1)) ->
      "ANL C /bit (" ^ pretty_byte b1 ^ ")"
+  | CJNE (`U1 (`A, `DIRECT b1), `REL b2) ->
+     "CJNE A direct rel (" ^ pretty_byte b1 ^ pretty_byte b2 ^ ")"
+  | CJNE (`U1 (`A, `DATA b1), `REL b2) ->
+     "CJNE A #data rel (" ^ pretty_byte b1 ^ pretty_byte b2 ^ ")"
+  | CJNE (`U2 (`REG(r1,r2,r3), `DATA b1), `REL b2) ->
+     "CJNE Ri #data rel (" ^ pretty_byte b1 ^ pretty_byte b2 ^ ")"
+  | CJNE (`U2 (`INDIRECT i1, `DATA b1), `REL b2) ->
+     "CJNE @Ri #data rel (" ^ pretty_bit i1 ^ pretty_byte b1 ^ pretty_byte b2 ^ ")"
+  | CLR `A ->
+     "CLR A"
+  | CLR `C ->
+    "CLR C"
+  | CLR (`BIT b1) ->
+    "CLR bit (" ^ pretty_byte b1 ^ ")"
 (*
-  | CJNE (`U1 (`A, `DIRECT b1), `REL b2) ->
-    [(true,false,true,true),(false,true,false,true); b1; b2]
-  | CJNE (`U1 (`A, `DATA b1), `REL b2) ->
-    [(true,false,true,true),(false,true,false,false); b1; b2]
-  | CJNE (`U2 (`REG(r1,r2,r3), `DATA b1), `REL b2) ->
-    [(true,false,true,true),(true,r1,r2,r3); b1; b2]
-  | CJNE (`U2 (`INDIRECT i1, `DATA b1), `REL b2) ->
-    [(true,false,true,true),(false,true,true,i1); b1; b2]
-  | CLR `A ->
-    [(true,true,true,false),(false,true,false,false)]
-  | CLR `C ->
-    [(true,true,false,false),(false,false,true,true)]
-  | CLR (`BIT b1) ->
-    [(true,true,false,false),(false,false,true,false); byte_of_byte7 b1]
   | DA `A ->
     [(true,true,false,true),(false,true,false,false)]