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

BUGFIX: bootw11.mac proper unit number; editorial changes [skip ci]

Browse Source
This commit is contained in:
wfjm
2022-05-15 17:16:35 +02:00
parent 9e027ba61c
commit 33e725c0be
9 changed files with 46 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/CHANGELOG-w11a_V0.60-w11a_V0.70.md
View File

@@ -300,7 +300,8 @@
is far superior to ISE. But tests with the first versions were sobering,
the w11a design either didn't compile at all, or produced faulty synthesis
results. In 2014 Vivado matured, and the current version 2014.4 works
fine with the w11a code base.
fine with the w11a code base (see
[blog](https://wfjm.github.io/blogs/w11/2015-02-01-vivado-and-nexys4.html)).
- The original Nexys4 board allowed to quickly port Nexys3 version because
both have the same memory chip. The newer Nexys4 DDR will be addressed
later.

2
doc/CHANGELOG.md
View File

@@ -39,6 +39,8 @@ The full set of tests is only run for tagged releases.
- w11_(cpp|vhd_all).Doxyfile: for Doxygen V1.9.4
- w11_tcl.Doxyfile: removed, Tcl support removed in Doxygen V1.8.18
### Bug Fixes
- tools/mcode
- m9312/bootw11.mac: proper init of unit number in getnam
<!-- --------------------------------------------------------------------- -->
---

8
doc/README_buildsystem_ISE.md
View File

@@ -236,9 +236,11 @@ the FPGA. For detailed documentation see the respective man pages.
### <a id="artix">Note on Artix-7 based designs</a>
The development for Nexys4 started in 2013 with ISE but moved to Vivado when
it matured 2014. The make files for the ISE build flows have been kept for
comparison are have the name `Makefile.ise`. So for some Nexys4 designs one
can still start with a
it matured 2014 (see
[blog](https://wfjm.github.io/blogs/w11/2015-02-01-vivado-and-nexys4.html)).
The make files for the ISE build flows have been kept for comparison are have
the name `Makefile.ise`.
So for some Nexys4 designs one can still start with a
make -f Makefile.ise <target>
or

8
doc/README_buildsystem_Vivado.md
View File

@@ -274,9 +274,11 @@ only one board must connected.
### <a id="ise">Note on ISE</a>
The development for Nexys4 started in 2013 with ISE but moved to Vivado when
it matured in 2014. The make files for the ISE build flows have been kept for
comparison are have the name `Makefile.ise`. So for some Nexys4 designs one
can still start with a
it matured in 2014 (see
[blog](https://wfjm.github.io/blogs/w11/2015-02-01-vivado-and-nexys4.html)).
The make files for the ISE build flows have been kept for comparison are have
the name `Makefile.ise`.
So for some Nexys4 designs one can still start with a
make -f Makefile.ise <target>
or

2
tools/man/man1/tbw.1
View File

@@ -70,7 +70,7 @@ defined via the \fItbw.dat\fP file, for details see section FILES.
.\" ------------------------------------------------------------------
.SH OPTIONS
The options \fB\-fifo\fP, \fB\-verbose\fP, and \fB\-norun\fP are processed
by tbw itself. They must be the first options after \fITBPROG\fP.
by \fBtbw\fP itself. They must be the first options after \fITBPROG\fP.
.IP \fB\-fifo\fR
Forces usage of rlink_cext fifo in case no \fItbw.dat\fP is found or no section
matching \fITBPROG\fP is found in tbw.dat.

13
tools/mcode/m9312/bootw11.mac
View File

@@ -1,12 +1,16 @@
; $Id: bootw11.mac 1174 2019-06-29 18:00:47Z mueller $
; $Id: bootw11.mac 1237 2022-05-15 07:51:47Z mueller $
; SPDX-License-Identifier: GPL-3.0-or-later
; Copyright 2019- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
; Copyright 2019-2022 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
;
; Revision History:
; Date Rev Version Comment
; 2022-05-14 1237 1.0.1 BUGFIX: proper init of unit number in getnam
; 2019-05-01 1143 1.0 Initial version
; 2019-04-19 1133 0.1 First draft
;
; current ROM usage
; low 165000 to 165770 --> 503 bytes base + RK11 + RL11 + RH70
; high 173000 to 173312 --> 202 bytes TM11 + PC11
;
; definitions ----------------------------------------------
;
@@ -39,12 +43,15 @@ start: spl 7
nxtpro: jsr pc,prtstr
;
; read boot device name and unit
; out r2 device name
; out r3 unit number
;
getnam: jsr pc,getlet ; get 1st char
mov r0,r2 ; move into low byte
jsr pc,getlet ; get 2nd char
swab r0
bis r0,r2 ; move into high byte
clr r3 ; default unit is 0
jsr pc,getchr ; get unit number or <CR>
cmp #CR,r0 ; is <CR> ?
beq fnddev ; if eq yes, done
@@ -279,7 +286,7 @@ boottm: mov #tm.cr,r1 ; load csr
4$: jmp bootgo
;
; PC11 boot loader +++++++++++++++++++++++++++++++++++++++++
; RL boot loader code adapted pc11boot.mac
; PC boot loader code adapted pc11boot.mac
;
.include |lib/defs_pc.mac|
;

10
tools/mcode/sys/blink.mac
View File

@@ -1,6 +1,6 @@
; $Id: blink.mac 1174 2019-06-29 18:00:47Z mueller $
; $Id: blink.mac 1237 2022-05-15 07:51:47Z mueller $
; SPDX-License-Identifier: GPL-3.0-or-later
; Copyright 2019- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
; Copyright 2019-2022 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
;
; Revision History:
; Date Rev Version Comment
@@ -16,9 +16,9 @@
; R random pattern
; other controls
; 0 use default speed
; 1-9 set update speed
; a auto, cycle styles ! to come !
; s surprise, random styles ! to come !
; 1-9 set update speed (1 fastest, 9 slowest)
; a auto, cycle styles
; s surprise, random styles
;
; definitions ----------------------------------------------
;

8
tools/oskit/xxdp_rl/README_license.md
View File

@@ -1,9 +1,9 @@
Unlike most other PDP-11 software `xxdp` was not sold to Mentec.
By now, ownership of xxdp software is in the hands of HP.
By now, ownership of `xxdp` software is in the hands of HP.
PDP-11 customers were not required to sign a license agreement for `xxdp`,
the software was provided with the system or brought to the customer site
the software was provided with the system or brought to the customer site
by a Field Service representative.
Bottom line is that there is certainly a copyright on the `xxdp` software,
but it seems that there is no license restricting the usage.
Bottom line is that there is certainly copyright on the `xxdp` software,
but it appears that there is no license restricting its use.

15
tools/tcl/exptest/util.tcl
View File

@@ -1,9 +1,10 @@
# $Id: util.tcl 1209 2021-08-22 13:17:33Z mueller $
# $Id: util.tcl 1237 2022-05-15 07:51:47Z mueller $
# SPDX-License-Identifier: GPL-3.0-or-later
# Copyright 2019- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
# Copyright 2019-2022 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
#
# Revision History:
# Date Rev Version Comment
# 2022-05-09 1236 1.1.1 in --help text: use sys_w11a_n4d instead of _n4
# 2019-08-04 1200 1.1 add proc et_tstline{0,1}; add et_exp el sub command
# 2019-07-20 1196 1.0.1 et_tenv_cleanup: use test namespaces
# 2019-06-29 1174 1.0 Initial version
@@ -194,7 +195,7 @@ proc et_help {} {
puts "usage: $::genv(cmd) \[OPTION\]... \[TEST\]..."
puts {}
puts {Options:}
puts { --sys=SNAME system name, e.g. sys_w11a_n4. Default is taken from}
puts { --sys=SNAME system name, e.g. sys_w11a_n4d. Default is taken from}
puts { $EXPTEST_SYS environment variable}
puts { --mode=MODE currently 'rri' the only option}
puts { --log[=FNAM] log session to file FNAM}
@@ -284,6 +285,14 @@ proc et_close {id} {
#
# --------------------------------------------------------------------
# process list of cmd val pairs with commands
# i val set spawn_id to <val>
# t val set timeout to <val> seconds for following expects in et_exp chain
# s val send string <val>
# e val expect <val> as Tcl regexp match; if <val>=="eof" expect 'eof'
# el val expect <val> as exact string; if <val>=="eof" an 'eof' is expected
# ctn val n=[0-9]: set ::tenv(c_<val>) to the n'th match of last 'e' pattern
# cgn val n=[0-9]: set ::genv(c_<val>) to the n'th match of last 'e' pattern
#
proc et_exp {args} {
set ::timeout 10.