Changeset 191 for Deliverables/D4.1

Timestamp:

Oct 18, 2010, 11:54:23 AM (9 years ago)

Author:

mulligan

Message:

Changed way we handle I/O due to assert false bug on first serial I/O
attempt.

Location:

Deliverables/D4.1

Files:

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

Deliverables/D4.1/ASMInterpret.ml

@@ -22 +22 @@
 type continuation =
   [`In of time * line * continuation] option *
-  [`Out of (time -> line -> time * continuation) ]
+  [`Out of (time -> line -> time * continuation)] option
 
 (* no differentiation between internal and external code memory *)
@@ -195 +195 @@
   expected_out_time = `None;
 
-  io = (None, `Out (fun t l -> assert false)) (* a real assert false: unprepared for i/o *)
+  io = (None, None) (* a real assert false: unprepared for i/o *)
 }
 
@@ -1421 +1421 @@
                 status) in
        (* Serial port code now follows *)
-         let in_cont, `Out out_cont = status.io in
+         let in_cont, out_cont = status.io in
          let status =
            (* Serial port input *)
@@ -1462 +1462 @@
            (* Serial port output, part two *)
            if status.expected_out_time = `Now then
-             if get_bit status.scon 7 then
-               let exp_time, new_cont = out_cont status.clock (`SerialBuff (`Nine ((get_bit status.scon 3), status.sbuf))) in
-                 { status with expected_out_time = `At exp_time; io = new_cont }
-             else
-               let exp_time, new_cont = out_cont status.clock (`SerialBuff (`Eight status.sbuf)) in
-                 { status with expected_out_time = `At exp_time; io = new_cont }               
+               match out_cont with
+                 None -> assert false
+               | Some (`Out out_cont') ->
+                   if get_bit status.scon 7 then
+                     let exp_time, new_cont = out_cont' status.clock (`SerialBuff (`Nine ((get_bit status.scon 3), status.sbuf))) in
+                       { status with expected_out_time = `At exp_time; io = new_cont }
+                   else
+                     let exp_time, new_cont = out_cont' status.clock (`SerialBuff (`Eight status.sbuf)) in
+                       { status with expected_out_time = `At exp_time; io = new_cont }               
            else
              status

Deliverables/D4.1/ASMInterpret.mli

@@ -14 +14 @@
 type continuation =
   [`In of time * line * continuation] option *
-  [`Out of (time -> line -> time * continuation) ]
+  [`Out of (time -> line -> time * continuation) ] option
 
 type status = private