Changeset 166 for Deliverables/D4.1

Timestamp:

Oct 8, 2010, 6:11:14 PM (10 years ago)

Author:

mulligan

Message:

I/O support added for serial buffer.

Location:

Deliverables/D4.1

Files:

• ASMInterpret.ml (modified) (6 diffs)
• ASMInterpret.mli (modified) (2 diffs)
• Test.hex (modified) (2 diffs)

Deliverables/D4.1/ASMInterpret.ml

@@ -12 +12 @@
 
 type time = int;;
-type line = [`P0 | `P1 ];; (* ??? *)
+type line = [ `P0 of byte
+            | `P1 of byte
+            | `SerialBuff of [ `Eight of byte | `Nine of BitVectors.bit * byte ]];;
+
+(* In:  reception time, line of input, new continuation,
+   Out: transmission time, output line, expected duration until reply,
+        new continuation.
+*)
 type continuation =
-unit (*
- [`In of time * line * byte * continuation] option *
- [`Out of (time -> line -> byte -> continuation) ]
-*)
+  [`In of time * line * continuation] option *
+  [`Out of (time -> line -> time * continuation) ]
 
 (* no differentiation between internal and external code memory *)
@@ -60 +65 @@
    timer1: word;
    timer2: word;  (* can be missing *)
+   expected_out_time: [ `None | `Now | `At of time ];
    io: continuation
  }
@@ -109 +115 @@
   | 0xA0 -> { status with p2 = v }
   | 0xB0 -> { status with p3 = v }
-  | 0x99 -> { status with sbuf = v }
+  | 0x99 ->
+      if status.expected_out_time = `None then
+        { status with sbuf = v; expected_out_time = `Now }
+      else
+        (* a real assert false: trying to initiate a transmission whilst one is still active *)
+        assert false
   | 0x8A -> { status with tl0 = v }
   | 0x8B -> { status with tl1 = v }
@@ -178 +189 @@
   timer2 = zero `Sixteen;
 
-  io = ()
+  expected_out_time = `None;
+
+  io = (None, `Out (fun t l -> assert false)) (* a real assert false: unprepared for i/o *)
 }
 
@@ -1338 +1351 @@
                 status) in
           (* Timer 1 follows. *)
+        let status =
           (match b3,b4 with
             true,true ->
@@ -1401 +1415 @@
                     { status with tl1 = res }
               else
-                status)
+                status) in
+       (* Serial port code now follows *)
+         let in_cont, `Out out_cont = status.io in
+         let status =
+           (* Serial port input *)
+           (match in_cont with
+             Some (`In(time, line, cont)) when time >= status.clock && get_bit status.scon 4 ->
+               let status =
+                 match line with
+                   `P0 b -> assert false
+                 | `P1 b -> assert false
+                 | `SerialBuff (`Eight b) ->
+                      let b7 = get_bit (status.scon) 7 in
+                        (* waiting for nine bits, multiprocessor communication mode requires nine bits *)
+                        if b7 || get_bit status.scon 5 then
+                          assert false (* really: crash! *)
+                        else
+                          let status = { status with scon = set_bit status.scon 0 true } in
+                          let status = { status with sbuf = b } in
+                            status
+                 | `SerialBuff (`Nine (b,b')) ->
+                      let b7 = get_bit (status.scon) 7 in
+                        (* waiting for eight bits *)
+                        if not b7 then
+                          assert false (* really: crash! *)
+                        else
+                          let status = { status with scon = set_bit status.scon 2 b } in
+                          let status = { status with sbuf = b' } in
+                            if (not $ get_bit status.scon 5) || b then
+                              { status with scon = set_bit status.scon 0 true }
+                            else
+                              status
+               in
+                 { status with io = cont }
+           | _ -> status) in
+           (* Serial port output, part one *)
+           let status =
+             (match status.expected_out_time with
+               `At t when status.clock >= t ->
+                 { status with scon = set_bit status.scon 1 true; expected_out_time = `None }
+              | _ -> status) in
+           (* 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 }               
+           else
+             status
 ;;
 

Deliverables/D4.1/ASMInterpret.mli

@@ -5 +5 @@
 
 type time = int;;
-type line = [`P0 | `P1 ];; (* ??? *)
+type line = [ `P0 of byte
+            | `P1 of byte
+            | `SerialBuff of [ `Eight of byte | `Nine of BitVectors.bit * byte ]];;
+(* In:  reception time, line of input, new continuation,
+   Out: transmission time, output line, expected duration until reply,
+        new continuation.
+*)
 type continuation =
-unit (*
- [`In of time * line * byte * continuation] option *
- [`Out of (time -> line -> byte -> continuation) ]
-*)
+  [`In of time * line * continuation] option *
+  [`Out of (time -> line -> time * continuation) ]
 
 type status = private
@@ -52 +56 @@
    timer1: word;
    timer2: word;  (* can be missing *)
+   expected_out_time: [ `None | `Now | `At of time ];
    io: continuation
  }

Deliverables/D4.1/Test.hex

@@ -1 +1 @@
 :03000000020008F3
 :0300610002000397
-:050003001200A480FEC4
-:08006400AA82AB837C007D0041
-:0E006C008C06EDCE25E0CE33FF0EBE00010F58
-:0E007A00C3EA9EEB9F401E8C068D070CBC0057
-:02008800010D68
-:0C008A00EFCE25E0CE33FF0EBE00010FCC
-:09009600EAC39EFAEB9FFB80CD4A
-:05009F008C828D83221C
-:0E00A400900010120064AA82AB83BA0407BB5E
-:0600B2000004900005228D
-:0400B800900007228B
+:0500030012015380FE14
+:0800640085820885830985F0FF
+:04006C000AF50B8501
+:03007000081085F0
+:03007300091185EB
+:030076000A1285E6
+:030079000B13AEB8
+:0A007C0010E511A2E713CE13CEFF2A
+:0E0086003395E0FAFB74DFC39EFE74599FFFB2
+:0A00940074379A745F9B8E108F1171
+:04009E0085100C8538
+:0300A200110D85B8
+:0300A500120E85B3
+:0300A800130FC073
+:0400AB0008C009C0C0
+:0A00AF000AC00B900000E4F5F074A5
+:0E00B9003F1201ACAE82AF83AAF0FBE58124BA
+:0800C700FCF581C00CC00DC066
+:0A00CF000EC00F8E828F838AF0EBC3
+:0E00D9001201ACAA82AB83ACF0FDE58124FCE1
+:0700E700F581C00CC00DC043
+:0A00EE000EC00F8A828B838CF0EDA8
+:0E00F8001201ACAA82AB83ACF0FDE58124FCC2
+:0E010600F581C002C003C004C0059000007562
+:0E011400F0C0743F1201A1AA82AB83ACF0FDD3
+:0E012200E58124FCF581C002C003C004C005C5
+:07013000850C82850D83851B
+:050137000EF0E50F12BF
+:0E013C0001ACAA82AB83ACF0FDE58124FCF59A
+:09014A00818A828B838CF0ED2286
+:0E01530090000075F0807441120064AA82AB27
+:0D01610083ACF0FDC002C003C004C00590D7
+:0E016E00000075F080743F12039CAA82AB83E0
+:0E017C00ACF0FDE58124FCF5818A828B838C3A
+:0E018A00F0ED1202FFAA82AB83BA0407BB009D
+:050198000490000522A7
+:04019D0090000722A5
+:0B01A100A8811818C6B2E7C60202A62B
+:0601AC0012024FBC00032B
+:0301B200020354F1
+:0801B500EF60FA30D502B2D16F
+:0801BD00E583B4FF0302036AAD
+:0801C500E582B4FF0302036AA6
+:0B01CD00258340072482400B020354EE
+:0801D800248314500302036AA2
+:0E01E000F582EA8DF0A4A8F0EA8EF0A428F8CB
+:0E01EE00E435F0F9EB8DF0A428E935F0F9E4E2
+:0E01FC0033CA8FF0A429F9EA35F0FAEBF88E39
+:0E020A00F0A429F9EA35F0FAE433FBEC8DF0AC
+:0E021800A429F9EA35F0FAE43BFBE88FF0A4E4
+:0E0226002AFAEB35F0FBE433CCFD8EF0A42A6F
+:0E023400FAEB35F0FBE43CFCED8FF0A42BFB65
+:0A024200EC35F0FC20E70312027D0A
+:03024C0002033377
+:0D024F00AA82AB83A2F73392D16002D2F7EE
+:0E025C00F582ACF0E58124F9F8E6FD08E6FE37
+:0E026A000886F008E6A2F73392D56002D2F7BC
+:05027800F583AFF02248
 :06003700E478FFF6D8FD9D
+:02027D00780403
+:0E027F00EC700DC9CACBFCE58224F8F582D8DC
+:02028D00F1225C
+:02028F007820D5
+:0E02910020E7111582C3E933F9EA33FAEB33A3
+:06029F00FBEC33FCD8EC7F
+:0102A5002236
 :080015007900E94400601B7A48
-:05001D00009000C07816
+:05001D000090051378BE
 :030022000075A0C6
 :0A00250000E493F2A308B8000205FE
 :08002F00A0D9F4DAF275A0FF7C
+:0302A60012024FF2
+:0902A9007900E583B58202800DA5
+:0502B20050031203825D
+:0802B700E583C3958212045F88
+:0802BF00E5D0C465D020E11771
+:0E02C700EA2DFAEB3EFBEC3FFC5009740112ED
+:0602D500045FEC4480FC14
+:0302DB00020333E8
+:0E02DE00C3EA9DFAEB9EFBEC9FFC500FC3E4BD
+:0D02EC0099F9E49AFAE49BFBE49CFCB2D182
+:0602F90012027D02033336
 :08003D007800E84400600A7934
 :030045000075A0A3
@@ -23 +88 @@
 :08004E007800E84400600C7921
 :0B00560000900000E4F0A3D8FCD9FAF1
-:03000800758107F8
-:0A000B001200BCE58260030200034E
-:0400BC007582002227
+:0E02FF001204A2700AE582458345F0700122C8
+:01030D00E40B
+:03030E0030D112D9
+:0E031100F4700BE5F0F47006E58330E701228E
+:04031F0090800022A8
+:0C032300700AE5F07006E58320E7012277
+:04032F00907FFF229A
+:06033300B98003EA13B3D8
+:0E0339004010EA2401FAE43BFBE43CFC5004D3
+:040347007C8005822F
+:09034B00BC000EBB000BBA000857
+:08035400E4F5F0F583F58222C7
+:0E035C00A2D1E582138CF092F78B838A822265
+:0D036A00E4F583F58275F080F4A2D1132232
+:0B037700E4F583F58275F0C0747F226E
+:0E038200E582C583F582A2D133A2D592D113B4
+:0C03900092D5ECCFFCEBCEFBEACDFA22BC
+:08039C0012024F30D502B2D16C
+:0903A400BF0009BC00030203774D
+:0303AD0002036ADE
+:0603B000BC00030203542F
+:0D03B600E583B4FF0BE582B4FF030203777B
+:0303C300020354DE
+:0803C600E582B4FF0302036AA3
+:0C03CE00C395835007247F400B020354AA
+:0803DA00248014500302036AA1
+:0E03E200F582C3ED9AEE9BEF9C40111582C38D
+:0E03F000EA33F9EB33FAEC33FBE433FC80051F
+:0503FE00E4CCCBCAF9BC
+:05040300C08275F01934
+:0E040800C3E99DEA9EEB9FEC9400D5F00280C4
+:010416002DB8
+:0E041700400EE99DF9EA9EFAEB9FFBEC940083
+:02042500FCC316
+:0E042700B3E833F8E58233F582E58333F583DD
+:0E043500C3E933F9EA33FAEB33FBEC33FC8016
+:01044300C4F4
+:0E044400B3E4F938FAE43582FBE43583FCD0EA
+:0704520082500405827C804A
+:0604590012027D02034BBC
+:03000800758113EC
+:0A000B001204FDE582600302000309
+:09045F006040F82582500274FF90
+:0E046800F582E824F8501ECCCBCAF9E4CC246F
+:0E047600F85014CBCAF9E4CB24F8500BCAF9A5
+:09048400E4CA24F85003790022B7
+:05048D0024086010F8D6
+:0E049200C3EC13FCEB13FBEA13FAE913F9D8E1
+:0104A000F16A
+:0104A1002238
+:0A04A200120501C3749E95824039D3
+:0804AC00790012045F30D12633
+:0E04B400E9F42401F582EAF43400F583EBF458
+:0E04C2003400F5F0ECF43400700AE582458356
+:0504D00045F07001225F
+:0104D500E442
+:0404D60030E70F22DA
+:0B04DA00EC20E71489828A838BF0225B
+:0304E50030D10A09
+:0A04E800E4F582F583F5F07480223C
+:0B04F20074FFF582F583F5F0747F22A3
+:0404FD0075820022E2
+:0D050100AA82AB83A2F73392D16002D2F739
+:05050E00F582ACF022B3
 :00000001FF