diff --git a/rtl/bplib/bpgen/Makefile b/rtl/bplib/bpgen/Makefile index 3c6d35a6..be73da84 100644 --- a/rtl/bplib/bpgen/Makefile +++ b/rtl/bplib/bpgen/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 749 2016-03-20 22:09:03Z mueller $ +# $Id: Makefile 1067 2018-11-11 08:30:29Z mueller $ # # Revision History: # Date Rev Version Comment @@ -13,7 +13,7 @@ ifndef XTW_BOARD endif include ${RETROBASE}/rtl/make_viv/viv_default_$(XTW_BOARD).mk # -.PHONY : catch all +.PHONY : catch all clean # catch : @echo "no default target defined, use" diff --git a/rtl/bplib/cmoda7/Makefile b/rtl/bplib/cmoda7/Makefile index 469a18bd..6b59031c 100644 --- a/rtl/bplib/cmoda7/Makefile +++ b/rtl/bplib/cmoda7/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 920 2017-07-02 08:54:54Z mueller $ +# $Id: Makefile 1067 2018-11-11 08:30:29Z mueller $ # # Revision History: # Date Rev Version Comment @@ -13,7 +13,7 @@ ifndef XTW_BOARD endif include ${RETROBASE}/rtl/make_viv/viv_default_$(XTW_BOARD).mk # -.PHONY : catch all +.PHONY : catch all clean # catch : @echo "no default target defined, use" diff --git a/rtl/bplib/nxcramlib/Makefile b/rtl/bplib/nxcramlib/Makefile index 8a3f16c1..45dbdf30 100644 --- a/rtl/bplib/nxcramlib/Makefile +++ b/rtl/bplib/nxcramlib/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 761 2016-04-17 08:53:48Z mueller $ +# $Id: Makefile 1067 2018-11-11 08:30:29Z mueller $ # # Revision History: # Date Rev Version Comment @@ -13,7 +13,7 @@ ifndef XTW_BOARD endif include ${RETROBASE}/rtl/make_viv/viv_default_$(XTW_BOARD).mk # -.PHONY : catch all +.PHONY : catch all clean # catch : @echo "no default target defined, use" diff --git a/rtl/bplib/sysmon/Makefile b/rtl/bplib/sysmon/Makefile index 8a3f16c1..45dbdf30 100644 --- a/rtl/bplib/sysmon/Makefile +++ b/rtl/bplib/sysmon/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 761 2016-04-17 08:53:48Z mueller $ +# $Id: Makefile 1067 2018-11-11 08:30:29Z mueller $ # # Revision History: # Date Rev Version Comment @@ -13,7 +13,7 @@ ifndef XTW_BOARD endif include ${RETROBASE}/rtl/make_viv/viv_default_$(XTW_BOARD).mk # -.PHONY : catch all +.PHONY : catch all clean # catch : @echo "no default target defined, use" diff --git a/rtl/ibus/Makefile b/rtl/ibus/Makefile index 3c6d35a6..be73da84 100644 --- a/rtl/ibus/Makefile +++ b/rtl/ibus/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 749 2016-03-20 22:09:03Z mueller $ +# $Id: Makefile 1067 2018-11-11 08:30:29Z mueller $ # # Revision History: # Date Rev Version Comment @@ -13,7 +13,7 @@ ifndef XTW_BOARD endif include ${RETROBASE}/rtl/make_viv/viv_default_$(XTW_BOARD).mk # -.PHONY : catch all +.PHONY : catch all clean # catch : @echo "no default target defined, use" diff --git a/rtl/sys_gen/tst_rlink/Makefile b/rtl/sys_gen/tst_rlink/Makefile index 3c6d35a6..be73da84 100644 --- a/rtl/sys_gen/tst_rlink/Makefile +++ b/rtl/sys_gen/tst_rlink/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 749 2016-03-20 22:09:03Z mueller $ +# $Id: Makefile 1067 2018-11-11 08:30:29Z mueller $ # # Revision History: # Date Rev Version Comment @@ -13,7 +13,7 @@ ifndef XTW_BOARD endif include ${RETROBASE}/rtl/make_viv/viv_default_$(XTW_BOARD).mk # -.PHONY : catch all +.PHONY : catch all clean # catch : @echo "no default target defined, use" diff --git a/rtl/sys_gen/tst_snhumanio/Makefile b/rtl/sys_gen/tst_snhumanio/Makefile index 3c6d35a6..be73da84 100644 --- a/rtl/sys_gen/tst_snhumanio/Makefile +++ b/rtl/sys_gen/tst_snhumanio/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 749 2016-03-20 22:09:03Z mueller $ +# $Id: Makefile 1067 2018-11-11 08:30:29Z mueller $ # # Revision History: # Date Rev Version Comment @@ -13,7 +13,7 @@ ifndef XTW_BOARD endif include ${RETROBASE}/rtl/make_viv/viv_default_$(XTW_BOARD).mk # -.PHONY : catch all +.PHONY : catch all clean # catch : @echo "no default target defined, use" diff --git a/rtl/vlib/cdclib/Makefile b/rtl/vlib/cdclib/Makefile index beac4c4c..fa06fc1a 100644 --- a/rtl/vlib/cdclib/Makefile +++ b/rtl/vlib/cdclib/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 757 2016-04-02 11:19:06Z mueller $ +# $Id: Makefile 1067 2018-11-11 08:30:29Z mueller $ # # Revision History: # Date Rev Version Comment @@ -13,7 +13,7 @@ ifndef XTW_BOARD endif include ${RETROBASE}/rtl/make_viv/viv_default_$(XTW_BOARD).mk # -.PHONY : catch all +.PHONY : catch all clean # catch : @echo "no default target defined, use" diff --git a/rtl/vlib/comlib/Makefile b/rtl/vlib/comlib/Makefile index 3c6d35a6..be73da84 100644 --- a/rtl/vlib/comlib/Makefile +++ b/rtl/vlib/comlib/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 749 2016-03-20 22:09:03Z mueller $ +# $Id: Makefile 1067 2018-11-11 08:30:29Z mueller $ # # Revision History: # Date Rev Version Comment @@ -13,7 +13,7 @@ ifndef XTW_BOARD endif include ${RETROBASE}/rtl/make_viv/viv_default_$(XTW_BOARD).mk # -.PHONY : catch all +.PHONY : catch all clean # catch : @echo "no default target defined, use" diff --git a/rtl/vlib/genlib/Makefile b/rtl/vlib/genlib/Makefile index 3c6d35a6..be73da84 100644 --- a/rtl/vlib/genlib/Makefile +++ b/rtl/vlib/genlib/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 749 2016-03-20 22:09:03Z mueller $ +# $Id: Makefile 1067 2018-11-11 08:30:29Z mueller $ # # Revision History: # Date Rev Version Comment @@ -13,7 +13,7 @@ ifndef XTW_BOARD endif include ${RETROBASE}/rtl/make_viv/viv_default_$(XTW_BOARD).mk # -.PHONY : catch all +.PHONY : catch all clean # catch : @echo "no default target defined, use" diff --git a/rtl/vlib/memlib/Makefile b/rtl/vlib/memlib/Makefile index 3c6d35a6..be73da84 100644 --- a/rtl/vlib/memlib/Makefile +++ b/rtl/vlib/memlib/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 749 2016-03-20 22:09:03Z mueller $ +# $Id: Makefile 1067 2018-11-11 08:30:29Z mueller $ # # Revision History: # Date Rev Version Comment @@ -13,7 +13,7 @@ ifndef XTW_BOARD endif include ${RETROBASE}/rtl/make_viv/viv_default_$(XTW_BOARD).mk # -.PHONY : catch all +.PHONY : catch all clean # catch : @echo "no default target defined, use" diff --git a/rtl/vlib/rbus/Makefile b/rtl/vlib/rbus/Makefile index 3c6d35a6..be73da84 100644 --- a/rtl/vlib/rbus/Makefile +++ b/rtl/vlib/rbus/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 749 2016-03-20 22:09:03Z mueller $ +# $Id: Makefile 1067 2018-11-11 08:30:29Z mueller $ # # Revision History: # Date Rev Version Comment @@ -13,7 +13,7 @@ ifndef XTW_BOARD endif include ${RETROBASE}/rtl/make_viv/viv_default_$(XTW_BOARD).mk # -.PHONY : catch all +.PHONY : catch all clean # catch : @echo "no default target defined, use" diff --git a/rtl/vlib/rlink/Makefile b/rtl/vlib/rlink/Makefile index 3c6d35a6..be73da84 100644 --- a/rtl/vlib/rlink/Makefile +++ b/rtl/vlib/rlink/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 749 2016-03-20 22:09:03Z mueller $ +# $Id: Makefile 1067 2018-11-11 08:30:29Z mueller $ # # Revision History: # Date Rev Version Comment @@ -13,7 +13,7 @@ ifndef XTW_BOARD endif include ${RETROBASE}/rtl/make_viv/viv_default_$(XTW_BOARD).mk # -.PHONY : catch all +.PHONY : catch all clean # catch : @echo "no default target defined, use" diff --git a/rtl/vlib/serport/Makefile b/rtl/vlib/serport/Makefile index 3c6d35a6..be73da84 100644 --- a/rtl/vlib/serport/Makefile +++ b/rtl/vlib/serport/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 749 2016-03-20 22:09:03Z mueller $ +# $Id: Makefile 1067 2018-11-11 08:30:29Z mueller $ # # Revision History: # Date Rev Version Comment @@ -13,7 +13,7 @@ ifndef XTW_BOARD endif include ${RETROBASE}/rtl/make_viv/viv_default_$(XTW_BOARD).mk # -.PHONY : catch all +.PHONY : catch all clean # catch : @echo "no default target defined, use" diff --git a/rtl/vlib/xlib/Makefile b/rtl/vlib/xlib/Makefile index 3c6d35a6..be73da84 100644 --- a/rtl/vlib/xlib/Makefile +++ b/rtl/vlib/xlib/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 749 2016-03-20 22:09:03Z mueller $ +# $Id: Makefile 1067 2018-11-11 08:30:29Z mueller $ # # Revision History: # Date Rev Version Comment @@ -13,7 +13,7 @@ ifndef XTW_BOARD endif include ${RETROBASE}/rtl/make_viv/viv_default_$(XTW_BOARD).mk # -.PHONY : catch all +.PHONY : catch all clean # catch : @echo "no default target defined, use" diff --git a/rtl/w11a/Makefile b/rtl/w11a/Makefile index 3c6d35a6..be73da84 100644 --- a/rtl/w11a/Makefile +++ b/rtl/w11a/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile 749 2016-03-20 22:09:03Z mueller $ +# $Id: Makefile 1067 2018-11-11 08:30:29Z mueller $ # # Revision History: # Date Rev Version Comment @@ -13,7 +13,7 @@ ifndef XTW_BOARD endif include ${RETROBASE}/rtl/make_viv/viv_default_$(XTW_BOARD).mk # -.PHONY : catch all +.PHONY : catch all clean # catch : @echo "no default target defined, use" diff --git a/rtl/w11a/pdp11_bram_memctl.vhd b/rtl/w11a/pdp11_bram_memctl.vhd index 8ac8b62e..9467ea9d 100644 --- a/rtl/w11a/pdp11_bram_memctl.vhd +++ b/rtl/w11a/pdp11_bram_memctl.vhd @@ -1,4 +1,4 @@ --- $Id: pdp11_bram_memctl.vhd 984 2018-01-02 20:56:27Z mueller $ +-- $Id: pdp11_bram_memctl.vhd 1067 2018-11-11 08:30:29Z mueller $ -- -- Copyright 2015-2016 by Walter F.J. Mueller -- @@ -15,7 +15,7 @@ -- Module Name: pdp11_bram_memctl - syn -- Description: pdp11: BRAM based memctl -- --- Dependencies: - +-- Dependencies: ram_1swsr_wfirst_gen -- Test bench: - -- Target Devices: 7-Series -- Tool versions: ise 14.7; viv 2014.4-2016.1; ghdl 0.31-0.33 diff --git a/tools/asm-11/tests-err/Makefile b/tools/asm-11/tests-err/Makefile index c143c4ed..54135543 100644 --- a/tools/asm-11/tests-err/Makefile +++ b/tools/asm-11/tests-err/Makefile @@ -1,11 +1,12 @@ -# $Id: Makefile 733 2016-02-20 12:24:13Z mueller $ +# $Id: Makefile 1065 2018-11-04 11:32:06Z mueller $ # # Revision History: # Date Rev Version Comment +# 2018-11-03 1065 1.1 sort file list # 2013-03-22 496 1.0 Initial version #--- # -MAC_all = $(wildcard *.mac) +MAC_all = $(sort $(wildcard *.mac)) LSTERR_all = $(MAC_all:.mac=.lsterr) LDART_all = $(MAC_all:.mac=.ldart) LSTRT_all = $(MAC_all:.mac=.lstrt) diff --git a/tools/asm-11/tests/Makefile b/tools/asm-11/tests/Makefile index cdb537af..396979ee 100644 --- a/tools/asm-11/tests/Makefile +++ b/tools/asm-11/tests/Makefile @@ -1,11 +1,12 @@ -# $Id: Makefile 733 2016-02-20 12:24:13Z mueller $ +# $Id: Makefile 1065 2018-11-04 11:32:06Z mueller $ # # Revision History: # Date Rev Version Comment +# 2018-11-03 1065 1.1 sort file list # 2013-03-22 496 1.0 Initial version #--- # -MAC_all = $(wildcard *.mac) +MAC_all = $(sort $(wildcard *.mac)) LDA_all = $(MAC_all:.mac=.lda) COF_all = $(MAC_all:.mac=.cof) LST_all = $(MAC_all:.mac=.lst) diff --git a/tools/src/librtcltools/RtclProxyBase.cpp b/tools/src/librtcltools/RtclProxyBase.cpp index 87794c83..c8eac3d4 100644 --- a/tools/src/librtcltools/RtclProxyBase.cpp +++ b/tools/src/librtcltools/RtclProxyBase.cpp @@ -1,4 +1,4 @@ -// $Id: RtclProxyBase.cpp 1047 2018-09-16 11:08:41Z mueller $ +// $Id: RtclProxyBase.cpp 1066 2018-11-10 11:21:53Z mueller $ // // Copyright 2011-2018 by Walter F.J. Mueller // @@ -47,8 +47,6 @@ using namespace std; // all method definitions in namespace Retro namespace Retro { -typedef std::pair mmap_ins_t; - //------------------------------------------+----------------------------------- //! FIXME_docs diff --git a/tools/src/librw11/Rw11Cpu.ipp b/tools/src/librw11/Rw11Cpu.ipp index 8d442bda..2c8980c3 100644 --- a/tools/src/librw11/Rw11Cpu.ipp +++ b/tools/src/librw11/Rw11Cpu.ipp @@ -1,4 +1,4 @@ -// $Id: Rw11Cpu.ipp 1050 2018-09-23 15:46:42Z mueller $ +// $Id: Rw11Cpu.ipp 1066 2018-11-10 11:21:53Z mueller $ // // Copyright 2013-2018 by Walter F.J. Mueller // @@ -13,7 +13,7 @@ // // Revision History: // Date Rev Version Comment -// 2019-09-23 1050 1.2.3 add HasPcnt() +// 2018-09-23 1050 1.2.3 add HasPcnt() // 2017-02-17 851 1.2.2 probe/setup auxilliary devices: kw11l,kw11p,iist // 2015-07-12 700 1.2.1 use ..CpuAct instead ..CpuGo (new active based lam) // 2015-03-21 659 1.2 add RAddrMap diff --git a/tools/src/librw11/Rw11VirtTermTcp.cpp b/tools/src/librw11/Rw11VirtTermTcp.cpp index 9a883841..d3cc3e9f 100644 --- a/tools/src/librw11/Rw11VirtTermTcp.cpp +++ b/tools/src/librw11/Rw11VirtTermTcp.cpp @@ -1,4 +1,4 @@ -// $Id: Rw11VirtTermTcp.cpp 1059 2018-10-27 10:34:16Z mueller $ +// $Id: Rw11VirtTermTcp.cpp 1066 2018-11-10 11:21:53Z mueller $ // // Copyright 2013-2018 by Walter F.J. Mueller // @@ -123,15 +123,15 @@ Rw11VirtTermTcp::~Rw11VirtTermTcp() bool Rw11VirtTermTcp::Open(const std::string& url, RerrMsg& emsg) { if (!fUrl.Set(url, "|port=|trace|", "tcp", emsg)) return false; - if (!(fUrl.FindOpt("port"))) { + + string port; + if (!fUrl.FindOpt("port", port)) { emsg.Init("Rw11VirtTermTcp::Open", "port= option not specified"); return false; } fTcpTrace = fUrl.FindOpt("trace"); - string port; - fUrl.FindOpt("port",port); unsigned long portno; if (!Rtools::String2Long(port, portno, emsg)) return false; diff --git a/tools/tcl/rw11/dmpcnt.tcl b/tools/tcl/rw11/dmpcnt.tcl index c56c0adc..a26f1207 100644 --- a/tools/tcl/rw11/dmpcnt.tcl +++ b/tools/tcl/rw11/dmpcnt.tcl @@ -1,4 +1,4 @@ -# $Id: dmpcnt.tcl 1058 2018-10-21 21:46:26Z mueller $ +# $Id: dmpcnt.tcl 1066 2018-11-10 11:21:53Z mueller $ # # Copyright 2018- by Walter F.J. Mueller # @@ -13,6 +13,7 @@ # # Revision History: # Date Rev Version Comment +# 2018-11-09 1066 1.1.1 pc_sta: fix default file name # 2018-10-21 1058 1.1 add logger, pc_l* commands # 2018-10-13 1055 1.0 Initial version # 2018-09-23 1050 0.1 First draft @@ -146,7 +147,7 @@ namespace eval rw11 { if {$file eq ""} { set timestamp [clock format [clock seconds] -format "%Y-%m-%d-%H%M%S"] - set file "pc_dmpcnt$timestamp.dat" + set file "pc_dmpcnt_$timestamp.dat" } pc_clear