github.com/wfjm.w11
1
0
Fork 0
mirror of https://github.com/wfjm/w11.git synced 2026-02-26 09:03:45 +00:00
Code Issues Releases Wiki Activity

comment&code cosmetics; minor changes

Browse Source
This commit is contained in:
wfjm
2018-10-14 14:57:39 +02:00
parent c7e606d9b0
commit 3eedd7f5c8
7 changed files with 21 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -49,7 +49,7 @@ before_script:
script:
- make -C tools/src
- make -C tools/src/testtclsh
- pushd tools/tcl && setup_packages && popd
- make all_tcl
- |
tbrun -nomake \
-tag default,memlib \

9
rtl/ibus/ibd_kw11p.vhd
View File

@@ -1,4 +1,4 @@
-- $Id: ibd_kw11p.vhd 1044 2018-09-15 11:12:07Z mueller $
-- $Id: ibd_kw11p.vhd 1056 2018-10-13 16:01:17Z mueller $
--
-- Copyright 2018- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
--
@@ -162,10 +162,10 @@ begin
ievt := '0';
n.evtext := EXTEVT; -- buffer
n.evt100k := '0'; -- one shot
n.evt10k := '0'; -- one shot
n.evtline := '0'; -- one shot
n.evtext := '0'; -- one shot
n.evtfix := '0'; -- one shot
n.evtload := '0'; -- one shot
@@ -244,11 +244,6 @@ begin
end if;
end if;
-- capture event
if EXTEVT='1' then
n.evtext := '1';
end if;
-- counter logic
-- select source
if r.run='1' then

14
rtl/w11a/pdp11_sys70.vhd
View File

@@ -1,4 +1,4 @@
-- $Id: pdp11_sys70.vhd 1055 2018-10-12 17:53:52Z mueller $
-- $Id: pdp11_sys70.vhd 1056 2018-10-13 16:01:17Z mueller $
--
-- Copyright 2015-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
--
@@ -35,7 +35,7 @@
--
-- Revision History:
-- Date Rev Version Comment
-- 2018-10-07 1054 1.3 drop ITIMER,DM_STAT_DP out ports, use DM_STAT_EXP
-- 2018-10-13 1055 1.3 drop ITIMER,DM_STAT_DP out ports, use DM_STAT_EXP
-- add PERFEXT in port
-- 2018-10-06 1053 1.2.3 drop DM_STAT_SY; add DM_STAT_CA; use _SE.pcload
-- 2018-09-29 1051 1.2.2 add pdp11_dmpcnt
@@ -299,7 +299,7 @@ begin
signal PERFSIG : slv32 := (others=>'0');
begin
proc_sig: process (CP_STAT_L, DM_STAT_SE, DM_STAT_DP, DM_STAT_DP.psw,
DM_STAT_CA, RB_MREQ, RB_SRES_L,
DM_STAT_CA, RB_MREQ, RB_SRES_L, EI_ACKM_L,
DM_STAT_VM.ibmreq, DM_STAT_VM.ibsres, PERFEXT)
variable isig : slv32 := (others=>'0');
begin
@@ -363,10 +363,10 @@ begin
isig(24) := PERFEXT(0); -- ext_rdrhit
isig(25) := PERFEXT(1); -- ext_wrrhit
isig(26) := PERFEXT(2); -- ext_wrflush
isig(27) := PERFEXT(3); -- ext_rlrdbusy
isig(28) := PERFEXT(4); -- ext_rlrdback
isig(29) := PERFEXT(5); -- ext_rlwrbusy
isig(30) := PERFEXT(6); -- ext_rlwrback
isig(27) := PERFEXT(3); -- ext_rlrxact
isig(28) := PERFEXT(4); -- ext_rlrxback
isig(29) := PERFEXT(5); -- ext_rltxact
isig(30) := PERFEXT(6); -- ext_rltxback
isig(31) := PERFEXT(7); -- ext_usec
PERFSIG <= isig;

5
tools/asm-11/lib/defs_mmu.mac
View File

@@ -1,5 +1,5 @@
; $Id: defs_mmu.mac 830 2016-12-26 20:25:49Z mueller $
; Copyright 2015- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
; $Id: defs_mmu.mac 1053 2018-10-06 20:34:52Z mueller $
; Copyright 2015-2018 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
; License disclaimer see License.txt in $RETROBASE directory
;
; definitions for mmu registers (as in defs_mmu.das)
@@ -11,7 +11,6 @@
;
uipdr = 177600 ; usr i page dsc base
udpdr = 177620 ; usr d page dsc base
udpdr = 177620 ; usr d page dsc base
uipar = 177640 ; usr i page addr base
udpar = 177660 ; usr d page addr base
sipdr = 172200 ; sup i page dsc base

5
tools/tbench/w11a_pcnt/test_pcnt_basics.tcl
View File

@@ -1,11 +1,12 @@
# $Id: test_pcnt_basics.tcl 1053 2018-10-06 20:34:52Z mueller $
# $Id: test_pcnt_basics.tcl 1054 2018-10-07 07:47:28Z mueller $
#
# Copyright 2018- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
# License disclaimer see License.txt in $RETROBASE directory
#
# Revision History:
# Date Rev Version Comment
# 2018-09-23 1050 1.0 Initial version
# 2018-10-06 1053 1.0 Initial version
# 2018-09-23 1050 0.1 First draft
#
# Test basic perf counter functionality

8
tools/tcl/rw11/dmpcnt.tcl
View File

@@ -1,4 +1,4 @@
# $Id: dmpcnt.tcl 1053 2018-10-06 20:34:52Z mueller $
# $Id: dmpcnt.tcl 1056 2018-10-13 16:01:17Z mueller $
#
# Copyright 2018- by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
#
@@ -13,7 +13,7 @@
#
# Revision History:
# Date Rev Version Comment
# 2018-10-06 1053 1.0 Initial version
# 2018-10-13 1055 1.0 Initial version
# 2018-09-23 1050 0.1 First draft
#
@@ -37,8 +37,8 @@ namespace eval rw11 {
ca_rdhit ca_wrhit ca_rdmem ca_wrmem \
ca_rdwait ca_wrwait ib_rd ib_wr \
ib_busy rb_rd rb_wr rb_busy \
ext_rdrhit ext_wrrhit ext_wrflush ext_rlrdbusy \
ext_rlrdback ext_rlwrbusy ext_rlwrback clock]
ext_rdrhit ext_wrrhit ext_wrflush ext_rlrxact \
ext_rlrxback ext_rltxact ext_rltxback ext_udec]
variable pcnt_cindex
set tmp_ind 0
foreach {nam} $pcnt_cnames {

4
tools/tcl/rw11/shell_egd.tcl
View File

@@ -1,4 +1,4 @@
# $Id: shell_egd.tcl 985 2018-01-03 08:59:40Z mueller $
# $Id: shell_egd.tcl 1056 2018-10-13 16:01:17Z mueller $
#
# Copyright 2015-2017 by Walter F.J. Mueller <W.F.J.Mueller@gsi.de>
#
@@ -448,7 +448,7 @@ namespace eval rw11 {
set nvals [llength $vals]
if {$nvals != $cnt} {
error "-E: expected $cnt write values, seen only $nvals"
error "-E: expected $cnt write values, seen $nvals"
}
switch $mode {