Changeset 31 for Deliverables/D4.1

Timestamp:

Sep 3, 2010, 12:08:16 PM (10 years ago)

Author:

mulligan

Message:

Instructions J--M complete.

Location:

Deliverables/D4.1

Files:

• ASM.mli (modified) (1 diff)
• ASMInterpret.ml (modified) (1 diff)

Deliverables/D4.1/ASM.mli

@@ -75 +75 @@
  | JC of rel
  | JNC of rel
- | JB of rel
+ | JB of bit * rel
  | JNB of bit * rel
  | JBC of bit * rel

Deliverables/D4.1/ASMInterpret.ml

@@ -165 +165 @@
          INC `DPTR, pc, 2
    | (false,false,true,false),(false,false,false,false) ->
-       let pc,b1 = next pc in
-       let pc b2 = next pc in
-         JB (`BIT)
+       let pc,b1 = next7 pc in
+       let pc,b2 = next pc in
+         JB (`BIT b1, `REL b2), pc, 2
+   | (false,false,false,true),(false,false,false,false) ->
+       let pc,b1 = next7 pc in
+       let pc,b2 = next pc in
+         JBC (`BIT b1, `REL b2), pc, 2
+   | (false,true,false,false),(false,false,false,false) ->
+       let pc,b1 = next pc in
+         JC (`REL b1), pc, 2
+   | (false,true,true,true),(false,false,true,true) ->
+         JMP `IND_DPTR, pc, 2
+   | (false,false,true,true),(false,false,false,false) ->
+       let pc,b1 = next7 pc in
+       let pc,b2 = next pc in
+         JNB (`BIT b1, `REL b2), pc, 2
+   | (false,true,false,true),(false,false,false,false) ->
+       let pc,b1 = next pc in
+         JNC (`REL b1), pc, 2
+   | (false,true,true,true),(false,false,false,false) ->
+       let pc,b1 = next pc in
+         JNZ (`REL b1), pc, 2
+   | (false,true,true,false),(false,false,false,false) ->
+       let pc,b1 = next pc in
+         JZ (`REL b1), pc, 2
+   | (false,false,false,true),(false,false,true,false) ->
+       let pc,b1 = next pc in
+       let pc,b2 = next pc in
+         LCALL (`ADDR16 (b1,b1)), pc, 2
+   | (false,false,false,false),(false,false,true,false) ->
+       let pc,b1 = next pc in
+       let pc,b2 = next pc in
+         LJMP (`ADDR16 (b1,b1)), pc, 2
  with
   Not_found -> raise BOO