upgrade to 2.9.1

This commit is contained in:
form 2002-02-18 07:45:59 +00:00
parent 6d0aace6b2
commit d698d76c88
5 changed files with 130 additions and 26 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.14 2002/02/04 10:56:39 form Exp $
# $OpenBSD: Makefile,v 1.15 2002/02/18 07:45:59 form 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.0
DISTNAME= simh-2.9.1
CATEGORIES= emulators
MASTER_SITES= ftp://ftp.openbsd.ru/pub/OpenBSD/distfiles/ \
http://simh.trailing-edge.com/sources/

View File

@ -1,6 +1,3 @@
MD5 (simhv29.zip) = edd4a67d58389bbcc476da2fdaafd4a6
MD5 (vaxpre.zip) = a30780340b7c1f174e308a9ba57ae7b4
RMD160 (simhv29.zip) = 46b6d134cb564f40d06ad8e37302c43005161b45
RMD160 (vaxpre.zip) = 7f993563d5e52132af33ccac7a51ba02195e6b2e
SHA1 (simhv29.zip) = 491b46bc8b03f39d1fa0d6ae5274e0a6a8fecad0
SHA1 (vaxpre.zip) = 47d223d278ba5de78c5a337bf80fe2b38858ce16
MD5 (simhv29.zip) = f1c37c422006c986b375abfbf974edc9
RMD160 (simhv29.zip) = 0329f2bd0824a990a6937341eb0f3e822b0a86f2
SHA1 (simhv29.zip) = cc4ae72597e7d3ae8a1f8218ebec409c9e81b2d8

View File

@ -1,24 +1,130 @@
$OpenBSD: patch-Makefile,v 1.1 2002/02/04 10:56:39 form Exp $
--- Makefile.orig Mon Feb 4 11:48:18 2002
+++ Makefile Mon Feb 4 11:50:20 2002
@@ -146,16 +146,16 @@ ALTAIR_OPT = -I ${ALTAIRD}
$OpenBSD: patch-Makefile,v 1.2 2002/02/18 07:45:59 form Exp $
--- Makefile.orig Mon Feb 18 13:35:54 2002
+++ Makefile Mon Feb 18 13:36:31 2002
@@ -3,9 +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 -g -lm -I .
-
+CFLAGS += -lm -I.
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}
#
@@ -148,7 +148,7 @@ ALTAIRZ80_OPT = -I ${ALTAIRZ80D}
# Build everything
#
all : ${BIN}pdp1 ${BIN}pdp4 ${BIN}pdp7 ${BIN}pdp8 ${BIN}pdp9 ${BIN}pdp15 \
- ${BIN}pdp11 ${BIN}pdp10 ${BIN}vax ${BIN}nova ${BIN}eclipse ${BIN}h316 \
- ${BIN}hp2100 ${BIN}id4 ${BIN}i1401 ${BIN}sds ${BIN}s3 ${BIN}altair \
+ ${BIN}pdp11 ${BIN}pdp10 ${BIN}nova ${BIN}eclipse ${BIN}h316 \
+ ${BIN}hp2100 ${BIN}i1401 ${BIN}s3 ${BIN}altair \
${BIN}hp2100 ${BIN}i1401 ${BIN}s3 ${BIN}altair \
${BIN}altairz80
@@ -158,87 +158,87 @@ all : ${BIN}pdp1 ${BIN}pdp4 ${BIN}pdp7 $
# Individual builds
#
${BIN}pdp1 : ${PDP1} ${SIM}
- ${CC} ${PDP1} ${SIM} ${PDP1_OPT} -o $@
+ ${CC} ${CFLAGS} ${PDP1} ${SIM} ${PDP1_OPT} -o $@
${BIN}pdp4 : ${PDP18B} ${SIM}
- ${CC} ${PDP18B} ${SIM} ${PDP4_OPT} -o $@
+ ${CC} ${CFLAGS} ${PDP18B} ${SIM} ${PDP4_OPT} -o $@
${BIN}pdp7 : ${PDP18B} ${SIM}
- ${CC} ${PDP18B} ${SIM} ${PDP7_OPT} -o $@
+ ${CC} ${CFLAGS} ${PDP18B} ${SIM} ${PDP7_OPT} -o $@
${BIN}pdp8 : ${PDP8} ${SIM}
- ${CC} ${PDP8} ${SIM} ${PDP8_OPT} -o $@
+ ${CC} ${CFLAGS} ${PDP8} ${SIM} ${PDP8_OPT} -o $@
${BIN}pdp9 : ${PDP18B} ${SIM}
- ${CC} ${PDP18B} ${SIM} ${PDP9_OPT} -o $@
+ ${CC} ${CFLAGS} ${PDP18B} ${SIM} ${PDP9_OPT} -o $@
${BIN}pdp15 : ${PDP18B} ${SIM}
- ${CC} ${PDP18B} ${SIM} ${PDP15_OPT} -o $@
+ ${CC} ${CFLAGS} ${PDP18B} ${SIM} ${PDP15_OPT} -o $@
${BIN}pdp10 : ${PDP10} ${SIM}
- ${CC} ${PDP10} ${SIM} ${PDP10_OPT} -o $@
+ ${CC} ${CFLAGS} ${PDP10} ${SIM} ${PDP10_OPT} -o $@
${BIN}pdp11 : ${PDP11} ${SIM}
- ${CC} ${PDP11} ${SIM} ${PDP11_OPT} -o $@
+ ${CC} ${CFLAGS} ${PDP11} ${SIM} ${PDP11_OPT} -o $@
${BIN}vax : ${VAX} ${SIM}
- ${CC} ${VAX} ${SIM} ${VAX_OPT} -o $@
+ ${CC} ${CFLAGS} ${VAX} ${SIM} ${VAX_OPT} -o $@
${BIN}nova : ${NOVA} ${SIM}
- ${CC} ${NOVA} ${SIM} ${NOVA_OPT} -o $@
+ ${CC} ${CFLAGS} ${NOVA} ${SIM} ${NOVA_OPT} -o $@
${BIN}eclipse : ${ECLIPSE} ${SIM}
- ${CC} ${ECLIPSE} ${SIM} ${ECLIPSE_OPT} -o $@
+ ${CC} ${CFLAGS} ${ECLIPSE} ${SIM} ${ECLIPSE_OPT} -o $@
${BIN}h316 : ${H316} ${SIM}
- ${CC} ${H316} ${SIM} ${H316_OPT} -o $@
+ ${CC} ${CFLAGS} ${H316} ${SIM} ${H316_OPT} -o $@
${BIN}hp2100 : ${HP2100} ${SIM}
- ${CC} ${HP2100} ${SIM} ${HP2100_OPT} -o $@
+ ${CC} ${CFLAGS} ${HP2100} ${SIM} ${HP2100_OPT} -o $@
${BIN}i1401 : ${I1401} ${SIM}
- ${CC} ${I1401} ${SIM} ${I1401_OPT} -o $@
+ ${CC} ${CFLAGS} ${I1401} ${SIM} ${I1401_OPT} -o $@
${BIN}sds : ${SDS} ${SIM}
- ${CC} ${SDS} ${SIM} ${SDS_OPT} -o $@
+ ${CC} ${CFLAGS} ${SDS} ${SIM} ${SDS_OPT} -o $@
${BIN}s3 : ${S3} ${SIM}
- ${CC} ${S3} ${SIM} ${S3_OPT} -o $@
+ ${CC} ${CFLAGS} ${S3} ${SIM} ${S3_OPT} -o $@
${BIN}altair : ${ALTAIR} ${SIM}
- ${CC} ${ALTAIR} ${SIM} ${ALTAIR_OPT} -o $@
+ ${CC} ${CFLAGS} ${ALTAIR} ${SIM} ${ALTAIR_OPT} -o $@
${BIN}altairz80 : ${ALTAIRZ80} ${SIM}
- ${CC} ${ALTAIRZ80_OPT} ${ALTAIRZ80} ${SIM} -o $@
+ ${CC} ${CFLAGS} ${ALTAIRZ80_OPT} ${ALTAIRZ80} ${SIM} -o $@

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-scp_c,v 1.2 2002/02/04 10:56:39 form Exp $
--- scp.c.orig Mon Feb 4 11:39:21 2002
+++ scp.c Mon Feb 4 11:39:21 2002
@@ -1436,7 +1436,7 @@ for (i = 1; (dptr = sim_devices[i]) != N
$OpenBSD: patch-scp_c,v 1.3 2002/02/18 07:45:59 form Exp $
--- scp.c.orig Mon Feb 18 13:28:48 2002
+++ scp.c Mon Feb 18 13:28:49 2002
@@ -1437,7 +1437,7 @@ for (i = 1; (dptr = sim_devices[i]) != N
(UNIT_ATT + UNIT_SEQ))
fseek (uptr -> fileref, uptr -> pos, SEEK_SET); } }
stop_cpu = 0;

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.5 2002/02/04 10:56:39 form Exp $
@comment $OpenBSD: PLIST,v 1.6 2002/02/18 07:45:59 form Exp $
bin/simh-altair
bin/simh-altairz80
bin/simh-eclipse
@ -29,6 +29,7 @@ share/doc/simh/pdp11_doc.txt
share/doc/simh/pdp18b_doc.txt
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/simh_doc.txt
share/doc/simh/simh_swre.txt