Changeset 213

Timestamp:

Nov 3, 2010, 3:23:03 PM (9 years ago)

Author:

mulligan

Message:

implementing interrupts

Location:

Deliverables/D4.1

Files:

• ASMInterpret.ml (modified) (2 diffs)
• ASMInterpret.mli (modified) (1 diff)

Deliverables/D4.1/ASMInterpret.ml

@@ -1440 +1440 @@
           match status.serial_k_out with
             None -> assert false (* correct? *)
-          | Some k' -> { status with io = k';
+          | Some k' -> { status with io   = k';
                                      scon = set_bit status.scon 1 true; }
         else
           status
      | _ -> assert false)
+;;
+
+let interrupts status =
+  let (ea,_,_,es), (et1,ex1,et0,ex0) = bits_of_byte status.ie in
+  let (_,_,_,ps), (pt1,px1,pt0,px0) = bits_of_byte status.ip in
+    (* DPM: are interrupts enabled? *)
+    if ea then
+      match (es,et1,ex1,et0,ex0) with
+        | (false,false,false,false,false) ->
+            (* no interrupts set *)
+            status
+        | _ -> assert false
+    else
+      status
 ;;
 
@@ -1740 +1754 @@
   let status = serial_port_input status in_cont in
   let status = serial_port_output status out_cont in
+  let status = interrupts status in
     { status with previous_p1_val = get_bit status.p3 4;
                   previous_p3_val = get_bit status.p3 5 }

Deliverables/D4.1/ASMInterpret.mli

@@ -95 +95 @@
 module IntMap: Map.S with type key = int
 
-val assembly:
- ASM.assembly_program -> BitVectors.byte list (*ASM.instruction list * symbol_table *) * string IntMap.t
+val assembly: ASM.assembly_program -> BitVectors.byte list (*ASM.instruction list * symbol_table *) * string IntMap.t
 
 (*