github.com/wfjm.w11
1
0
Fork 0
mirror of https://github.com/wfjm/w11.git synced 2026-04-25 20:01:57 +00:00
Code Issues Releases Wiki Activity

comment&code cosmetics; minor changes

Browse Source
This commit is contained in:
wfjm
2018-12-08 09:25:25 +01:00
parent 5d34d1fad6
commit 233730885d
12 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
doc/w11a_os_guide.md
View File

@@ -115,7 +115,7 @@ All examples below use the same basic setup
SWI = 0110 (gives console light emulation...)
ti_w11 -tuD,12M,break,xon @<oskit-name>_boot.tcl
**Note**: the arty w11a has currently only 176 kB memory (all from BRAMS!)
**Note**: the arty w11a has currently only 176 kB memory (all from BRAMS!).
u5ed works fine. XXDP, RT11 and RSX-11M should work.
211bsd will not boot, neither most RSX-11M+ systems.
@@ -125,7 +125,7 @@ All examples below use the same basic setup
ti_w11 -tuD,12M,break,xon @<oskit-name>_boot.tcl
**Note**: the basys3 w11a has only 176 kB memory (all from BRAMS!)
**Note**: the basys3 w11a has only 176 kB memory (all from BRAMS!).
u5ed works fine. XXDP, RT11 and RSX-11M should work.
211bsd will not boot, neither most RSX-11M+ systems.
@@ -133,7 +133,8 @@ All examples below use the same basic setup
ti_w11 -tuD,12M,break,xon @<oskit-name>_boot.tcl
**Note**: the c7 w11a has currently only 672 kB memory (512 SRAM + 160 BRAM)
**Note**: the c7 w11a has currently only 672 kB memory
(512 SRAM + 160 BRAM).
u5ed, u7ed, XXDP, RT11, RSX-11M and most most RSX-11M+ systems should work.
211bsd works only in the 'non-networking' configuration
[211bsd_rpmin](../tools/oskit/211bsd_rpmin)

4
rtl/ibus/ibd_iist.vhd
View File

@@ -1,4 +1,4 @@
-- $Id: ibd_iist.vhd 984 2018-01-02 20:56:27Z mueller $
-- $Id: ibd_iist.vhd 1073 2018-11-23 18:05:51Z mueller $
--
-- Copyright 2009-2016 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
--
@@ -240,7 +240,7 @@ begin
end if;
end process proc_regs;
proc_next : process (R_REGS, CE_USEC, IB_MREQ, EI_ACK, EI_ACK,
proc_next : process (R_REGS, CE_USEC, IB_MREQ,
IIST_BUS(0), IIST_BUS(1), IIST_BUS(2), IIST_BUS(3),
IIST_SRES)
variable r : regs_type := regs_init;

4
rtl/ibus/ibdr_deuna.vhd
View File

@@ -1,4 +1,4 @@
-- $Id: ibdr_deuna.vhd 984 2018-01-02 20:56:27Z mueller $
-- $Id: ibdr_deuna.vhd 1073 2018-11-23 18:05:51Z mueller $
--
-- Copyright 2014-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
--
@@ -151,7 +151,7 @@ begin
end if;
end process proc_regs;
proc_next : process (R_REGS, IB_MREQ, EI_ACK, BRESET)
proc_next : process (R_REGS, IB_MREQ, BRESET)
variable r : regs_type := regs_init;
variable n : regs_type := regs_init;
variable ibhold : slbit := '0';

4
rtl/ibus/ibdr_rl11.vhd
View File

@@ -1,4 +1,4 @@
-- $Id: ibdr_rl11.vhd 984 2018-01-02 20:56:27Z mueller $
-- $Id: ibdr_rl11.vhd 1073 2018-11-23 18:05:51Z mueller $
--
-- Copyright 2014-2016 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
--
@@ -282,7 +282,7 @@ begin
end if;
end process proc_regs;
proc_next : process (R_REGS, CE_MSEC, IB_MREQ, MEM_DOUT, EI_ACK)
proc_next : process (R_REGS, IB_MREQ, MEM_DOUT, EI_ACK)
variable r : regs_type := regs_init;
variable n : regs_type := regs_init;
variable ibhold : slbit := '0';

4
rtl/sys_gen/tst_sram/cmoda7/tb/sys_conf_sim.vhd
View File

@@ -1,4 +1,4 @@
-- $Id: sys_conf_sim.vhd 984 2018-01-02 20:56:27Z mueller $
-- $Id: sys_conf_sim.vhd 1071 2018-11-17 20:53:26Z mueller $
--
-- Copyright 2017- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
--
@@ -19,7 +19,7 @@
-- Tool versions: viv 2017.1; ghdl 0.34
-- Revision History:
-- Date Rev Version Comment
-- 2013-09-21 534 1.0 Initial version
-- 2017-06-11 912 1.0 Initial version
------------------------------------------------------------------------------
library ieee;

4
tools/man/man1/tbrun_tbwrri.1
View File

@@ -1,5 +1,5 @@
.\" -*- nroff -*-
.\" $Id: tbrun_tbwrri.1 845 2017-01-15 14:58:27Z mueller $
.\" $Id: tbrun_tbwrri.1 1074 2018-11-25 21:38:59Z mueller $
.\"
.\" Copyright 2016- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
.\"
@@ -128,7 +128,7 @@ Done in UUT, thus useful only for behavioral simulations.
add additional \fItime\fR ns startup waiting time for behavioral models.
.
.\" -- --swait -----------------------------------
.IP \fB\-\-bwait\fR\ \fItime\fR
.IP \fB\-\-swait\fR\ \fItime\fR
add additional \fItime\fR ns startup waiting time for post-synthesis and
later models.

4
tools/man/man1/vbomconv.1
View File

@@ -1,5 +1,5 @@
.\" -*- nroff -*-
.\" $Id: vbomconv.1 1066 2018-11-10 11:21:53Z mueller $
.\" $Id: vbomconv.1 1076 2018-12-02 12:45:49Z mueller $
.\"
.\" Copyright 2010-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
.\"
@@ -209,7 +209,7 @@ The first definition seen in the \fIvbom\fP
traversal is taken, all others are ignored. The filename in the usage clause
is the default used in case the logical name wasn't defined.
Last but not least are 4 directives defined in the \fBvbom\fP
Last but not least are 5 directives defined in the \fBvbom\fP
file format:
.
.IP "\fB@top\fP:\fIname\fP"

7
tools/src/librlink/RlinkPortFifo.cpp
View File

@@ -1,4 +1,4 @@
// $Id: RlinkPortFifo.cpp 1063 2018-10-29 18:37:42Z mueller $
// $Id: RlinkPortFifo.cpp 1075 2018-12-01 11:55:07Z mueller $
//
// Copyright 2011-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -92,10 +92,7 @@ bool RlinkPortFifo::Open(const std::string& url, RerrMsg& emsg)
int RlinkPortFifo::OpenFifo(const std::string& name, bool snd, RerrMsg& emsg)
{
struct stat stat_fifo;
int irc;
irc = ::stat(name.c_str(), &stat_fifo);
int irc = ::stat(name.c_str(), &stat_fifo);
if (irc == 0) {
if ((stat_fifo.st_mode & S_IFIFO) == 0) {
emsg.Init("RlinkPortFifo::OpenFiFo()",

10
tools/src/librlink/RlinkServer.cpp
View File

@@ -1,4 +1,4 @@
// $Id: RlinkServer.cpp 1059 2018-10-27 10:34:16Z mueller $
// $Id: RlinkServer.cpp 1075 2018-12-01 11:55:07Z mueller $
//
// Copyright 2013-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -13,10 +13,10 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-10-27 1059 1.2.3 coverity fixup (uncaught exception in dtor)
// 2017-04-07 868 1.2.2 Dump(): add detail arg
// 2015-06-05 686 1.2.1 BUGFIX: CallAttnHandler(): fix race in hnext
// 2015-04-04 662 1.2 BUGFIX: fix race in Stop(), use UnStop()
// 2018-10-27 1059 2.2.4 coverity fixup (uncaught exception in dtor)
// 2017-04-07 868 2.2.3 Dump(): add detail arg
// 2015-06-05 686 2.2.2 BUGFIX: CallAttnHandler(): fix race in hnext
// 2015-04-04 662 2.2.1 BUGFIX: fix race in Stop(), use UnStop()
// 2015-01-10 632 2.2 Exec() without emsg now void, will throw
// 2014-12-30 625 2.1 adopt to Rlink V4 attn logic
// 2014-12-21 617 2.0.1 use kStat_M_RbTout for rbus timeout

5
tools/src/librtcltools/RtclContext.cpp
View File

@@ -1,4 +1,4 @@
// $Id: RtclContext.cpp 1070 2018-11-17 09:48:04Z mueller $
// $Id: RtclContext.cpp 1076 2018-12-02 12:45:49Z mueller $
//
// Copyright 2011-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -13,6 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2018-12-02 1076 1.0.6 use nullptr
// 2018-11-16 1070 1.0.5 use auto; use emplace,make_pair; use range loop
// 2017-02-04 866 1.0.4 rename fMapContext -> fContextMap
// 2013-02-03 481 1.0.3 use Rexception
@@ -148,7 +149,7 @@ RtclProxyBase* RtclContext::FindProxy(const std::string& type,
if (name == cmdname) return po;
}
}
return 0;
return nullptr;
}
//------------------------------------------+-----------------------------------

14
tools/src/librutiltpp/RtclBvi.cpp
View File

@@ -1,4 +1,4 @@
// $Id: RtclBvi.cpp 983 2018-01-02 20:35:59Z mueller $
// $Id: RtclBvi.cpp 1076 2018-12-02 12:45:49Z mueller $
//
// Copyright 2011-2014 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
//
@@ -13,7 +13,7 @@
//
// Revision History:
// Date Rev Version Comment
// 2014-08-22 584 1.0.2 use nullptr
// 2018-12-02 1076 1.0.2 use nullptr
// 2011-11-28 434 1.0.1 DoCmd(): use intptr_t cast for lp64 compatibility
// 2011-03-27 374 1.0 Initial version
// 2011-02-13 361 0.1 First draft
@@ -121,7 +121,7 @@ Tcl_Obj* RtclBvi::DoConv(Tcl_Interp* interp, ConvMode mode, Tcl_Obj* val,
if (strchr("bBoOdDxX", pval[0]) == 0) {
Tcl_AppendResult(interp, "-E: bad prefix in c'dddd' format string",
nullptr);
return 0;
return nullptr;
}
form = pval[0];
pval += 2;
@@ -154,20 +154,20 @@ Tcl_Obj* RtclBvi::DoConv(Tcl_Interp* interp, ConvMode mode, Tcl_Obj* val,
if (eptr != pval+lval) {
Tcl_AppendResult(interp, "-E: conversion error in '",
Tcl_GetString(val), "'", nullptr);
return 0;
return nullptr;
}
if (lres > (1ul<<nbit)-1) {
Tcl_AppendResult(interp, "-E: too many bits defined in '",
Tcl_GetString(val), "'", nullptr);
return 0;
return nullptr;
}
return Tcl_NewIntObj((int)lres);
} else if (mode == kInt2Str) {
int val_int;
if (Tcl_GetIntFromObj(interp, val, &val_int) != kOK) return 0;
if (Tcl_GetIntFromObj(interp, val, &val_int) != kOK) return nullptr;
int val_uint = (unsigned int) val_int;
int nwidth = 1;
@@ -199,7 +199,7 @@ Tcl_Obj* RtclBvi::DoConv(Tcl_Interp* interp, ConvMode mode, Tcl_Obj* val,
Tcl_AppendResult(interp, "-E: BUG! bad cdata in RtclBvi::DoConv() call",
nullptr);
}
return 0;
return nullptr;
}
//------------------------------------------+-----------------------------------

4
tools/tbench/w11a/test_w11a_mem70.tcl
View File

@@ -1,4 +1,4 @@
# $Id: test_w11a_mem70.tcl 916 2017-06-25 13:30:07Z mueller $
# $Id: test_w11a_mem70.tcl 1069 2018-11-16 17:11:30Z mueller $
#
# Copyright 2017- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
# License disclaimer see License.txt in $RETROBASE directory
@@ -112,7 +112,7 @@ $cpu cp -wal cntrl \
# --------------------------------------------------------------------
rlc log " Test 4: test full memory (touch (4-7)*2 sections of 16 words"
# determine memory size in 2^n steps; chunck size is 1/4
# determine memory size in 2^n steps; chunk size is 1/4
set msize2 [expr {2*1024*1024}]
while {$msize < $msize2} {
set msize2 [expr {$msize2 >> 1}]