Changeset 57 for Deliverables/D4.1

Timestamp:

Sep 10, 2010, 3:18:55 PM (10 years ago)

Author:

mulligan

Message:

More instructions implemented. Started cleaning up code by moving
related functions acting on datatypes (bits, etc.) into dedicated
modules.

Location:

Deliverables/D4.1

Files:

• ASMInterpret.ml (modified) (3 diffs)
• Bit.ml (added)
• Byte.ml (added)
• Nibble.ml (added)

Deliverables/D4.1/ASMInterpret.ml

@@ -863 +863 @@
 (*
  | XCHD of acc * indirect
-
+*)
  (* program branching *)
- | JC of rel
- | JNC of rel
+ | JC (`REL rel) ->
+     let cy = carr status in
+       if cy = true then
+         { status with pc = status.pc ++ (int_of_byte rel) }
+       else
+         status
+ | JNC (`REL rel) ->
+     let cy = carr status in
+       if cy = false then
+         { status with pc = status.pc ++ (int_of_byte rel) }
+       else
+         status
+(*
  | JB of rel
  | JNB of rel
@@ -875 +886 @@
  | RETI
  | AJMP of addr11
- | LJMP of addr16
+*)
+ | LJMP (`ADDR16 (lb,hb)) ->
+     { status with pc = (lb,hb) }
+(*
  | SJMP of rel
  | JMP of indirect_dptr
- | JZ of rel
- | JNZ of rel
 *)
+ | JZ (`REL rel) ->
+     if status.acc = ((false,false,false,false),(false,false,false,false)) then
+                         { status with pc = status.pc ++ (int_of_byte rel) }
+     else
+       status
+ | JNZ (`REL rel) ->
+     if status.acc <> ((false,false,false,false),(false,false,false,false)) then
+                         { status with pc = status.pc ++ (int_of_byte rel) }
+     else
+       status
  | CJNE ((`U1 (`A, ag)), `REL rel) ->
      let ag_val = fetch_arg8 status ag in
@@ -897 +919 @@
          status
 (*
- | CJNE of (acc * [ direct | data ], [ reg | indirect ] * data) union2 * rel
  | DJNZ of [ reg | direct ] * rel
 *)