Changeset 67 for Deliverables/D4.1

Timestamp:

Sep 13, 2010, 4:15:00 PM (10 years ago)

Author:

mulligan

Message:

DJNZ instruction finished.

Location:

Deliverables/D4.1

Files:

• 8051Series.ml (modified) (2 diffs)
• ASMInterpret.ml (modified) (1 diff)
• Byte.ml (modified) (1 diff)
• Word.ml (modified) (2 diffs)

Deliverables/D4.1/8051Series.ml

@@ -14 +14 @@
 
   type processor_status
+  type program_counter
 
   type asm_instruction
@@ -20 +21 @@
 
   val power_up: processor_status
+  val next: program_counter -> processor_status -> 
 end;;

Deliverables/D4.1/ASMInterpret.ml

@@ -942 +942 @@
        else
          { status with psw = (new_carry, b2, b3, b4),n2 }
-(*
- | DJNZ of [ reg | direct ] * rel
-*)
+ | DJNZ (ag, (`REL rel)) ->
+     let ag_val = fetch_arg8 status ag in
+     let new_ag_val = byte_of_int ((int_of_byte ag_val) - 1) in
+       if ag_val <> ((false,false,false,false),(false,false,false,false)) then
+         { status with pc = status.pc ++ (int_of_byte rel) }
+       else
+         status
  | NOP -> status
 ;;

Deliverables/D4.1/Byte.ml

@@ -50 +50 @@
 end
 
-module ByteFunctor(Bit: BIT) (Nibble: NIBBLE with type bit = Bit.bit): BYTE
+module ByteFunctor(Bit: BIT)
+                  (Nibble: NIBBLE with type bit = Bit.bit): BYTE
   with type bit = Bit.bit
   and  type nibble = Nibble.nibble =

Deliverables/D4.1/Word.ml

@@ -7 +7 @@
 (*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*^*)
 
-open "Bit.ml";;
-open "Nibble.ml";;
-open "Byte.ml";;
+open Bit;;
+open Nibble;;
+open Byte;;
 
 module type WORD =
@@ -19 +19 @@
 end;;
 
-module Word(Bit: BIT,
-            Nibble: NIBBLE,
-            Byte: BYTE)
+module Word(Bit: BIT)
+           (Nibble: NIBBLE with type bit = Bit.bit)
+           (Byte: BYTE with type bit = Bit.bit and type nibble = Nibble.nibble): WORD
   with type bit    = Bit.bit
   and  type nibble = Nibble.nibble