Changeset 191 for Deliverables/D4.1
- Timestamp:
- Oct 18, 2010, 11:54:23 AM (10 years ago)
- Location:
- Deliverables/D4.1
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
Deliverables/D4.1/ASMInterpret.ml
r168 r191 22 22 type continuation = 23 23 [`In of time * line * continuation] option * 24 [`Out of (time -> line -> time * continuation) ]24 [`Out of (time -> line -> time * continuation)] option 25 25 26 26 (* no differentiation between internal and external code memory *) … … 195 195 expected_out_time = `None; 196 196 197 io = (None, `Out (fun t l -> assert false)) (* a real assert false: unprepared for i/o *)197 io = (None, None) (* a real assert false: unprepared for i/o *) 198 198 } 199 199 … … 1421 1421 status) in 1422 1422 (* Serial port code now follows *) 1423 let in_cont, `Outout_cont = status.io in1423 let in_cont, out_cont = status.io in 1424 1424 let status = 1425 1425 (* Serial port input *) … … 1462 1462 (* Serial port output, part two *) 1463 1463 if status.expected_out_time = `Now then 1464 if get_bit status.scon 7 then 1465 let exp_time, new_cont = out_cont status.clock (`SerialBuff (`Nine ((get_bit status.scon 3), status.sbuf))) in 1466 { status with expected_out_time = `At exp_time; io = new_cont } 1467 else 1468 let exp_time, new_cont = out_cont status.clock (`SerialBuff (`Eight status.sbuf)) in 1469 { status with expected_out_time = `At exp_time; io = new_cont } 1464 match out_cont with 1465 None -> assert false 1466 | Some (`Out out_cont') -> 1467 if get_bit status.scon 7 then 1468 let exp_time, new_cont = out_cont' status.clock (`SerialBuff (`Nine ((get_bit status.scon 3), status.sbuf))) in 1469 { status with expected_out_time = `At exp_time; io = new_cont } 1470 else 1471 let exp_time, new_cont = out_cont' status.clock (`SerialBuff (`Eight status.sbuf)) in 1472 { status with expected_out_time = `At exp_time; io = new_cont } 1470 1473 else 1471 1474 status -
Deliverables/D4.1/ASMInterpret.mli
r168 r191 14 14 type continuation = 15 15 [`In of time * line * continuation] option * 16 [`Out of (time -> line -> time * continuation) ] 16 [`Out of (time -> line -> time * continuation) ] option 17 17 18 18 type status = private
Note: See TracChangeset
for help on using the changeset viewer.