diff --git a/doc/README_known_issues.md b/doc/README_known_issues.md index 133cdfd6..4ce21163 100644 --- a/doc/README_known_issues.md +++ b/doc/README_known_issues.md @@ -181,13 +181,6 @@ to avoid potential damage. Looking forward to receive test reports. -### V0.742-1 {[issue #14](https://github.com/wfjm/w11/issues/14)} -- SEGFAULT core dump after detach -The detach of a `tcp` type virtual terminal or a `tap` type virtual -ethernet device can lead to a SEGFAULT core dump, e.g. after a -`cpu0ttb0 det` command. -This is caused by a race condition between the detach run-down and the -implementation of `ReventLoop::RemovePollHandler()`. - ### V0.73-2 {[issue #10](https://github.com/wfjm/w11/issues/10)} -- Many post-synthesis simulations fail Many post-synthesis functional and especially post-routing timing simulations currently fail due to startup and initialization problems. @@ -250,6 +243,23 @@ the backend produces proper command lists and the USB channel is usually error free}_ ## Resolved Issues +### V0.742-1 {[issue #14](https://github.com/wfjm/w11/issues/14)} -- SEGFAULT core dump after detach +#### Original Issue +The detach of a `tcp` type virtual terminal or a `tap` type virtual +ethernet device can lead to a SEGFAULT core dump, e.g. after a +`cpu0ttb0 det` command. +This is caused by a race condition between the detach run-down and the +implementation of `ReventLoop::RemovePollHandler()`. +#### Fix +The culprit was a design error in the `RemovePollHandler` flow, which +allowed that `DoPoll` returned while poll list updates were still pending +and the subsequent execution of `DoCall` called removed handlers. +`DoPoll` now loops until there are no pending poll list updates and +`DoCall` quits processing poll change notifications when it detects +pending poll list updates. + +Fixed with commit [6f56f29](https://github.com/wfjm/w11/commit/6f56f29). + ### V0.50-10 {[issue #20](https://github.com/wfjm/w11/issues/20)} -- DL11: output chars lost when device polling used #### Original Issue Part of the console output can be lost when `xxdp` test `eqkce1` is diff --git a/doc/w11a_known_issues.md b/doc/w11a_known_issues.md index 5bdb723a..22d53f9d 100644 --- a/doc/w11a_known_issues.md +++ b/doc/w11a_known_issues.md @@ -1,15 +1,14 @@ -# Summary of known issues for w11a CPU and systems +# Summary of known differences and limitations for w11a CPU and systems General issues are listed on a separate document [README_known_issues.md](README_known_issues.md). -This file descibes issues of the w11 CPU. +This file descibes differences and limitations of the w11 CPU and systems. ### Table of content - [Known differences between w11a and KB11-C (11/70)](#user-content-diff) - [Known limitations](#user-content-lim) -- [Known bugs](#user-content-bug) ### Known differences between w11a and KB11-C (11/70) @@ -56,14 +55,3 @@ differences. to timeout, again mostly in test programs. **--> a 'watch dog' mechanism will be added in a future version which suspends the CPU when the server doesn't respond fast enough.** - -### Known bugs - -- **TCK-036 pri=L: RK11: hardware poll not working** -The RK11/RK05 hardware poll logic is probably not reflecting the -behaviour of the real drive. - -- **TCK-032 pri=M: RK11: polling on `DRY` in `RKDS` doesn't work** -`DRY` in `RKDS` goes 1->0 immediately with `RDY` in `RKCS` when a function is -started. In a real RK05 drive `DRY` went to 0 after a short delay. Some -basic hardware tests are sensitive to this. diff --git a/rtl/sys_gen/w11a/arty/sys_w11a_arty.vhd b/rtl/sys_gen/w11a/arty/sys_w11a_arty.vhd index 9e601e5f..71a45cd5 100644 --- a/rtl/sys_gen/w11a/arty/sys_w11a_arty.vhd +++ b/rtl/sys_gen/w11a/arty/sys_w11a_arty.vhd @@ -1,4 +1,4 @@ --- $Id: sys_w11a_arty.vhd 1140 2019-04-28 10:21:21Z mueller $ +-- $Id: sys_w11a_arty.vhd 1151 2019-05-24 16:25:26Z mueller $ -- -- Copyright 2018-2019 by Walter F.J. Mueller -- @@ -37,6 +37,7 @@ -- -- Synthesized: -- Date Rev viv Target flop lutl lutm bram slic +-- 2019-05-19 1150 2017.2 xc7a35t-1l 6838 10574 923 17.5 3392 +dz11 -- 2019-04-27 1140 2017.2 xc7a35t-1l 6706 10249 898 17.0 3380 +*buf -- 2019-03-02 1116 2017.2 xc7a35t-1l 6625 10705 836 17.0 3218 -- 2019-02-02 1108 2018.3 xc7a35t-1l 6579 9839 819 17.0 3225 diff --git a/rtl/sys_gen/w11a/arty_bram/sys_w11a_br_arty.vhd b/rtl/sys_gen/w11a/arty_bram/sys_w11a_br_arty.vhd index b4d05ca8..f2452dd5 100644 --- a/rtl/sys_gen/w11a/arty_bram/sys_w11a_br_arty.vhd +++ b/rtl/sys_gen/w11a/arty_bram/sys_w11a_br_arty.vhd @@ -1,4 +1,4 @@ --- $Id: sys_w11a_br_arty.vhd 1108 2019-02-02 23:04:38Z mueller $ +-- $Id: sys_w11a_br_arty.vhd 1152 2019-05-26 08:13:18Z mueller $ -- -- Copyright 2016-2019 by Walter F.J. Mueller -- @@ -36,6 +36,7 @@ -- -- Synthesized: -- Date Rev viv Target flop lutl lutm bram slic +-- 2019-05-19 1150 2017.2 xc7a35t-1 2829 6226 273 48.0 8150 +dz11 -- 2019-02-02 1108 2018.3 xc7a35t-1 2571 5781 170 47.5 1780 -- 2019-02-02 1108 2017.2 xc7a35t-1 2560 5496 170 47.5 1722 -- 2018-10-13 1055 2017.2 xc7a35t-1 2560 5499 170 47.5 1699 +dmpcnt diff --git a/rtl/sys_gen/w11a/artys7/sys_w11a_as7.vhd b/rtl/sys_gen/w11a/artys7/sys_w11a_as7.vhd index 01300667..d07c944b 100644 --- a/rtl/sys_gen/w11a/artys7/sys_w11a_as7.vhd +++ b/rtl/sys_gen/w11a/artys7/sys_w11a_as7.vhd @@ -1,4 +1,4 @@ --- $Id: sys_w11a_as7.vhd 1105 2019-01-12 19:52:45Z mueller $ +-- $Id: sys_w11a_as7.vhd 1151 2019-05-24 16:25:26Z mueller $ -- -- Copyright 2019- by Walter F.J. Mueller -- @@ -37,6 +37,7 @@ -- -- Synthesized: -- Date Rev viv Target flop lutl lutm bram slic +-- 2019-05-19 1150 2018.3 xc7s50 6843 10554 926 17.5 3425 +dz11 -- 2019-01-12 1105 2018.3 xc7s50 6585 9837 806 17.0 3250 -- -- Revision History: diff --git a/rtl/sys_gen/w11a/artys7_bram/sys_w11a_br_as7.vhd b/rtl/sys_gen/w11a/artys7_bram/sys_w11a_br_as7.vhd index 2df2a59b..c6aad73c 100644 --- a/rtl/sys_gen/w11a/artys7_bram/sys_w11a_br_as7.vhd +++ b/rtl/sys_gen/w11a/artys7_bram/sys_w11a_br_as7.vhd @@ -1,4 +1,4 @@ --- $Id: sys_w11a_br_as7.vhd 1108 2019-02-02 23:04:38Z mueller $ +-- $Id: sys_w11a_br_as7.vhd 1151 2019-05-24 16:25:26Z mueller $ -- -- Copyright 2018-2019 by Walter F.J. Mueller -- @@ -36,6 +36,7 @@ -- -- Synthesized: -- Date Rev viv Target flop lutl lutm bram slic +-- 2019-05-19 1150 2017.2 xc7s50 2821 6206 273 68.0 1887 +dz11 -- 2019-02-02 1108 2018.3 xc7s50 2568 5811 170 67.5 1799 -- 2019-02-02 1108 2017.2 xc7s50 2556 5503 170 67.5 1666 +dmpcnt -- 2018-09-15 1045 2017.2 xc7s50 2333 5156 138 67.5 1592 +KW11P diff --git a/rtl/sys_gen/w11a/basys3/sys_w11a_b3.vhd b/rtl/sys_gen/w11a/basys3/sys_w11a_b3.vhd index 5c426138..860a662e 100644 --- a/rtl/sys_gen/w11a/basys3/sys_w11a_b3.vhd +++ b/rtl/sys_gen/w11a/basys3/sys_w11a_b3.vhd @@ -1,4 +1,4 @@ --- $Id: sys_w11a_b3.vhd 1140 2019-04-28 10:21:21Z mueller $ +-- $Id: sys_w11a_b3.vhd 1151 2019-05-24 16:25:26Z mueller $ -- -- Copyright 2015-2019 by Walter F.J. Mueller -- @@ -35,6 +35,7 @@ -- -- Synthesized: -- Date Rev viv Target flop lutl lutm bram slic +-- 2019-05-19 1150 2017.2 xc7a35t-1 2968 6360 273 48.0 1963 +dz11 -- 2019-04-27 1140 2017.2 xc7a35t-1 2835 6032 248 47.5 1879 +*buf -- 2019-03-02 1116 2017.2 xc7a35t-1 2748 5725 186 47.5 1811 +ibtst -- 2019-02-02 1108 2018.3 xc7a35t-1 2711 5910 170 47.5 1825 diff --git a/rtl/sys_gen/w11a/cmoda7/sys_w11a_c7.vhd b/rtl/sys_gen/w11a/cmoda7/sys_w11a_c7.vhd index f26aa60e..c1adcea4 100644 --- a/rtl/sys_gen/w11a/cmoda7/sys_w11a_c7.vhd +++ b/rtl/sys_gen/w11a/cmoda7/sys_w11a_c7.vhd @@ -1,4 +1,4 @@ --- $Id: sys_w11a_c7.vhd 1140 2019-04-28 10:21:21Z mueller $ +-- $Id: sys_w11a_c7.vhd 1151 2019-05-24 16:25:26Z mueller $ -- -- Copyright 2017-2019 by Walter F.J. Mueller -- @@ -37,6 +37,7 @@ -- -- Synthesized: -- Date Rev viv Target flop lutl lutm bram slic +-- 2019-05-19 1150 2017.2 xc7a35t-1 3369 6994 285 50.0 2099 +dz11 -- 2019-04-27 1140 2017.2 xc7a35t-1 3243 6618 260 50.0 2009 +ibtst -- 2019-03-02 1116 2017.2 xc7a35t-1 3156 6332 198 50.0 1918 +ibtst -- 2019-02-02 1108 2018.3 xc7a35t-1 3112 6457 182 50.0 1936 diff --git a/rtl/sys_gen/w11a/nexys2/sys_w11a_n2.imfset b/rtl/sys_gen/w11a/nexys2/sys_w11a_n2.imfset index f723ff0f..0b68de60 100644 --- a/rtl/sys_gen/w11a/nexys2/sys_w11a_n2.imfset +++ b/rtl/sys_gen/w11a/nexys2/sys_w11a_n2.imfset @@ -1,4 +1,4 @@ -# $Id: sys_w11a_n2.imfset 1136 2019-04-24 09:27:28Z mueller $ +# $Id: sys_w11a_n2.imfset 1150 2019-05-19 17:52:54Z mueller $ # # ---------------------------------------------------------------------------- [xst] @@ -80,14 +80,6 @@ Signal is assigned but never used Signal is assigned but never used Signal is assigned but never used -# DZ11 signals -Signal is assigned but never used -Signal is assigned but never used -Signal is used but never assigned -Signal is used but never assigned -Signal is used but never assigned -Signal is used but never assigned - # IIST signals Signal is used but never assigned Signal is used but never assigned diff --git a/rtl/sys_gen/w11a/nexys2/sys_w11a_n2.vhd b/rtl/sys_gen/w11a/nexys2/sys_w11a_n2.vhd index c02fee53..a1e0a68a 100644 --- a/rtl/sys_gen/w11a/nexys2/sys_w11a_n2.vhd +++ b/rtl/sys_gen/w11a/nexys2/sys_w11a_n2.vhd @@ -1,4 +1,4 @@ --- $Id: sys_w11a_n2.vhd 1140 2019-04-28 10:21:21Z mueller $ +-- $Id: sys_w11a_n2.vhd 1151 2019-05-24 16:25:26Z mueller $ -- -- Copyright 2010-2019 by Walter F.J. Mueller -- @@ -34,7 +34,8 @@ -- -- Synthesized (xst): -- Date Rev ise Target flop lutl lutm slic t peri --- 2019-04-27 1140 14.7 131013 xc3s1200e-4 3087 9352 588 5515 ok: +*buf 63% +-- 2019-05-19 1150 14.7 131013 xc3s1200e-4 3219 8981 638 5796 ok: +dz11 66% +-- 2019-04-27 1140 14.7 131013 xc3s1200e-4 3087 ???? 588 5515 ok: +*buf 63% -- 2019-03-02 1116 14.7 131013 xc3s1200e-4 3024 8246 526 5322 ok: +ibtst 61% -- 2019-01-27 1108 14.7 131013 xc3s1200e-4 2976 8101 510 5201 ok: -iist -- 2018-10-13 1055 14.7 131013 xc3s1200e-4 3097 8484 510 5471 ok: +dmpcnt diff --git a/rtl/sys_gen/w11a/nexys3/sys_w11a_n3.imfset b/rtl/sys_gen/w11a/nexys3/sys_w11a_n3.imfset index 9d1e4513..25a489ea 100644 --- a/rtl/sys_gen/w11a/nexys3/sys_w11a_n3.imfset +++ b/rtl/sys_gen/w11a/nexys3/sys_w11a_n3.imfset @@ -1,4 +1,4 @@ -# $Id: sys_w11a_n3.imfset 1108 2019-02-02 23:04:38Z mueller $ +# $Id: sys_w11a_n3.imfset 1150 2019-05-19 17:52:54Z mueller $ # # ---------------------------------------------------------------------------- [xst] @@ -15,18 +15,11 @@ INFO:Xst:1901 .* has been replaced by RAMB16 Value "none" of property "fsm_encoding" is not applicable Value "one_hot" of property "fsm_encoding" is not applicable -Using initial value '0' for rb_lam_dz11 since it is never assigned -Using initial value .* for ib_sres_dz11 since it is never assigned -Using initial value '0' for ei_req_dz11rx since it is never assigned -Using initial value '0' for ei_req_dz11tx since it is never assigned - ibdr_deuna.vhd.* Assignment to ibrd ignored ibdr_rhrp.vhd.* Assignment to ibrd ignored ibdr_rl11.vhd.* Assignment to ibwrem ignored ibdr_rk11.vhd.* Assignment to ibrd ignored ibdr_tm11.vhd.* Assignment to ibrd ignored -ibdr_maxisys.vhd.* Assignment to ei_ack_dz11rx ignored -ibdr_maxisys.vhd.* Assignment to ei_ack_dz11tx ignored Net does not have a driver Net does not have a driver diff --git a/rtl/sys_gen/w11a/nexys3/sys_w11a_n3.vhd b/rtl/sys_gen/w11a/nexys3/sys_w11a_n3.vhd index 67dd8f37..ca81e016 100644 --- a/rtl/sys_gen/w11a/nexys3/sys_w11a_n3.vhd +++ b/rtl/sys_gen/w11a/nexys3/sys_w11a_n3.vhd @@ -1,4 +1,4 @@ --- $Id: sys_w11a_n3.vhd 1143 2019-05-01 13:25:51Z mueller $ +-- $Id: sys_w11a_n3.vhd 1151 2019-05-24 16:25:26Z mueller $ -- -- Copyright 2011-2019 by Walter F.J. Mueller -- @@ -34,6 +34,7 @@ -- -- Synthesized (xst): -- Date Rev ise Target flop lutl lutm slic t peri +-- 2019-05-19 1150 14.7 131013 xc6slx16-2 3167 6052 248 2130 ok: +dz11 93% -- 2019-05-01 1143 14.7 131013 xc6slx16-2 3062 5761 232 2057 ok: +m9312 90% -- 2019-04-27 1140 14.7 131013 xc6slx16-2 3053 5742 232 2050 ok: +dlbuf 89% -- 2019-04-24 1137 14.7 131013 xc6slx16-2 3049 5727 223 2045 ok: +pcbuf 89% diff --git a/rtl/sys_gen/w11a/nexys4/sys_w11a_n4.vhd b/rtl/sys_gen/w11a/nexys4/sys_w11a_n4.vhd index d7ef5edc..f357589b 100644 --- a/rtl/sys_gen/w11a/nexys4/sys_w11a_n4.vhd +++ b/rtl/sys_gen/w11a/nexys4/sys_w11a_n4.vhd @@ -1,4 +1,4 @@ --- $Id: sys_w11a_n4.vhd 1143 2019-05-01 13:25:51Z mueller $ +-- $Id: sys_w11a_n4.vhd 1151 2019-05-24 16:25:26Z mueller $ -- -- Copyright 2013-2019 by Walter F.J. Mueller -- @@ -35,6 +35,7 @@ -- -- Synthesized: -- Date Rev viv Target flop lutl lutm bram slic MHz +-- 2019-05-19 1150 2017.2 xc7a100t-1 3418 7272 285 17.5 2234 80 +dz11 -- 2019-05-01 1143 2017.2 xc7a100t-1 3295 6597 260 17.5 2107 80 +m9312 -- 2019-04-27 1140 2017.2 xc7a100t-1 3288 6574 260 17.0 2132 80 +dlbuf -- 2019-04-24 1137 2017.2 xc7a100t-1 3251 6465 228 17.0 2043 80 +pcbuf diff --git a/rtl/sys_gen/w11a/nexys4d/sys_w11a_n4d.vhd b/rtl/sys_gen/w11a/nexys4d/sys_w11a_n4d.vhd index bf4c5c2a..aafc7472 100644 --- a/rtl/sys_gen/w11a/nexys4d/sys_w11a_n4d.vhd +++ b/rtl/sys_gen/w11a/nexys4d/sys_w11a_n4d.vhd @@ -1,4 +1,4 @@ --- $Id: sys_w11a_n4d.vhd 1108 2019-02-02 23:04:38Z mueller $ +-- $Id: sys_w11a_n4d.vhd 1151 2019-05-24 16:25:26Z mueller $ -- -- Copyright 2019- by Walter F.J. Mueller -- @@ -36,6 +36,7 @@ -- -- Synthesized: -- Date Rev viv Target flop lutl lutm bram slic MHz +-- 2019-05-19 1150 2017.2 xc7a100t-1 6811 10322 901 17.5 3496 80 +dz11 -- 2019-02-02 1108 2018.3 xc7a100t-1 6558 9537 814 17.0 3443 80 -- 2019-02-02 1108 2017.2 xc7a100t-1 6538 9496 798 17.0 3308 80 -- diff --git a/rtl/sys_gen/w11a/nexys4d_bram/sys_w11a_br_n4d.vhd b/rtl/sys_gen/w11a/nexys4d_bram/sys_w11a_br_n4d.vhd index d3e266db..cf1a2249 100644 --- a/rtl/sys_gen/w11a/nexys4d_bram/sys_w11a_br_n4d.vhd +++ b/rtl/sys_gen/w11a/nexys4d_bram/sys_w11a_br_n4d.vhd @@ -1,4 +1,4 @@ --- $Id: sys_w11a_br_n4d.vhd 1108 2019-02-02 23:04:38Z mueller $ +-- $Id: sys_w11a_br_n4d.vhd 1151 2019-05-24 16:25:26Z mueller $ -- -- Copyright 2017-2019 by Walter F.J. Mueller -- @@ -35,6 +35,7 @@ -- -- Synthesized: -- Date Rev viv Target flop lutl lutm bram slic +-- 2019-05-19 1150 2017.2 xc7a100t-1 3097 6562 273 132.0 2110 +dz11 -- 2019-02-02 1108 2018.3 xc7a100t-1 2837 6083 170 131.5 1957 -- 2019-02-02 1108 2017.2 xc7a100t-1 2825 5843 170 131.5 1824 +dmpcnt -- 2018-09-15 1045 2017.2 xc7a100t-1 2602 5490 138 131.5 1754 +KW11P diff --git a/rtl/sys_gen/w11a/s3board/sys_w11a_s3.imfset b/rtl/sys_gen/w11a/s3board/sys_w11a_s3.imfset index 505c4376..c67faee0 100644 --- a/rtl/sys_gen/w11a/s3board/sys_w11a_s3.imfset +++ b/rtl/sys_gen/w11a/s3board/sys_w11a_s3.imfset @@ -1,4 +1,4 @@ -# $Id: sys_w11a_s3.imfset 1136 2019-04-24 09:27:28Z mueller $ +# $Id: sys_w11a_s3.imfset 1150 2019-05-19 17:52:54Z mueller $ # # ---------------------------------------------------------------------------- [xst] @@ -67,14 +67,6 @@ Signal is assigned but never used Signal is assigned but never used Signal is assigned but never used -# DZ11 signals -Signal is assigned but never used -Signal is assigned but never used -Signal is used but never assigned -Signal is used but never assigned -Signal is used but never assigned -Signal is used but never assigned - # IIST signals Signal is used but never assigned Signal is used but never assigned diff --git a/rtl/sys_gen/w11a/s3board/sys_w11a_s3.vhd b/rtl/sys_gen/w11a/s3board/sys_w11a_s3.vhd index 695b6fa5..6a74b177 100644 --- a/rtl/sys_gen/w11a/s3board/sys_w11a_s3.vhd +++ b/rtl/sys_gen/w11a/s3board/sys_w11a_s3.vhd @@ -1,4 +1,4 @@ --- $Id: sys_w11a_s3.vhd 1140 2019-04-28 10:21:21Z mueller $ +-- $Id: sys_w11a_s3.vhd 1151 2019-05-24 16:25:26Z mueller $ -- -- Copyright 2007-2019 by Walter F.J. Mueller -- @@ -33,6 +33,7 @@ -- -- Synthesized (xst): -- Date Rev ise Target flop lutl lutm slic t peri +-- 2019-05-19 1150 14.7 131013 xc3s1000-4 3019 8764 574 5558 OK: +dz11 72% -- 2019-04-27 1140 14.7 131013 xc3s1000-4 2890 8306 524 5252 OK: +*buf 68% -- 2019-03-02 1116 14.7 131013 xc3s1000-4 2830 8045 462 5086 OK: +ibtst 66% -- 2019-01-27 1108 14.7 131013 xc3s1000-4 2782 7873 446 4942 OK: -iist 64% diff --git a/tools/mcode/dl11/dl11echo.mac b/tools/mcode/dl11/dl11echo.mac index 54d29097..3865c877 100644 --- a/tools/mcode/dl11/dl11echo.mac +++ b/tools/mcode/dl11/dl11echo.mac @@ -1,4 +1,4 @@ -; $Id: dl11echo.mac 1139 2019-04-27 14:00:38Z mueller $ +; $Id: dl11echo.mac 1149 2019-05-12 21:00:29Z mueller $ ; Copyright 2019- by Walter F.J. Mueller ; License disclaimer see License.txt in $RETROBASE directory ; @@ -171,21 +171,21 @@ chkesc: movb curchr,r0 ; use r1,r2 ; hdldir: jsr pc,wchar ; direct mode - cmp #CR,r0 ; CR seen + cmpb #CR,r0 ; CR seen bne 100$ jsr pc,wlf ; then add LF 100$: rts pc -hdllc: cmp r0,#'A ; lower case mode +hdllc: cmpb r0,#'A ; lower case mode blt hdldir - cmp r0,#'Z + cmpb r0,#'Z bgt hdldir add #<'a-'A>,r0 br hdldir -hdluc: cmp r0,#'a ; upper case mode +hdluc: cmpb r0,#'a ; upper case mode blt hdldir - cmp r0,#'z + cmpb r0,#'z bgt hdldir sub #<'a-'A>,r0 br hdldir @@ -212,7 +212,7 @@ hdloct: mov r0,r2 ; octal mode ; print octal digit ------------------------------ ; in r0 current character ; -woct: bic #370,r0 ; mask +woct: bic #177770,r0 ; mask add #'0,r0 ; bin->ascii jmp wchar ; and print ; diff --git a/tools/mcode/lp11/lp11write.mac b/tools/mcode/lp11/lp11write.mac index 4a4fba1c..c9bfaf4a 100644 --- a/tools/mcode/lp11/lp11write.mac +++ b/tools/mcode/lp11/lp11write.mac @@ -1,4 +1,4 @@ -; $Id: lp11write.mac 1134 2019-04-21 17:18:03Z mueller $ +; $Id: lp11write.mac 1152 2019-05-26 08:13:18Z mueller $ ; Copyright 2019- by Walter F.J. Mueller ; License disclaimer see License.txt in $RETROBASE directory ; @@ -6,7 +6,7 @@ ; Date Rev Version Comment ; 2019-04-21 1134 1.0 Initial version ; -; write test tape +; write test output ; ; definitions ---------------------------------------------- ; diff --git a/tools/src/librw11/Rw11CntlDL11.cpp b/tools/src/librw11/Rw11CntlDL11.cpp index f0685624..cd5f040b 100644 --- a/tools/src/librw11/Rw11CntlDL11.cpp +++ b/tools/src/librw11/Rw11CntlDL11.cpp @@ -1,4 +1,4 @@ -// $Id: Rw11CntlDL11.cpp 1140 2019-04-28 10:21:21Z mueller $ +// $Id: Rw11CntlDL11.cpp 1148 2019-05-12 10:10:44Z mueller $ // // Copyright 2013-2019 by Walter F.J. Mueller // @@ -101,7 +101,9 @@ Rw11CntlDL11::Rw11CntlDL11() : Rw11CntlBase("dl11"), fPC_xbuf(0), fPC_rbuf(0), + fRxQlim(0), fRxRlim(0), + fTxRlim(0), fItype(0), fFsize(0), fTxRblkSize(4), @@ -257,7 +259,7 @@ void Rw11CntlDL11::Dump(std::ostream& os, int ind, const char* text, os << bl << " fPC_xbuf: " << fPC_xbuf << endl; os << bl << " fPC_rbuf: " << fPC_rbuf << endl; os << bl << " fRxQlim: " << RosPrintf(fRxQlim,"d",3) << endl; - os << bl << " fRxRlim: " << fRxRlim << endl; + os << bl << " fRxRlim: " << RosPrintf(fRxRlim,"d",3) << endl; os << bl << " fTxRlim: " << RosPrintf(fTxRlim,"d",3) << endl; os << bl << " fItype: " << RosPrintf(fItype,"d",3) << endl; os << bl << " fFsize: " << RosPrintf(fFsize,"d",3) << endl; diff --git a/tools/src/librw11/Rw11UnitTerm.cpp b/tools/src/librw11/Rw11UnitTerm.cpp index b76e5263..78cab9fe 100644 --- a/tools/src/librw11/Rw11UnitTerm.cpp +++ b/tools/src/librw11/Rw11UnitTerm.cpp @@ -1,4 +1,4 @@ -// $Id: Rw11UnitTerm.cpp 1150 2019-05-19 17:52:54Z mueller $ +// $Id: Rw11UnitTerm.cpp 1152 2019-05-26 08:13:18Z mueller $ // // Copyright 2013-2019 by Walter F.J. Mueller // @@ -265,7 +265,7 @@ bool Rw11UnitTerm::Snd(const uint8_t* buf, size_t count) cout << char(bufout[i]) << flush; } } else { // otherwise discard - fStats.Inc(kStatNPreAttDrop); // and count at least... + fStats.Inc(kStatNPreAttDrop, double(bufcnt)); // and count at least... } } return ok; diff --git a/tools/src/librw11/Rw11VirtTermTcp.cpp b/tools/src/librw11/Rw11VirtTermTcp.cpp index e09aae67..81e86fe5 100644 --- a/tools/src/librw11/Rw11VirtTermTcp.cpp +++ b/tools/src/librw11/Rw11VirtTermTcp.cpp @@ -1,4 +1,4 @@ -// $Id: Rw11VirtTermTcp.cpp 1134 2019-04-21 17:18:03Z mueller $ +// $Id: Rw11VirtTermTcp.cpp 1150 2019-05-19 17:52:54Z mueller $ // // Copyright 2013-2019 by Walter F.J. Mueller // @@ -424,7 +424,7 @@ int Rw11VirtTermTcp::RcvPollHandler(const pollfd& pfd) if (irc <= 0) { if (irc < 0) { RlogMsg lmsg(LogFile(),'E'); - RerrMsg emsg("Rw11VirtTermTcp::ListenPollHandler", + RerrMsg emsg("Rw11VirtTermTcp::RcvPollHandler", string("read() for port ") + fChannelId + " failed: ", errno); lmsg << emsg;