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 14563828..ccea9e2d 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 1039 2018-08-12 10:04:09Z mueller $ +-- $Id: sys_w11a_br_as7.vhd 1047 2018-09-16 11:08:41Z mueller $ -- -- Copyright 2018- by Walter F.J. Mueller -- @@ -37,6 +37,7 @@ -- -- Synthesized: -- Date Rev viv Target flop lutl lutm bram slic +-- 2018-09-15 1045 2017.2 xc7s50 2333 5156 138 67.5 1592 +KW11P -- 2018-08-11 1038 2018.2 xc7s50 2279 5369 138 67.5 1598 -- 2018-08-11 1038 2018.1 xc7s50 2279 5381 138 67.5 1597 -- 2018-08-11 1038 2017.4 xc7s50 2274 5137 138 67.5 1549 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 da45cd39..44ad41c9 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,6 +1,6 @@ --- $Id: sys_w11a_br_n4d.vhd 984 2018-01-02 20:56:27Z mueller $ +-- $Id: sys_w11a_br_n4d.vhd 1047 2018-09-16 11:08:41Z mueller $ -- --- Copyright 2017- by Walter F.J. Mueller +-- Copyright 2017-2018 by Walter F.J. Mueller -- -- This program is free software; you may redistribute and/or modify it under -- the terms of the GNU General Public License as published by the Free @@ -32,10 +32,11 @@ -- Test bench: tb/tb_sys_w11a_br_n4d -- -- Target Devices: generic --- Tool versions: viv 2016.2-2017.1; ghdl 0.34 +-- Tool versions: viv 2016.2-2018.2; ghdl 0.34 -- -- Synthesized: -- Date Rev viv Target flop lutl lutm bram slic +-- 2018-09-15 1045 2017.2 xc7a100t-1 2602 5490 138 131.5 1754 +KW11P -- 2017-05-25 898 2016.4 xc7a100t-1 2541 5500 138 131.5 1750 +DEUNA -- 2017-01-07 842 2016.4 xc7a100t-1 2491 5335 138 131.5 1728 -- diff --git a/rtl/vlib/rbus/rbd_usracc.vhd b/rtl/vlib/rbus/rbd_usracc.vhd index b1efbdd8..31a517d2 100644 --- a/rtl/vlib/rbus/rbd_usracc.vhd +++ b/rtl/vlib/rbus/rbd_usracc.vhd @@ -1,6 +1,6 @@ --- $Id: rbd_usracc.vhd 984 2018-01-02 20:56:27Z mueller $ +-- $Id: rbd_usracc.vhd 1044 2018-09-15 11:12:07Z mueller $ -- --- Copyright 2016- by Walter F.J. Mueller +-- Copyright 2016-2018 by Walter F.J. Mueller -- -- This program is free software; you may redistribute and/or modify it under -- the terms of the GNU General Public License as published by the Free @@ -19,7 +19,7 @@ -- Test bench: - -- -- Target Devices: generic --- Tool versions: viv 2015.4; ghdl 0.33 +-- Tool versions: viv 2015.4-2018.2; ghdl 0.33-0.34 -- -- Revision History: -- Date Rev Version Comment @@ -29,8 +29,8 @@ -- rbus registers: -- -- Addr Bits Name r/w/f Function --- 0 time r/-/- use_accress lsb --- 1 time r/-/- use_accress msb +-- 0 ua0 r/-/- use_accress lsb +-- 1 ua1 r/-/- use_accress msb -- library ieee; diff --git a/tools/src/librw11/Rw11Cpu.hpp b/tools/src/librw11/Rw11Cpu.hpp index c146c5fc..c669a2fb 100644 --- a/tools/src/librw11/Rw11Cpu.hpp +++ b/tools/src/librw11/Rw11Cpu.hpp @@ -1,4 +1,4 @@ -// $Id: Rw11Cpu.hpp 983 2018-01-02 20:35:59Z mueller $ +// $Id: Rw11Cpu.hpp 1044 2018-09-15 11:12:07Z mueller $ // // Copyright 2013-2017 by Walter F.J. Mueller // @@ -285,7 +285,7 @@ namespace Retro { uint16_t fHasHbpt; //!< has dmhbpt (hardware breakpoint) bool fHasIbmon; //!< has ibmon (ibus monitor) bool fHasKw11l; //!< has kw11-l (line clock) - bool fHasKw11p; //!< has kw11-l (prog clock) + bool fHasKw11p; //!< has kw11-p (prog clock) bool fHasIist; //!< has iist (smp comm) bool fCpuAct; uint16_t fCpuStat; diff --git a/tools/tbench/w11a_cmon/test_cmon_regs.tcl b/tools/tbench/w11a_cmon/test_cmon_regs.tcl index 51647694..870c9a58 100644 --- a/tools/tbench/w11a_cmon/test_cmon_regs.tcl +++ b/tools/tbench/w11a_cmon/test_cmon_regs.tcl @@ -1,4 +1,4 @@ -# $Id: test_cmon_regs.tcl 885 2017-04-23 15:54:01Z mueller $ +# $Id: test_cmon_regs.tcl 1044 2018-09-15 11:12:07Z mueller $ # # Copyright 2015-2017 by Walter F.J. Mueller # License disclaimer see License.txt in $RETROBASE directory @@ -22,7 +22,7 @@ if {[$cpu get hascmon] == 0} { rlc log " A basic register access tests -----------------------------" rlc log " A1: write/read cntl---------------------------------" -# test that starting caputes option flags, and that stoping keeps them +# test that starting captures option flags, and that stoping keeps them $cpu cp \ -wreg cm.cntl [regbld rw11::CM_CNTL {func "STA"}] \ -rreg cm.cntl -edata [regbld rw11::CM_CNTL] \ diff --git a/tools/tcl/rbmoni/test_regs.tcl b/tools/tcl/rbmoni/test_regs.tcl index 4c661d5d..b0de068d 100644 --- a/tools/tcl/rbmoni/test_regs.tcl +++ b/tools/tcl/rbmoni/test_regs.tcl @@ -1,4 +1,4 @@ -# $Id: test_regs.tcl 985 2018-01-03 08:59:40Z mueller $ +# $Id: test_regs.tcl 1044 2018-09-15 11:12:07Z mueller $ # # Copyright 2011-2017 by Walter F.J. Mueller # @@ -41,7 +41,7 @@ namespace eval rbmoni { #------------------------------------------------------------------------- rlc log " A basic register access tests -----------------------------" rlc log " A1: write/read cntl---------------------------------" - # test that starting caputes option flags, and that stoping keeps them + # test that starting captures option flags, and that stoping keeps them rlc exec \ -wreg rm.cntl [regbld rbmoni::CNTL {func "STA"}] \ -rreg rm.cntl -edata [regbld rbmoni::CNTL] \ diff --git a/tools/tcl/rw11/util.tcl b/tools/tcl/rw11/util.tcl index a4356feb..72521212 100644 --- a/tools/tcl/rw11/util.tcl +++ b/tools/tcl/rw11/util.tcl @@ -1,4 +1,4 @@ -# $Id: util.tcl 985 2018-01-03 08:59:40Z mueller $ +# $Id: util.tcl 1044 2018-09-15 11:12:07Z mueller $ # # Copyright 2013-2017 by Walter F.J. Mueller # @@ -13,7 +13,7 @@ # # Revision History: # Date Rev Version Comment -# 2017-04-22 83 1.3.8 move in imap_reg2addr; add imap_range2addr +# 2017-04-22 883 1.3.8 move in imap_reg2addr; add imap_range2addr # 2017-02-04 848 1.3.7 add DEUNA; setup_cntl: handle not found devices # 2015-12-30 721 1.3.6 BUGFIX: setup_ostr: adopt to use args2opts # 2015-07-25 704 1.3.5 use args2opts