update to simh 3.9.0, from Brad, tested by me and william@
This commit is contained in:
sthen
parent
4ad1879c15
commit
ea2c47b735
@ -1,13 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.72 2011/12/24 12:57:10 sthen Exp $
|
||||
# $NetBSD: Makefile,v 1.2 1998/08/23 20:48:03 frueauf Exp $
|
||||
# $OpenBSD: Makefile,v 1.73 2012/07/10 00:07:44 sthen Exp $
|
||||
|
||||
COMMENT= PDP, IBM 1401, Nova and other CPUs simulator
|
||||
|
||||
PKGNAME= simh-3.8.1
|
||||
DISTNAME= simhv38-1
|
||||
REVISION= 6
|
||||
DISTNAME= simhv39-0
|
||||
PKGNAME= simh-3.9.0
|
||||
CATEGORIES= emulators
|
||||
MASTER_SITES= ${HOMEPAGE}/sources/
|
||||
EXTRACT_SUFX= .zip
|
||||
|
||||
HOMEPAGE= http://simh.trailing-edge.com/
|
||||
|
||||
@ -17,21 +16,18 @@ PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
WANTLIB= c m pcap
|
||||
WANTLIB= c m pcap pthread
|
||||
|
||||
WRKDIST= ${WRKDIR}
|
||||
EXTRACT_SUFX= .zip
|
||||
MASTER_SITES0= http://spacehopper.org/mirrors/
|
||||
# Files from http://simh.trailing-edge.com/interim.html repackaged as a diff
|
||||
PATCHFILES= simh-3.8.1-interim.diff:0
|
||||
|
||||
UNZIP= unzip -a -o
|
||||
|
||||
COPTS+= -DPATH_KA655X_BIN=\"${PREFIX}/lib/simh/vax/ka655x.bin\" \
|
||||
-DPATH_VMB_EXE=\"${PREFIX}/lib/simh/vax/vmb.exe\"
|
||||
CFLAGS+= -DPATH_KA655X_BIN=\"${PREFIX}/lib/simh/vax/ka655x.bin\" \
|
||||
-DPATH_VMB_EXE=\"${PREFIX}/lib/simh/vax/vmb.exe\"
|
||||
|
||||
USE_GMAKE= Yes
|
||||
MAKE_FILE= makefile
|
||||
MAKE_FLAGS= CC="${CC}"
|
||||
MAKE_FLAGS= GCC="${CC}" USE_NETWORK=1
|
||||
|
||||
NO_REGRESS= Yes
|
||||
VMEM_WARNING= Yes
|
||||
@ -40,13 +36,13 @@ pre-build:
|
||||
@mkdir -p ${WRKBUILD}/BIN
|
||||
|
||||
do-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/lib/simh/vax
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/simh
|
||||
@cd ${WRKBUILD}/BIN && for f in `echo *`; do \
|
||||
${INSTALL_PROGRAM} $${f} ${PREFIX}/bin/simh-$${f}; \
|
||||
done;
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/lib/simh/vax
|
||||
${INSTALL_DATA} ${WRKDIST}/VAX/ka655x.bin ${PREFIX}/lib/simh/vax
|
||||
${INSTALL_DATA} ${WRKDIST}/VAX/vmb.exe ${PREFIX}/lib/simh/vax
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/simh
|
||||
${INSTALL_DATA} ${WRKBUILD}/*.txt ${WRKBUILD}/*/*.txt \
|
||||
${PREFIX}/share/doc/simh
|
||||
|
||||
|
||||
@ -1,10 +1,5 @@
|
||||
MD5 (simh-3.8.1-interim.diff) = JJYiU313/E+rzZJ16ZNGPQ==
|
||||
MD5 (simhv38-1.zip) = 4V9lqC4h6knhS0ODJtk9XA==
|
||||
RMD160 (simh-3.8.1-interim.diff) = 3IQeLrF8hSlc+YuEKh/VdoSaaYs=
|
||||
RMD160 (simhv38-1.zip) = 8IXFLskkJfhPZbPzYFy3q6i+ezI=
|
||||
SHA1 (simh-3.8.1-interim.diff) = ixpJMs6+sSto2omfoA04ytaRU0k=
|
||||
SHA1 (simhv38-1.zip) = XqwvjlC+EWAHJ5g+BQcmkKcGZwI=
|
||||
SHA256 (simh-3.8.1-interim.diff) = c+fnjFbbZ9i+ormiXU7UDBX7FWjwcyQbjEoStFG7oIc=
|
||||
SHA256 (simhv38-1.zip) = T+KU+lKFsdbQvWn2CInADlGM4r5fAKvCvUrfqNqoWwY=
|
||||
SIZE (simh-3.8.1-interim.diff) = 57923
|
||||
SIZE (simhv38-1.zip) = 2954982
|
||||
MD5 (simhv39-0.zip) = uAOFiI8jJpq67gutfYTqfA==
|
||||
RMD160 (simhv39-0.zip) = pGTn0fxtWN0jo+9iPDwBjV1gsFA=
|
||||
SHA1 (simhv39-0.zip) = HeOTjw3LUdVbDlOuqK6XaczFe9s=
|
||||
SHA256 (simhv39-0.zip) = 5Jslm2atYxHKkGbe49NpPNkVEGppOKUu1oXNutqO2js=
|
||||
SIZE (simhv39-0.zip) = 3103657
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-PDP11_pdp11_hk_c,v 1.1 2011/04/20 05:16:33 form Exp $
|
||||
--- PDP11/pdp11_hk.c.orig Sat Nov 22 18:40:26 2008
|
||||
+++ PDP11/pdp11_hk.c Wed Apr 20 11:37:12 2011
|
||||
@@ -904,7 +904,7 @@ switch (fnc) {
|
||||
$OpenBSD: patch-PDP11_pdp11_hk_c,v 1.2 2012/07/10 00:07:44 sthen Exp $
|
||||
--- PDP11/pdp11_hk.c.orig Mon Mar 19 17:41:44 2012
|
||||
+++ PDP11/pdp11_hk.c Wed Jun 13 06:36:24 2012
|
||||
@@ -905,7 +905,7 @@ switch (fnc) {
|
||||
for (i = wc; i < awc; i++) /* fill buf */
|
||||
hkxb[i] = 0;
|
||||
if (wc && !err) { /* write buf */
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-PDP11_pdp11_vh_c,v 1.4 2010/03/21 09:26:49 jasper Exp $
|
||||
--- PDP11/pdp11_vh.c.orig Wed Nov 19 15:53:14 2008
|
||||
+++ PDP11/pdp11_vh.c Tue Jan 26 13:12:30 2010
|
||||
@@ -88,7 +88,7 @@ extern FILE *sim_log;
|
||||
$OpenBSD: patch-PDP11_pdp11_vh_c,v 1.5 2012/07/10 00:07:44 sthen Exp $
|
||||
--- PDP11/pdp11_vh.c.orig Mon Mar 19 18:15:14 2012
|
||||
+++ PDP11/pdp11_vh.c Wed Jun 13 06:37:14 2012
|
||||
@@ -95,7 +95,7 @@ extern int32 tmxr_poll, clk_tps;
|
||||
#endif
|
||||
#define VH_MNOMASK (VH_MUXES - 1)
|
||||
#define VH_MNOMASK (VH_MUXES - 1)
|
||||
|
||||
-#define VH_LINES (8)
|
||||
+#define VH_LINES (16)
|
||||
-#define VH_LINES (8)
|
||||
+#define VH_LINES (16)
|
||||
|
||||
#define UNIT_V_MODEDHU (UNIT_V_UF + 0)
|
||||
#define UNIT_V_FASTDMA (UNIT_V_UF + 1)
|
||||
#define UNIT_V_MODEDHU (UNIT_V_UF + 0)
|
||||
#define UNIT_V_FASTDMA (UNIT_V_UF + 1)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-VAX_vax780_sbi_c,v 1.4 2009/03/06 10:33:23 form Exp $
|
||||
--- VAX/vax780_sbi.c.orig Tue Nov 18 10:37:06 2008
|
||||
+++ VAX/vax780_sbi.c Tue Feb 10 22:38:53 2009
|
||||
@@ -34,6 +34,10 @@
|
||||
$OpenBSD: patch-VAX_vax780_sbi_c,v 1.5 2012/07/10 00:07:44 sthen Exp $
|
||||
--- VAX/vax780_sbi.c.orig Mon Mar 19 18:08:46 2012
|
||||
+++ VAX/vax780_sbi.c Wed Jun 13 06:39:29 2012
|
||||
@@ -35,6 +35,10 @@
|
||||
|
||||
#include "vax_defs.h"
|
||||
|
||||
@ -12,16 +12,16 @@ $OpenBSD: patch-VAX_vax780_sbi_c,v 1.4 2009/03/06 10:33:23 form Exp $
|
||||
/* 11/780 specific IPRs */
|
||||
|
||||
/* Writeable control store */
|
||||
@@ -661,10 +665,10 @@ t_stat cpu_boot (int32 unitno, DEVICE *dptr)
|
||||
@@ -686,10 +690,10 @@ t_stat cpu_boot (int32 unitno, DEVICE *dptr)
|
||||
{
|
||||
t_stat r;
|
||||
|
||||
-printf ("Loading boot code from vmb.exe\n");
|
||||
+printf ("Loading boot code from %s\n", PATH_VMB_EXE);
|
||||
if (sim_log) fprintf (sim_log,
|
||||
- "Loading boot code from vmb.exe\n");
|
||||
if (sim_log)
|
||||
- fprintf (sim_log, "Loading boot code from vmb.exe\n");
|
||||
-r = load_cmd (0, "-O vmb.exe 200");
|
||||
+ "Loading boot code from %s\n", PATH_VMB_EXE);
|
||||
+ fprintf (sim_log, "Loading boot code from %s\n", PATH_VMB_EXE);
|
||||
+r = load_cmd (0, "-O " PATH_VMB_EXE " 200");
|
||||
if (r != SCPE_OK)
|
||||
return r;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-VAX_vax_sysdev_c,v 1.7 2009/03/06 10:33:23 form Exp $
|
||||
--- VAX/vax_sysdev.c.orig Sun Nov 23 11:57:54 2008
|
||||
+++ VAX/vax_sysdev.c Tue Feb 10 22:39:06 2009
|
||||
@@ -53,6 +53,10 @@
|
||||
$OpenBSD: patch-VAX_vax_sysdev_c,v 1.8 2012/07/10 00:07:44 sthen Exp $
|
||||
--- VAX/vax_sysdev.c.orig Sun Apr 29 19:02:06 2012
|
||||
+++ VAX/vax_sysdev.c Wed Jun 13 06:36:24 2012
|
||||
@@ -54,6 +54,10 @@
|
||||
|
||||
#include "vax_defs.h"
|
||||
|
||||
@ -12,7 +12,7 @@ $OpenBSD: patch-VAX_vax_sysdev_c,v 1.7 2009/03/06 10:33:23 form Exp $
|
||||
#define UNIT_V_NODELAY (UNIT_V_UF + 0) /* ROM access equal to RAM access */
|
||||
#define UNIT_NODELAY (1u << UNIT_V_NODELAY)
|
||||
|
||||
@@ -1549,10 +1553,10 @@ conpsl = PSL_IS | PSL_IPL1F | CON_PWRUP;
|
||||
@@ -1552,10 +1556,10 @@ conpsl = PSL_IS | PSL_IPL1F | CON_PWRUP;
|
||||
if (rom == NULL)
|
||||
return SCPE_IERR;
|
||||
if (*rom == 0) { /* no boot? */
|
||||
|
||||
@ -1,207 +1,21 @@
|
||||
$OpenBSD: patch-makefile,v 1.14 2011/12/24 12:57:10 sthen Exp $
|
||||
--- makefile.orig Wed Nov 19 21:53:48 2008
|
||||
+++ makefile Sun Nov 20 03:46:22 2011
|
||||
@@ -1,32 +1,6 @@
|
||||
-#
|
||||
-# CC Command
|
||||
-#
|
||||
-ifeq ($(WIN32),)
|
||||
- #Unix Environments
|
||||
- ifneq (,$(findstring solaris,$(OSTYPE)))
|
||||
- OS_CCDEFS = -lm -lsocket -lnsl -lrt -lpthread -D_GNU_SOURCE
|
||||
- else
|
||||
- ifneq (,$(findstring darwin,$(OSTYPE)))
|
||||
- OS_CCDEFS = -D_GNU_SOURCE
|
||||
- else
|
||||
- OS_CCDEFS = -lrt -lm -D_GNU_SOURCE
|
||||
- endif
|
||||
- endif
|
||||
- CC = gcc -std=c99 -U__STRICT_ANSI__ -g $(OS_CCDEFS) -I .
|
||||
- ifeq ($(USE_NETWORK),)
|
||||
- else
|
||||
- NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a
|
||||
- endif
|
||||
-else
|
||||
- #Win32 Environments
|
||||
- LDFLAGS = -lm -lwsock32 -lwinmm
|
||||
- CC = gcc -std=c99 -U__STRICT_ANSI__ -O2 -I.
|
||||
- EXE = .exe
|
||||
- ifeq ($(USE_NETWORK),)
|
||||
- else
|
||||
- NETWORK_OPT = -DUSE_NETWORK -lwpcap -lpacket
|
||||
- endif
|
||||
-endif
|
||||
+OS_CCDEFS = -D_GNU_SOURCE
|
||||
+CFLAGS += $(OS_CCDEFS) -std=c99 -U__STRICT_ANSI__ -g -lm -I .
|
||||
+NETWORK_OPT = -DUSE_NETWORK -lpcap
|
||||
|
||||
#
|
||||
# Common Libraries
|
||||
@@ -262,11 +236,7 @@ ALL = pdp1 pdp4 pdp7 pdp8 pdp9 pdp15 pdp11 pdp10 \
|
||||
all : ${ALL}
|
||||
|
||||
clean :
|
||||
-ifeq ($(WIN32),)
|
||||
${RM} ${BIN}*
|
||||
-else
|
||||
- if exist BIN\*.exe del /q BIN\*.exe
|
||||
-endif
|
||||
|
||||
#
|
||||
# Individual builds
|
||||
@@ -274,129 +244,129 @@ endif
|
||||
pdp1 : ${BIN}pdp1${EXE}
|
||||
|
||||
${BIN}pdp1${EXE} : ${PDP1} ${SIM}
|
||||
- ${CC} ${PDP1} ${SIM} ${PDP1_OPT} -o $@ ${LDFLAGS}
|
||||
+ ${CC} ${CFLAGS} ${PDP1} ${SIM} ${PDP1_OPT} -o $@ ${LDFLAGS}
|
||||
|
||||
pdp4 : ${BIN}pdp4${EXE}
|
||||
|
||||
${BIN}pdp4${EXE} : ${PDP18B} ${SIM}
|
||||
- ${CC} ${PDP18B} ${SIM} ${PDP4_OPT} -o $@ ${LDFLAGS}
|
||||
+ ${CC} ${CFLAGS} ${PDP18B} ${SIM} ${PDP4_OPT} -o $@ ${LDFLAGS}
|
||||
|
||||
pdp7 : ${BIN}pdp7${EXE}
|
||||
|
||||
${BIN}pdp7${EXE} : ${PDP18B} ${SIM}
|
||||
- ${CC} ${PDP18B} ${SIM} ${PDP7_OPT} -o $@ ${LDFLAGS}
|
||||
+ ${CC} ${CFLAGS} ${PDP18B} ${SIM} ${PDP7_OPT} -o $@ ${LDFLAGS}
|
||||
|
||||
pdp8 : ${BIN}pdp8${EXE}
|
||||
|
||||
${BIN}pdp8${EXE} : ${PDP8} ${SIM}
|
||||
- ${CC} ${PDP8} ${SIM} ${PDP8_OPT} -o $@ ${LDFLAGS}
|
||||
+ ${CC} ${CFLAGS} ${PDP8} ${SIM} ${PDP8_OPT} -o $@ ${LDFLAGS}
|
||||
|
||||
pdp9 : ${BIN}pdp9${EXE}
|
||||
|
||||
${BIN}pdp9${EXE} : ${PDP18B} ${SIM}
|
||||
- ${CC} ${PDP18B} ${SIM} ${PDP9_OPT} -o $@ ${LDFLAGS}
|
||||
+ ${CC} ${CFLAGS} ${PDP18B} ${SIM} ${PDP9_OPT} -o $@ ${LDFLAGS}
|
||||
|
||||
pdp15 : ${BIN}pdp15${EXE}
|
||||
|
||||
${BIN}pdp15${EXE} : ${PDP18B} ${SIM}
|
||||
- ${CC} ${PDP18B} ${SIM} ${PDP15_OPT} -o $@ ${LDFLAGS}
|
||||
+ ${CC} ${CFLAGS} ${PDP18B} ${SIM} ${PDP15_OPT} -o $@ ${LDFLAGS}
|
||||
|
||||
pdp10 : ${BIN}pdp10${EXE}
|
||||
|
||||
${BIN}pdp10${EXE} : ${PDP10} ${SIM}
|
||||
- ${CC} ${PDP10} ${SIM} ${PDP10_OPT} -o $@ ${LDFLAGS}
|
||||
+ ${CC} ${CFLAGS} ${PDP10} ${SIM} ${PDP10_OPT} -o $@ ${LDFLAGS}
|
||||
|
||||
pdp11 : ${BIN}pdp11${EXE}
|
||||
|
||||
${BIN}pdp11${EXE} : ${PDP11} ${SIM}
|
||||
- ${CC} ${PDP11} ${SIM} ${PDP11_OPT} -o $@ ${LDFLAGS}
|
||||
+ ${CC} ${CFLAGS} ${PDP11} ${SIM} ${PDP11_OPT} -o $@ ${LDFLAGS}
|
||||
|
||||
vax : ${BIN}vax${EXE}
|
||||
|
||||
${BIN}vax${EXE} : ${VAX} ${SIM}
|
||||
- ${CC} ${VAX} ${SIM} ${VAX_OPT} -o $@ ${LDFLAGS}
|
||||
+ ${CC} ${CFLAGS} ${VAX} ${SIM} ${VAX_OPT} -o $@ ${LDFLAGS}
|
||||
|
||||
vax780 : ${BIN}vax780${EXE}
|
||||
|
||||
${BIN}vax780${EXE} : ${VAX780} ${SIM}
|
||||
- ${CC} ${VAX780} ${SIM} ${VAX780_OPT} -o $@ ${LDFLAGS}
|
||||
+ ${CC} ${CFLAGS} ${VAX780} ${SIM} ${VAX780_OPT} -o $@ ${LDFLAGS}
|
||||
|
||||
nova : ${BIN}nova${EXE}
|
||||
|
||||
${BIN}nova${EXE} : ${NOVA} ${SIM}
|
||||
- ${CC} ${NOVA} ${SIM} ${NOVA_OPT} -o $@ ${LDFLAGS}
|
||||
+ ${CC} ${CFLAGS} ${NOVA} ${SIM} ${NOVA_OPT} -o $@ ${LDFLAGS}
|
||||
|
||||
eclipse : ${BIN}eclipse${EXE}
|
||||
|
||||
${BIN}eclipse${EXE} : ${ECLIPSE} ${SIM}
|
||||
- ${CC} ${ECLIPSE} ${SIM} ${ECLIPSE_OPT} -o $@ ${LDFLAGS}
|
||||
+ ${CC} ${CFLAGS} ${ECLIPSE} ${SIM} ${ECLIPSE_OPT} -o $@ ${LDFLAGS}
|
||||
|
||||
h316 : ${BIN}h316${EXE}
|
||||
|
||||
${BIN}h316${EXE} : ${H316} ${SIM}
|
||||
- ${CC} ${H316} ${SIM} ${H316_OPT} -o $@ ${LDFLAGS}
|
||||
+ ${CC} ${CFLAGS} ${H316} ${SIM} ${H316_OPT} -o $@ ${LDFLAGS}
|
||||
|
||||
hp2100 : ${BIN}hp2100${EXE}
|
||||
|
||||
${BIN}hp2100${EXE} : ${HP2100} ${SIM}
|
||||
- ${CC} ${HP2100} ${SIM} ${HP2100_OPT} -o $@ ${LDFLAGS}
|
||||
+ ${CC} ${CFLAGS} ${HP2100} ${SIM} ${HP2100_OPT} -o $@ ${LDFLAGS}
|
||||
|
||||
i1401 : ${BIN}i1401${EXE}
|
||||
|
||||
${BIN}i1401${EXE} : ${I1401} ${SIM}
|
||||
- ${CC} ${I1401} ${SIM} ${I1401_OPT} -o $@ ${LDFLAGS}
|
||||
+ ${CC} ${CFLAGS} ${I1401} ${SIM} ${I1401_OPT} -o $@ ${LDFLAGS}
|
||||
|
||||
i1620 : ${BIN}i1620${EXE}
|
||||
|
||||
${BIN}i1620${EXE} : ${I1620} ${SIM}
|
||||
- ${CC} ${I1620} ${SIM} ${I1620_OPT} -o $@ ${LDFLAGS}
|
||||
+ ${CC} ${CFLAGS} ${I1620} ${SIM} ${I1620_OPT} -o $@ ${LDFLAGS}
|
||||
|
||||
i7094 : ${BIN}i7094${EXE}
|
||||
|
||||
${BIN}i7094${EXE} : ${I7094} ${SIM}
|
||||
- ${CC} ${I7094} ${SIM} ${I7094_OPT} -o $@ ${LDFLAGS}
|
||||
+ ${CC} ${CFLAGS} ${I7094} ${SIM} ${I7094_OPT} -o $@ ${LDFLAGS}
|
||||
|
||||
ibm1130 : ${BIN}ibm1130${EXE}
|
||||
|
||||
${BIN}ibm1130${EXE} : ${IBM1130}
|
||||
- ${CC} ${IBM1130} ${SIM} ${IBM1130_OPT} -o $@ ${LDFLAGS}
|
||||
+ ${CC} ${CFLAGS} ${IBM1130} ${SIM} ${IBM1130_OPT} -o $@ ${LDFLAGS}
|
||||
|
||||
s3 : ${BIN}s3${EXE}
|
||||
|
||||
${BIN}s3${EXE} : ${S3} ${SIM}
|
||||
- ${CC} ${S3} ${SIM} ${S3_OPT} -o $@ ${LDFLAGS}
|
||||
+ ${CC} ${CFLAGS} ${S3} ${SIM} ${S3_OPT} -o $@ ${LDFLAGS}
|
||||
|
||||
altair : ${BIN}altair${EXE}
|
||||
|
||||
${BIN}altair${EXE} : ${ALTAIR} ${SIM}
|
||||
- ${CC} ${ALTAIR} ${SIM} ${ALTAIR_OPT} -o $@ ${LDFLAGS}
|
||||
+ ${CC} ${CFLAGS} ${ALTAIR} ${SIM} ${ALTAIR_OPT} -o $@ ${LDFLAGS}
|
||||
|
||||
altairz80 : ${BIN}altairz80${EXE}
|
||||
|
||||
${BIN}altairz80${EXE} : ${ALTAIRZ80} ${SIM}
|
||||
- ${CC} ${ALTAIRZ80} ${SIM} ${ALTAIRZ80_OPT} -o $@ ${LDFLAGS}
|
||||
+ ${CC} ${CFLAGS} ${ALTAIRZ80} ${SIM} ${ALTAIRZ80_OPT} -o $@ ${LDFLAGS}
|
||||
|
||||
gri : ${BIN}gri${EXE}
|
||||
|
||||
${BIN}gri${EXE} : ${GRI} ${SIM}
|
||||
- ${CC} ${GRI} ${SIM} ${GRI_OPT} -o $@ ${LDFLAGS}
|
||||
+ ${CC} ${CFLAGS} ${GRI} ${SIM} ${GRI_OPT} -o $@ ${LDFLAGS}
|
||||
|
||||
lgp : ${BIN}lgp${EXE}
|
||||
|
||||
${BIN}lgp${EXE} : ${LGP} ${SIM}
|
||||
- ${CC} ${LGP} ${SIM} ${LGP_OPT} -o $@ ${LDFLAGS}
|
||||
+ ${CC} ${CFLAGS} ${LGP} ${SIM} ${LGP_OPT} -o $@ ${LDFLAGS}
|
||||
|
||||
id16 : ${BIN}id16${EXE}
|
||||
|
||||
${BIN}id16${EXE} : ${ID16} ${SIM}
|
||||
- ${CC} ${ID16} ${SIM} ${ID16_OPT} -o $@ ${LDFLAGS}
|
||||
+ ${CC} ${CFLAGS} ${ID16} ${SIM} ${ID16_OPT} -o $@ ${LDFLAGS}
|
||||
|
||||
id32 : ${BIN}id32${EXE}
|
||||
|
||||
${BIN}id32${EXE} : ${ID32} ${SIM}
|
||||
- ${CC} ${ID32} ${SIM} ${ID32_OPT} -o $@ ${LDFLAGS}
|
||||
+ ${CC} ${CFLAGS} ${ID32} ${SIM} ${ID32_OPT} -o $@ ${LDFLAGS}
|
||||
|
||||
sds : ${BIN}sds${EXE}
|
||||
|
||||
${BIN}sds${EXE} : ${SDS} ${SIM}
|
||||
- ${CC} ${SDS} ${SIM} ${SDS_OPT} -o $@ ${LDFLAGS}
|
||||
+ ${CC} ${CFLAGS} ${SDS} ${SIM} ${SDS_OPT} -o $@ ${LDFLAGS}
|
||||
$OpenBSD: patch-makefile,v 1.15 2012/07/10 00:07:44 sthen Exp $
|
||||
--- makefile.orig Mon Apr 23 16:28:04 2012
|
||||
+++ makefile Fri Jul 6 20:09:32 2012
|
||||
@@ -145,7 +145,7 @@ ifeq ($(WIN32),) #*nix Environments (&& cygwin)
|
||||
ifeq (,$(NOASYNCH))
|
||||
OS_CCDEFS += -DSIM_ASYNCH_IO
|
||||
endif
|
||||
- OS_LDFLAGS += -lpthread
|
||||
+ OS_LDFLAGS += -pthread
|
||||
$(info using libpthread: $(call find_lib,pthread) $(call find_include,pthread))
|
||||
endif
|
||||
endif
|
||||
@@ -300,7 +300,7 @@ ifneq ($(DEBUG),)
|
||||
CFLAGS_O = -O0
|
||||
BUILD_FEATURES = - debugging support
|
||||
else
|
||||
- CFLAGS_O = -O2
|
||||
+ CFLAGS_O = $(CFLAGS)
|
||||
LDFLAGS_O =
|
||||
GCC_MAJOR_VERSION = $(firstword $(subst ., ,$(GCC_VERSION)))
|
||||
ifneq (3,$(GCC_MAJOR_VERSION))
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
$OpenBSD: patch-scp_c,v 1.15 2009/03/06 10:33:23 form Exp $
|
||||
--- scp.c.orig Sun Feb 8 10:09:34 2009
|
||||
+++ scp.c Tue Feb 10 22:30:48 2009
|
||||
@@ -675,8 +675,10 @@ while (stat != SCPE_EXIT) {
|
||||
else if (sim_vm_read != NULL) /* sim routine? */
|
||||
$OpenBSD: patch-scp_c,v 1.16 2012/07/10 00:07:45 sthen Exp $
|
||||
--- scp.c.orig Sun Mar 25 11:57:18 2012
|
||||
+++ scp.c Wed Jun 13 06:40:30 2012
|
||||
@@ -692,8 +692,10 @@ while (stat != SCPE_EXIT) {
|
||||
cptr = (*sim_vm_read) (cbuf, CBUFSIZE, stdin);
|
||||
else cptr = read_line (cbuf, CBUFSIZE, stdin); /* read command line */
|
||||
}
|
||||
else cptr = read_line_p ("sim> ", cbuf, CBUFSIZE, stdin);/* read with prmopt*/
|
||||
- if (cptr == NULL) /* ignore EOF */
|
||||
+ if (cptr == NULL) { /* ignore EOF */
|
||||
+ putchar('\n');
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-sim_console_c,v 1.2 2010/03/21 09:26:49 jasper Exp $
|
||||
--- sim_console.c.orig Thu Nov 20 13:50:44 2008
|
||||
+++ sim_console.c Tue Jan 26 13:12:30 2010
|
||||
@@ -111,7 +111,7 @@ extern DEVICE *sim_devices[];
|
||||
$OpenBSD: patch-sim_console_c,v 1.3 2012/07/10 00:07:45 sthen Exp $
|
||||
--- sim_console.c.orig Sun Mar 18 08:40:08 2012
|
||||
+++ sim_console.c Wed Jun 13 06:36:24 2012
|
||||
@@ -112,7 +112,7 @@ extern DEVICE *sim_devices[];
|
||||
/* Set/show data structures */
|
||||
|
||||
static CTAB set_con_tab[] = {
|
||||
|
||||
@ -1,26 +1,17 @@
|
||||
$OpenBSD: patch-sim_ether_c,v 1.12 2010/03/21 09:26:49 jasper Exp $
|
||||
--- sim_ether.c.orig Thu Apr 24 17:11:42 2008
|
||||
+++ sim_ether.c Tue Jan 26 13:12:30 2010
|
||||
@@ -919,7 +919,7 @@ t_stat eth_open(ETH_DEV* dev, char* name, DEVICE* dptr
|
||||
/* probably is not ethX and has no description */
|
||||
savname = eth_getname_byname(name, temp);
|
||||
if (savname == 0) /* didn't translate */
|
||||
- return SCPE_OPENERR;
|
||||
+ savname = name;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -945,14 +945,19 @@ t_stat eth_open(ETH_DEV* dev, char* name, DEVICE* dptr
|
||||
dev->dptr = dptr;
|
||||
dev->dbit = dbit;
|
||||
$OpenBSD: patch-sim_ether_c,v 1.13 2012/07/10 00:07:45 sthen Exp $
|
||||
--- sim_ether.c.orig Fri Mar 30 16:30:26 2012
|
||||
+++ sim_ether.c Wed Jun 13 06:47:21 2012
|
||||
@@ -1750,14 +1750,19 @@ strcpy(dev->name, savname);
|
||||
dev->dptr = dptr;
|
||||
dev->dbit = dbit;
|
||||
|
||||
-#if !defined(HAS_PCAP_SENDPACKET) && defined (xBSD) && !defined (__APPLE__)
|
||||
+#if defined(__FreeBSD__) || 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. */
|
||||
{
|
||||
int one = 1;
|
||||
ioctl(pcap_fileno(dev->handle), BIOCSHDRCMPLT, &one);
|
||||
/* Tell the kernel that the header is fully-formed when it gets it.
|
||||
This is required in order to fake the src address. */
|
||||
if (dev->eth_api == ETH_API_PCAP) {
|
||||
int one = 1;
|
||||
ioctl(pcap_fileno(dev->handle), BIOCSHDRCMPLT, &one);
|
||||
+#ifdef __OpenBSD__
|
||||
+ /* set direction filter */
|
||||
+ one = BPF_DIRECTION_OUT;
|
||||
@ -31,4 +22,4 @@ $OpenBSD: patch-sim_ether_c,v 1.12 2010/03/21 09:26:49 jasper Exp $
|
||||
+#endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ */
|
||||
|
||||
#if defined (USE_READER_THREAD)
|
||||
{
|
||||
if (1) {
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-sim_timer_c,v 1.3 2010/03/21 09:26:49 jasper Exp $
|
||||
--- sim_timer.c.orig Thu Nov 20 14:03:30 2008
|
||||
+++ sim_timer.c Tue Jan 26 13:12:30 2010
|
||||
@@ -298,7 +298,7 @@ return;
|
||||
|
||||
uint32 sim_os_ms_sleep_init (void)
|
||||
{
|
||||
-#if defined (_POSIX_SOURCE) /* POSIX-compliant */
|
||||
+#if defined (_POSIX_SOURCE) || defined(__OpenBSD__) /* POSIX-compliant */
|
||||
|
||||
struct timespec treq;
|
||||
uint32 msec;
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.26 2009/03/06 10:33:23 form Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.27 2012/07/10 00:07:45 sthen Exp $
|
||||
@bin bin/simh-altair
|
||||
@bin bin/simh-altairz80
|
||||
@bin bin/simh-eclipse
|
||||
@ -23,6 +23,8 @@
|
||||
@bin bin/simh-pdp9
|
||||
@bin bin/simh-s3
|
||||
@bin bin/simh-sds
|
||||
@bin bin/simh-swtp6800mp-a
|
||||
@bin bin/simh-swtp6800mp-a2
|
||||
@bin bin/simh-vax
|
||||
@bin bin/simh-vax780
|
||||
lib/simh/
|
||||
@ -30,7 +32,7 @@ lib/simh/vax/
|
||||
lib/simh/vax/ka655x.bin
|
||||
lib/simh/vax/vmb.exe
|
||||
share/doc/simh/
|
||||
share/doc/simh/0readme_38.txt
|
||||
share/doc/simh/0readme_39.txt
|
||||
share/doc/simh/0readme_ethernet.txt
|
||||
share/doc/simh/altair.txt
|
||||
share/doc/simh/eclipse.txt
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user