From 4e2cbdade4230908a854b4f03fedf8bacd13085d Mon Sep 17 00:00:00 2001 From: fgsch Date: Tue, 29 Oct 2002 23:55:01 +0000 Subject: [PATCH] o update to simh 2.10b3. o include DELQA and DEQNA ethernet support for vax and pdp11. some diffs have been submited for future inclusion. --- emulators/simh/Makefile | 16 ++-- emulators/simh/distinfo | 9 +- .../patches/patch-AltairZ80_altairz80_cpu_c | 12 --- .../patches/patch-AltairZ80_altairz80_dsk_c | 12 --- .../patches/patch-AltairZ80_altairz80_sio_c | 12 --- .../patches/patch-AltairZ80_altairz80_sys_c | 12 --- emulators/simh/patches/patch-NOVA_nova_cpu_c | 10 +-- emulators/simh/patches/patch-NOVA_nova_defs_h | 8 +- emulators/simh/patches/patch-PDP11_pdp11_xq_c | 77 ++++++++++++++++ .../{patch-Makefile => patch-makefile} | 82 ++++++++++------- emulators/simh/patches/patch-scp_c | 27 ++---- emulators/simh/patches/patch-sim_ether_c | 87 +++++++++++++++++++ emulators/simh/patches/patch-sim_sock_c | 12 +-- emulators/simh/pkg/PLIST | 15 +++- 14 files changed, 266 insertions(+), 125 deletions(-) delete mode 100644 emulators/simh/patches/patch-AltairZ80_altairz80_cpu_c delete mode 100644 emulators/simh/patches/patch-AltairZ80_altairz80_dsk_c delete mode 100644 emulators/simh/patches/patch-AltairZ80_altairz80_sio_c delete mode 100644 emulators/simh/patches/patch-AltairZ80_altairz80_sys_c create mode 100644 emulators/simh/patches/patch-PDP11_pdp11_xq_c rename emulators/simh/patches/{patch-Makefile => patch-makefile} (56%) create mode 100644 emulators/simh/patches/patch-sim_ether_c diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile index efadb853b40..a5b1da685b5 100644 --- a/emulators/simh/Makefile +++ b/emulators/simh/Makefile @@ -1,13 +1,12 @@ -# $OpenBSD: Makefile,v 1.29 2002/10/26 12:52:48 naddy Exp $ +# $OpenBSD: Makefile,v 1.30 2002/10/29 23:55:01 fgsch Exp $ # $NetBSD: Makefile,v 1.2 1998/08/23 20:48:03 frueauf Exp $ COMMENT= "PDP, IBM 1401, Nova and other CPUs simulator" -DISTNAME= simh-2.9.10 +DISTNAME= simh-2.10b3 CATEGORIES= emulators - MASTER_SITES= http://simh.trailing-edge.com/sources/ -DISTFILES= simhv29-10.zip +DISTFILES= simhv210-0b3.zip xq_beta5.zip HOMEPAGE= http://simh.trailing-edge.com/ @@ -18,9 +17,10 @@ PERMIT_DISTFILES_FTP= Yes WRKDIST= ${WRKDIR} -UNZIP= unzip -a +UNZIP= unzip -a -o COPTS= -DUSE_SOCKLEN_T +MAKE_FILE= makefile .if ${MACHINE_ARCH} == "alpha" || ${MACHINE_ARCH} == "sparc64" COPTS+= -O0 @@ -31,8 +31,12 @@ NO_REGRESS= Yes SIMS= altair altairz80 eclipse h316 hp2100 i1401 nova pdp1 \ pdp10 pdp11 pdp15 pdp4 pdp7 pdp8 pdp9 s3 vax +VMEM_WARNING= Yes + pre-build: - @mkdir ${WRKDIST}/BIN + @mkdir ${WRKBUILD}/BIN + @cp ${WRKDIST}/AltairZ80/altairZ80_defs.h \ + ${WRKDIR}/AltairZ80/altairz80_defs.h do-install: .for f in ${SIMS} diff --git a/emulators/simh/distinfo b/emulators/simh/distinfo index e46f50ebaf5..2f7ff649580 100644 --- a/emulators/simh/distinfo +++ b/emulators/simh/distinfo @@ -1,3 +1,6 @@ -MD5 (simhv29-10.zip) = 7a5a9ba69bdcce65f4508e89edde90a3 -RMD160 (simhv29-10.zip) = e1db975f3e7cdc8f00317c9dda8a1b3731bf8874 -SHA1 (simhv29-10.zip) = c7cf90c84eaa6e80f3415498f96ac0f2d3aa479f +MD5 (simhv210-0b3.zip) = 3a6921500d568b1aafb88eb93543eaa7 +MD5 (xq_beta5.zip) = 9c37e401e946dcad27d88107f7e5c94d +RMD160 (simhv210-0b3.zip) = f6fcf736c78c3b6e404f5824fbd28f805cf8e9aa +RMD160 (xq_beta5.zip) = c3b15245530d6f96d4106e940e32ac53aa2302e2 +SHA1 (simhv210-0b3.zip) = 6e6347dc391fe2a4b5a49b8b92f3986384c3837e +SHA1 (xq_beta5.zip) = a66fe7fecb76737632e262ae40c3d59147071a7e diff --git a/emulators/simh/patches/patch-AltairZ80_altairz80_cpu_c b/emulators/simh/patches/patch-AltairZ80_altairz80_cpu_c deleted file mode 100644 index 0299f25ed65..00000000000 --- a/emulators/simh/patches/patch-AltairZ80_altairz80_cpu_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-AltairZ80_altairz80_cpu_c,v 1.2 2002/06/10 02:37:10 form Exp $ ---- AltairZ80/altairz80_cpu.c.orig Thu May 9 11:08:18 2002 -+++ AltairZ80/altairz80_cpu.c Mon Jun 10 09:25:40 2002 -@@ -5,7 +5,7 @@ - */ - - #include --#include "altairZ80_defs.h" -+#include "altairz80_defs.h" - - #define PCQ_SIZE 64 /* must be 2**n */ - #define PCQ_MASK (PCQ_SIZE - 1) diff --git a/emulators/simh/patches/patch-AltairZ80_altairz80_dsk_c b/emulators/simh/patches/patch-AltairZ80_altairz80_dsk_c deleted file mode 100644 index 5e00b41f425..00000000000 --- a/emulators/simh/patches/patch-AltairZ80_altairz80_dsk_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-AltairZ80_altairz80_dsk_c,v 1.1 2002/04/08 02:47:42 form Exp $ ---- AltairZ80/altairz80_dsk.c.orig Mon Apr 8 10:34:34 2002 -+++ AltairZ80/altairz80_dsk.c Mon Apr 8 10:34:39 2002 -@@ -86,7 +86,7 @@ - */ - - #include --#include "altairZ80_defs.h" -+#include "altairz80_defs.h" - - #define UNIT_V_WLK (UNIT_V_UF + 0) /* write locked */ - #define UNIT_WLK (1 << UNIT_V_UF) diff --git a/emulators/simh/patches/patch-AltairZ80_altairz80_sio_c b/emulators/simh/patches/patch-AltairZ80_altairz80_sio_c deleted file mode 100644 index 633df2933db..00000000000 --- a/emulators/simh/patches/patch-AltairZ80_altairz80_sio_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-AltairZ80_altairz80_sio_c,v 1.1 2002/04/08 02:47:42 form Exp $ ---- AltairZ80/altairz80_sio.c.orig Mon Apr 8 10:34:54 2002 -+++ AltairZ80/altairz80_sio.c Mon Apr 8 10:34:57 2002 -@@ -29,7 +29,7 @@ - #include - #include - --#include "altairZ80_defs.h" -+#include "altairz80_defs.h" - #include "sim_sock.h" - #include "sim_tmxr.h" - #include diff --git a/emulators/simh/patches/patch-AltairZ80_altairz80_sys_c b/emulators/simh/patches/patch-AltairZ80_altairz80_sys_c deleted file mode 100644 index b55e9e7b839..00000000000 --- a/emulators/simh/patches/patch-AltairZ80_altairz80_sys_c +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-AltairZ80_altairz80_sys_c,v 1.1 2002/04/08 02:47:42 form Exp $ ---- AltairZ80/altairz80_sys.c.orig Mon Apr 8 10:35:06 2002 -+++ AltairZ80/altairz80_sys.c Mon Apr 8 10:35:10 2002 -@@ -5,7 +5,7 @@ - */ - - #include --#include "altairZ80_defs.h" -+#include "altairz80_defs.h" - - extern DEVICE cpu_dev; - extern DEVICE dsk_dev; diff --git a/emulators/simh/patches/patch-NOVA_nova_cpu_c b/emulators/simh/patches/patch-NOVA_nova_cpu_c index a59a3e20ab9..43a6a712637 100644 --- a/emulators/simh/patches/patch-NOVA_nova_cpu_c +++ b/emulators/simh/patches/patch-NOVA_nova_cpu_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-NOVA_nova_cpu_c,v 1.2 2002/02/04 10:56:39 form Exp $ ---- NOVA/nova_cpu.c.orig Mon Feb 4 11:39:20 2002 -+++ NOVA/nova_cpu.c Mon Feb 4 11:39:21 2002 -@@ -441,21 +441,21 @@ if (IR & I_OPR) { /* operate? */ +$OpenBSD: patch-NOVA_nova_cpu_c,v 1.3 2002/10/29 23:55:01 fgsch Exp $ +--- NOVA/nova_cpu.c.orig Sun Oct 6 14:37:14 2002 ++++ NOVA/nova_cpu.c Thu Oct 24 20:37:41 2002 +@@ -391,21 +391,21 @@ if (IR & I_OPR) { /* operate? */ src = src ^ DMASK; break; case 1: /* NEG */ @@ -28,7 +28,7 @@ $OpenBSD: patch-NOVA_nova_cpu_c,v 1.2 2002/02/04 10:56:39 form Exp $ break; case 7: /* AND */ src = src & (AC[dstAC] | CBIT); -@@ -467,10 +467,10 @@ if (IR & I_OPR) { /* operate? */ +@@ -417,10 +417,10 @@ if (IR & I_OPR) { /* operate? */ case 0: /* nop */ break; case 1: /* L */ diff --git a/emulators/simh/patches/patch-NOVA_nova_defs_h b/emulators/simh/patches/patch-NOVA_nova_defs_h index 461adb28453..5ec7d56815d 100644 --- a/emulators/simh/patches/patch-NOVA_nova_defs_h +++ b/emulators/simh/patches/patch-NOVA_nova_defs_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-NOVA_nova_defs_h,v 1.1 2002/02/04 05:10:29 form Exp $ ---- NOVA/nova_defs.h.orig Thu Jan 31 22:27:45 2002 -+++ NOVA/nova_defs.h Thu Jan 31 22:28:05 2002 -@@ -66,7 +66,7 @@ +$OpenBSD: patch-NOVA_nova_defs_h,v 1.2 2002/10/29 23:55:01 fgsch Exp $ +--- NOVA/nova_defs.h.orig Thu Oct 3 16:59:44 2002 ++++ NOVA/nova_defs.h Thu Oct 24 20:37:41 2002 +@@ -67,7 +67,7 @@ #define SIGN 0100000 /* sign */ #define DMASK 0177777 /* data mask */ #define CBIT (DMASK + 1) /* carry bit */ diff --git a/emulators/simh/patches/patch-PDP11_pdp11_xq_c b/emulators/simh/patches/patch-PDP11_pdp11_xq_c new file mode 100644 index 00000000000..b403c53132d --- /dev/null +++ b/emulators/simh/patches/patch-PDP11_pdp11_xq_c @@ -0,0 +1,77 @@ +$OpenBSD: patch-PDP11_pdp11_xq_c,v 1.1 2002/10/29 23:55:01 fgsch Exp $ +--- PDP11/pdp11_xq.c.orig Tue Oct 22 08:50:40 2002 ++++ PDP11/pdp11_xq.c Fri Oct 25 16:12:39 2002 +@@ -180,7 +180,7 @@ MTAB xq_mod[] = { + }; + + DEVICE xq_dev = { +- "XQ", &xq_unit, xq_reg, xq_mod, ++ "XQ", (struct unit *)&xq_unit, xq_reg, xq_mod, + 2, XQ_RDX, 0, 1, XQ_RDX, 8, + &xq_ex, &xq_dep, &xq_reset, + NULL, &xq_attach, &xq_detach, +@@ -623,8 +623,8 @@ t_stat xq_process_mop(void) + t_addr address; + uint16 size; + int32 wstatus; +- struct xq_meb* meb = &xq.write_buffer.msg[0200]; +- const struct xq_meb* limit = &xq.write_buffer.msg[0400]; ++ struct xq_meb* meb = (struct xq_meb *)&xq.write_buffer.msg[0200]; ++ const struct xq_meb* limit = (struct xq_meb *)&xq.write_buffer.msg[0400]; + + if (xq.type == XQ_T_DEQNA) /* DEQNA's don't MOP */ + return SCPE_NOFNC; +@@ -642,7 +642,7 @@ t_stat xq_process_mop(void) + case 0: /* MOP Termination */ + break; + case 1: /* MOP Read Ethernet Address */ +- wstatus = Map_WriteB(address, sizeof(ETH_MAC), &xq.setup.macs[0], NOMAP); ++ wstatus = Map_WriteB(address, sizeof(ETH_MAC), (uint8 *)&xq.setup.macs[0], NOMAP); + if (wstatus) return xq_nxm_error(); + break; + case 2: /* MOP Reset System ID */ +@@ -823,7 +823,7 @@ t_stat xq_process_xbdl() + } + + /* update write status */ +- wstatus = Map_WriteW(xq.xbdl_ba + 8, 4, write_success, NOMAP); ++ wstatus = Map_WriteW(xq.xbdl_ba + 8, 4, (uint16 *)write_success, NOMAP); + if (wstatus) return xq_nxm_error(); + + /* clear write buffer */ +@@ -850,7 +850,7 @@ t_stat xq_process_xbdl() + } else { /* not at end-of-message */ + + /* update bdl status words */ +- wstatus = Map_WriteW(xq.xbdl_ba + 8, 4, implicit_chain_status, NOMAP); ++ wstatus = Map_WriteW(xq.xbdl_ba + 8, 4, (uint16 *)implicit_chain_status, NOMAP); + if(wstatus) return xq_nxm_error(); + } + +@@ -946,7 +946,7 @@ void xq_sw_reset(void) + xq_cancel_santmr(); + + /* disconnect ethernet reception */ +- sim_cancel(&xq_unit); ++ sim_cancel(&xq_unit[0]); + + /* reset csr bits */ + xq.csr = XQ_CSR_XL | XQ_CSR_RL; +@@ -1017,7 +1017,7 @@ t_stat xq_wr_csr(int32 data) + /* start receiver when RE transitions to set */ + if (~saved_csr & XQ_CSR_RE & data) { + //xq_start_receiver(); +- sim_activate(&xq_unit, xq.rtime); ++ sim_activate(&xq_unit[0], xq.rtime); + } + + return SCPE_OK; +@@ -1192,7 +1192,7 @@ t_stat xq_svc(UNIT* uptr) + + /* resubmit if still receive enabled */ + if (xq.csr & XQ_CSR_RE) +- sim_activate(&xq_unit, xq.rtime); ++ sim_activate(&xq_unit[0], xq.rtime); + + return SCPE_OK; + } diff --git a/emulators/simh/patches/patch-Makefile b/emulators/simh/patches/patch-makefile similarity index 56% rename from emulators/simh/patches/patch-Makefile rename to emulators/simh/patches/patch-makefile index 6003bbfae83..9fe16c19144 100644 --- a/emulators/simh/patches/patch-Makefile +++ b/emulators/simh/patches/patch-makefile @@ -1,40 +1,36 @@ -$OpenBSD: patch-Makefile,v 1.5 2002/06/10 02:37:10 form Exp $ ---- Makefile.orig Sun Feb 17 13:50:26 2002 -+++ Makefile Mon Jun 10 09:30:22 2002 -@@ -3,9 +3,9 @@ +$OpenBSD: patch-makefile,v 1.3 2002/10/29 23:55:01 fgsch Exp $ +--- makefile.orig Sat Oct 26 08:09:58 2002 ++++ makefile Tue Oct 29 20:00:44 2002 +@@ -3,8 +3,9 @@ # Note: -O2 is sometimes broken in GCC when setjump/longjump is being # used. Try -O2 only with released simulators. # --CC = gcc -O0 -lm -I . -+#CC = gcc -O0 -lm -I . +-CC = gcc -O2 -lm -I . ++#CC = gcc -O2 -lm -I . #CC = gcc -O2 -g -lm -I . -- +CFLAGS += -lm -I. - # -@@ -103,7 +103,8 @@ HP2100_OPT = -I ${HP2100D} - I1401D = I1401/ - I1401 = ${I1401D}i1401_lp.c ${I1401D}i1401_cpu.c ${I1401D}i1401_iq.c \ -- ${I1401D}i1401_cd.c ${I1401D}i1401_mt.c ${I1401D}i1401_sys.c -+ ${I1401D}i1401_cd.c ${I1401D}i1401_dp.c ${I1401D}i1401_mt.c \ -+ ${I1401D}i1401_sys.c - I1401_OPT = -I ${I1401D} +@@ -62,7 +63,7 @@ PDP11 = ${PDP11D}pdp11_fp.c ${PDP11D}pdp + ${PDP11D}pdp11_tm.c ${PDP11D}pdp11_ts.c ${PDP11D}pdp11_io.c \ + ${PDP11D}pdp11_rq.c ${PDP11D}pdp11_tq.c ${PDP11D}pdp11_pclk.c \ + ${PDP11D}pdp11_ry.c ${PDP11D}pdp11_pt.c ${PDP11D}pdp11_hk.c \ +- ${PDP11D}pdp11_xq.c ++ ${PDP11D}pdp11_xq.c sim_ether.c + PDP11_OPT = -I ${PDP11D} -@@ -140,8 +141,8 @@ ALTAIR_OPT = -I ${ALTAIRD} +@@ -73,7 +74,7 @@ VAX = ${VAXD}vax_cpu1.c ${VAXD}vax_cpu.c + ${VAXD}vax_sysdev.c \ + ${PDP11D}pdp11_rl.c ${PDP11D}pdp11_rq.c ${PDP11D}pdp11_ts.c \ + ${PDP11D}pdp11_dz.c ${PDP11D}pdp11_lp.c ${PDP11D}pdp11_tq.c \ +- ${PDP11D}pdp11_pt.c ${PDP11D}pdp11_xq.c ++ ${PDP11D}pdp11_pt.c ${PDP11D}pdp11_xq.c sim_ether.c + VAX_OPT = -I ${VAXD} -I ${PDP11D} -DUSE_INT64 - ALTAIRZ80D = AltairZ80/ --ALTAIRZ80 = ${ALTAIRZ80D}altairZ80_cpu.c ${ALTAIRZ80D}altairZ80_dsk.c \ -- ${ALTAIRZ80D}altairZ80_sio.c ${ALTAIRZ80D}altairZ80_sys.c -+ALTAIRZ80 = ${ALTAIRZ80D}altairz80_cpu.c ${ALTAIRZ80D}altairz80_dsk.c \ -+ ${ALTAIRZ80D}altairz80_sio.c ${ALTAIRZ80D}altairz80_sys.c - ALTAIRZ80_OPT = -I ${ALTAIRZ80D} - - # -@@ -158,87 +159,87 @@ all : ${BIN}pdp1 ${BIN}pdp4 ${BIN}pdp7 $ +@@ -208,106 +209,106 @@ all : ${BIN}pdp1 ${BIN}pdp4 ${BIN}pdp7 $ # Individual builds # ${BIN}pdp1 : ${PDP1} ${SIM} @@ -81,13 +77,13 @@ $OpenBSD: patch-Makefile,v 1.5 2002/06/10 02:37:10 form Exp $ ${BIN}pdp11 : ${PDP11} ${SIM} - ${CC} ${PDP11} ${SIM} ${PDP11_OPT} -o $@ -+ ${CC} ${CFLAGS} ${PDP11} ${SIM} ${PDP11_OPT} -o $@ ++ ${CC} ${CFLAGS} ${PDP11} ${SIM} ${PDP11_OPT} -o $@ -lpcap ${BIN}vax : ${VAX} ${SIM} - ${CC} ${VAX} ${SIM} ${VAX_OPT} -o $@ -+ ${CC} ${CFLAGS} ${VAX} ${SIM} ${VAX_OPT} -o $@ ++ ${CC} ${CFLAGS} ${VAX} ${SIM} ${VAX_OPT} -o $@ -lpcap @@ -121,11 +117,15 @@ $OpenBSD: patch-Makefile,v 1.5 2002/06/10 02:37:10 form Exp $ - ${BIN}sds : ${SDS} ${SIM} -- ${CC} ${SDS} ${SIM} ${SDS_OPT} -o $@ -+ ${CC} ${CFLAGS} ${SDS} ${SIM} ${SDS_OPT} -o $@ + ${BIN}i1620 : ${I1620} ${SIM} +- ${CC} ${I1620} ${SIM} ${I1620_OPT} -o $@ ++ ${CC} ${CFLAGS} ${I1620} ${SIM} ${I1620_OPT} -o $@ + ${BIN}ibm1130 : ${IBM1130} +- ${CC} ${IBM1130} ${SIM} ${IBM1130_OPT} -o $@ ++ ${CC} ${CFLAGS} ${IBM1130} ${SIM} ${IBM1130_OPT} -o $@ + ${BIN}s3 : ${S3} ${SIM} - ${CC} ${S3} ${SIM} ${S3_OPT} -o $@ @@ -137,6 +137,26 @@ $OpenBSD: patch-Makefile,v 1.5 2002/06/10 02:37:10 form Exp $ + ${CC} ${CFLAGS} ${ALTAIR} ${SIM} ${ALTAIR_OPT} -o $@ - ${BIN}altairz80 : ${ALTAIRZ80} ${SIM} + ${BIN}altairz80 : ${ALTAIRZ80} ${SIM} ${ALTAIRZ80D}altairZ80_defs.h - ${CC} ${ALTAIRZ80_OPT} ${ALTAIRZ80} ${SIM} -o $@ + ${CC} ${CFLAGS} ${ALTAIRZ80_OPT} ${ALTAIRZ80} ${SIM} -o $@ + ${ALTAIRZ80D}altairZ80_defs.h : ${ALTAIRZ80D}altairz80_defs.h + cp ${ALTAIRZ80D}altairz80_defs.h ${ALTAIRZ80D}altairZ80_defs.h + + ${BIN}gri : ${GRI} ${SIM} +- ${CC} ${GRI} ${SIM} ${GRI_OPT} -o $@ ++ ${CC} ${CFLAGS} ${GRI} ${SIM} ${GRI_OPT} -o $@ + + ${BIN}id16 : ${ID16} ${SIM} +- ${CC} ${ID16} ${SIM} ${ID16_OPT} -o $@ ++ ${CC} ${CFLAGS} ${ID16} ${SIM} ${ID16_OPT} -o $@ + + ${BIN}id32 : ${ID32} ${SIM} +- ${CC} ${ID32} ${SIM} ${ID32_OPT} -o $@ ++ ${CC} ${CFLAGS} ${ID32} ${SIM} ${ID32_OPT} -o $@ + + ${BIN}sds : ${SDS} ${SIM} +- ${CC} ${SDS} ${SIM} ${SDS_OPT} -o $@ ++ ${CC} ${CFLAGS} ${SDS} ${SIM} ${SDS_OPT} -o $@ + + diff --git a/emulators/simh/patches/patch-scp_c b/emulators/simh/patches/patch-scp_c index 5930096b4cc..990a2b1abca 100644 --- a/emulators/simh/patches/patch-scp_c +++ b/emulators/simh/patches/patch-scp_c @@ -1,24 +1,15 @@ -$OpenBSD: patch-scp_c,v 1.5 2002/06/10 02:37:10 form Exp $ ---- scp.c.orig Sat May 18 13:26:12 2002 -+++ scp.c Mon Jun 10 09:25:40 2002 -@@ -423,7 +423,10 @@ if ((argc > 1) && argv[1]) { /* cmd f - do { printf ("sim> "); /* prompt */ - cptr = read_line (cbuf, CBUFSIZE, stdin); /* read command line */ - stat = SCPE_UNK; +$OpenBSD: patch-scp_c,v 1.6 2002/10/29 23:55:01 fgsch Exp $ +--- scp.c.orig Tue Oct 29 20:33:12 2002 ++++ scp.c Tue Oct 29 20:39:00 2002 +@@ -548,7 +548,10 @@ while (stat != SCPE_EXIT) { /* in cas + if (sim_vm_read != NULL) /* sim routine? */ + cptr = (*sim_vm_read) (cbuf, CBUFSIZE, stdin); + else cptr = read_line (cbuf, CBUFSIZE, stdin); /* read command line */ - if (cptr == NULL) continue; /* ignore EOF */ -+ if (cptr == NULL || *cptr == 0) { /* ignore EOF */ ++ if (cptr == NULL) { + putchar('\n'); -+ continue; ++ continue; /* ignore EOF */ + } if (*cptr == 0) continue; /* ignore blank */ if (sim_log) fprintf (sim_log, "sim> %s\n", cbuf); /* log cmd */ cptr = get_glyph (cptr, gbuf, 0); /* get command glyph */ -@@ -1478,7 +1481,7 @@ for (i = 1; (dptr = sim_devices[i]) != N - (UNIT_ATT + UNIT_SEQ)) - fseek (uptr -> fileref, uptr -> pos, SEEK_SET); } } - stop_cpu = 0; --if ((int) signal (SIGINT, int_handler) == -1) { /* set WRU */ -+if (signal (SIGINT, int_handler) == (void *)-1) { /* set WRU */ - return SCPE_SIGERR; } - if (ttrunstate () != SCPE_OK) { /* set console */ - ttcmdstate (); diff --git a/emulators/simh/patches/patch-sim_ether_c b/emulators/simh/patches/patch-sim_ether_c new file mode 100644 index 00000000000..995d86aca50 --- /dev/null +++ b/emulators/simh/patches/patch-sim_ether_c @@ -0,0 +1,87 @@ +$OpenBSD: patch-sim_ether_c,v 1.1 2002/10/29 23:55:01 fgsch Exp $ +--- sim_ether.c.orig Fri Oct 25 16:27:11 2002 ++++ sim_ether.c Fri Oct 25 16:30:31 2002 +@@ -99,7 +99,8 @@ void eth_zero(ETH_DEV* dev) + /* Non-implemented versions */ + /*============================================================================*/ + +-#if !defined (WIN32) && !defined(linux) && !defined(__NetBSD__) ++#if !defined (WIN32) && !defined(linux) && !defined(__NetBSD__) && \ ++ !defined(__OpenBSD__) + t_stat eth_open (ETH_DEV* dev, char* name) + {return SCPE_NOFNC;} + t_stat eth_close (ETH_DEV* dev) +@@ -116,20 +117,21 @@ int eth_devices (int max, ETH_LIST* dev) + #else /* endif unimplemented */ + + /*============================================================================*/ +-/* Win32, Linux, and NetBSD routines - Uses WinPCAP and libpcap packages */ ++/* Win32, Linux, NetBSD and OpenSBD routines - Uses WinPCAP and libpcap */ ++/* packages */ + /*============================================================================*/ + + #include + #ifdef WIN32 + #include + #endif /*WIN32*/ +-#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__OpenBSD__) + #include + #include +-#endif /* __NetBSD__ */ +-#if defined(linux) || defined(__NetBSD__) ++#endif /* __NetBSD__ || __OpenBSD__ */ ++#if defined(linux) || defined(__NetBSD__) || defined(__OpenBSD__) + #include +-#endif /*linux || __NetBSD__*/ ++#endif /*linux || __NetBSD__ || __OpenBSD__*/ + + t_stat eth_open(ETH_DEV* dev, char* name) + { +@@ -166,17 +168,17 @@ t_stat eth_open(ETH_DEV* dev, char* name + dev->name = malloc(strlen(savname)+1); + strcpy(dev->name, savname); + +-#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__OpenBSD__) + /* tell the kernel that the header is fully-formed when it gets it. + this is required in order to fake the src address. */ + i = 1; + ioctl(pcap_fileno(dev->handle), BIOCSHDRCMPLT, &i); +-#endif /* __NetBSD__ */ ++#endif /* __NetBSD__ || __OpenBSD__ */ + +-#if defined(linux) || defined(__NetBSD__) ++#if defined(linux) || defined(__NetBSD__) || defined(__OpenBSD__) + /* set file non-blocking */ + fcntl(pcap_fileno(dev->handle), F_SETFL, fcntl(pcap_fileno(dev->handle), F_GETFL, 0) | O_NONBLOCK); +-#endif /*linux || __NetBSD__*/ ++#endif /*linux || __NetBSD__ || __OpenBSD__*/ + + return SCPE_OK; + } +@@ -364,7 +366,7 @@ int eth_devices(int max, ETH_LIST* list) + return index; /* count of devices */ + } + +-#endif /* Win32 || linux || __NetBSD__ */ ++#endif /* Win32 || linux || __NetBSD__ || __OpenBSD__ */ + + /*============================================================================*/ + /* linux-specific code */ +@@ -422,7 +424,7 @@ int PacketGetAdapterNames(char* buffer, + /* NetBSD-specific code */ + /*============================================================================*/ + +-#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__OpenBSD__) + #include + #include + #include +@@ -470,5 +472,5 @@ int PacketGetAdapterNames(char* buffer, + return (ptr); + } + +-#endif /* __NetBSD__ */ ++#endif /* __NetBSD__ || __OpenBSD__ */ + diff --git a/emulators/simh/patches/patch-sim_sock_c b/emulators/simh/patches/patch-sim_sock_c index 0cf0272f9e9..c4fcebc49c3 100644 --- a/emulators/simh/patches/patch-sim_sock_c +++ b/emulators/simh/patches/patch-sim_sock_c @@ -1,12 +1,12 @@ -$OpenBSD: patch-sim_sock_c,v 1.2 2002/06/10 02:37:10 form Exp $ ---- sim_sock.c.orig Mon Jun 10 09:24:34 2002 -+++ sim_sock.c Mon Jun 10 09:24:43 2002 -@@ -130,7 +130,7 @@ return newsock; /* got it! */ - SOCKET sim_accept_conn (SOCKET master, UNIT *uptr, uint32 *ipaddr) +$OpenBSD: patch-sim_sock_c,v 1.3 2002/10/29 23:55:01 fgsch Exp $ +--- sim_sock.c.orig Tue Oct 8 10:41:40 2002 ++++ sim_sock.c Thu Oct 24 20:37:41 2002 +@@ -132,7 +132,7 @@ return newsock; /* got it! */ + SOCKET sim_accept_conn (SOCKET master, uint32 *ipaddr) { int32 sta; -#if defined (macintosh) +#if defined (macintosh) || defined(USE_SOCKLEN_T) socklen_t size; - #elif defined (__EMX__) + #elif defined (WIN32) || defined (__EMX__) int size; diff --git a/emulators/simh/pkg/PLIST b/emulators/simh/pkg/PLIST index c92a264f736..9ddb8b0ffc1 100644 --- a/emulators/simh/pkg/PLIST +++ b/emulators/simh/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.9 2002/05/06 06:23:08 form Exp $ +@comment $OpenBSD: PLIST,v 1.10 2002/10/29 23:55:01 fgsch Exp $ bin/simh-altair bin/simh-altairz80 bin/simh-eclipse @@ -17,14 +17,18 @@ bin/simh-pdp9 bin/simh-s3 bin/simh-vax lib/simh/vax/ka655.bin -share/doc/simh/0readme29.txt +share/doc/simh/0readme210.txt share/doc/simh/altair.txt -share/doc/simh/altairZ80.txt +share/doc/simh/altairz80.txt share/doc/simh/eclipse.txt +share/doc/simh/gri_doc.txt share/doc/simh/h316_doc.txt share/doc/simh/haltguide.txt +share/doc/simh/hp2100_diag.txt share/doc/simh/hp2100_doc.txt share/doc/simh/i1401_doc.txt +share/doc/simh/i1620_doc.txt +share/doc/simh/id_doc.txt share/doc/simh/nova_doc.txt share/doc/simh/pdp10_doc.txt share/doc/simh/pdp11_doc.txt @@ -33,10 +37,13 @@ share/doc/simh/pdp1_doc.txt share/doc/simh/pdp8_doc.txt share/doc/simh/readme1130.txt share/doc/simh/readme_s3.txt +share/doc/simh/readme_update.txt +share/doc/simh/sds_doc.txt share/doc/simh/simh_doc.txt share/doc/simh/simh_swre.txt share/doc/simh/system3.txt share/doc/simh/vax_doc.txt +share/doc/simh/xq_README.txt +@dirrm share/doc/simh @dirrm lib/simh/vax @dirrm lib/simh -@dirrm share/doc/simh