cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to simh-3.4-0; ok fgsch@ kettenis@

Browse Source 
adds extended memory support for VAX allowing up to 512MB of memory
This commit is contained in:
david 2005-06-19 03:47:25 +00:00
parent 47d540a434
commit ffa7adc015
10 changed files with 114 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
emulators/simh/Makefile
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.47 2004/11/27 10:39:14 espie Exp $
# $OpenBSD: Makefile,v 1.48 2005/06/19 03:47:25 david 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-3.0-2
DISTNAME= simh-3.4-0
CATEGORIES= emulators
MASTER_SITES= http://simh.trailing-edge.com/sources/
DISTFILES= simhv30-2.zip
DISTFILES= simhv34-0.zip
HOMEPAGE= http://simh.trailing-edge.com/
@ -23,7 +23,7 @@ WRKDIST= ${WRKDIR}
UNZIP= unzip -a -o
COPTS+= -DUSE_SOCKLEN_T \
-DPATH_KA655_BIN=\"${PREFIX}/lib/simh/vax/ka655.bin\"
-DPATH_KA655X_BIN=\"${PREFIX}/lib/simh/vax/ka655x.bin\"
MAKE_FILE= makefile
NO_REGRESS= Yes
@ -38,6 +38,7 @@ do-install:
done;
${INSTALL_DATA_DIR} ${PREFIX}/lib/simh/vax
${INSTALL_DATA} ${WRKDIST}/VAX/ka655.bin ${PREFIX}/lib/simh/vax
${INSTALL_DATA} ${WRKDIST}/VAX/ka655x.bin ${PREFIX}/lib/simh/vax
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/simh
${INSTALL_DATA} ${WRKBUILD}/*.txt ${WRKBUILD}/*/*.txt \
${PREFIX}/share/doc/simh

8
emulators/simh/distinfo
View File

@ -1,4 +1,4 @@
MD5 (simhv30-2.zip) = 3747e8b28b284ba06edc0c7ea549abe4
RMD160 (simhv30-2.zip) = 07bbc046fa3234ccd46f3b9ff1f96673a8ea2af3
SHA1 (simhv30-2.zip) = 539822d9c3c87a49483c3a14310a02bee1372c09
SIZE (simhv30-2.zip) = 1757964
MD5 (simhv34-0.zip) = 64d6153312257fcadf5c704cb939cf0c
RMD160 (simhv34-0.zip) = d2ea0cfd47190db462756bd8a228f8df8fed7678
SHA1 (simhv34-0.zip) = 7eb2e89e7fe73da0813fa2f776d4d6e4a3960e33
SIZE (simhv34-0.zip) = 2138255

28
emulators/simh/patches/patch-VAX_vax_cpu_c
View File

@ -1,28 +0,0 @@
$OpenBSD: patch-VAX_vax_cpu_c,v 1.3 2003/09/23 06:57:38 grange Exp $
--- VAX/vax_cpu.c.orig 2003-05-17 13:19:42.000000000 +0700
+++ VAX/vax_cpu.c 2003-08-26 12:36:08.000000000 +0700
@@ -140,6 +140,10 @@
#include "vax_defs.h"
+#ifndef PATH_KA655_BIN
+#define PATH_KA655_BIN "ka655.bin"
+#endif
+
#define OP_MEM -1
#define UNIT_V_CONH (UNIT_V_UF + 0) /* halt to console */
#define UNIT_V_MSIZE (UNIT_V_UF + 1) /* dummy */
@@ -2348,10 +2352,10 @@ conpc = 0;
conpsl = PSL_IS | PSL_IPL1F | CON_PWRUP;
if (rom == NULL) return SCPE_IERR;
if (*rom == 0) { /* no boot? */
- printf ("Loading boot code from ka655.bin\n");
+ printf ("Loading boot code from %s\n", PATH_KA655_BIN);
if (sim_log) fprintf (sim_log,
- "Loading boot code from ka655.bin\n");
- r = load_cmd (0, "-R ka655.bin");
+ "Loading boot code from %s\n", PATH_KA655_BIN);
+ r = load_cmd (0, "-R " PATH_KA655_BIN);
if (r != SCPE_OK) return r; }
return SCPE_OK;
}

28
emulators/simh/patches/patch-VAX_vax_sysdev_c Normal file
View File

@ -0,0 +1,28 @@
$OpenBSD: patch-VAX_vax_sysdev_c,v 1.1 2005/06/19 03:47:25 david Exp $
--- VAX/vax_sysdev.c.orig Thu Mar 10 17:46:32 2005
+++ VAX/vax_sysdev.c Sat Jun 18 03:33:38 2005
@@ -51,6 +51,10 @@
#include "vax_defs.h"
+#ifndef PATH_KA655X_BIN
+#define PATH_KA655X_BIN "ka655x.bin"
+#endif
+
#define UNIT_V_NODELAY (UNIT_V_UF + 0) /* ROM access equal to RAM access */
#define UNIT_NODELAY (1u << UNIT_V_NODELAY)
@@ -1369,10 +1373,10 @@ conpc = 0;
conpsl = PSL_IS | PSL_IPL1F | CON_PWRUP;
if (rom == NULL) return SCPE_IERR;
if (*rom == 0) { /* no boot? */
- printf ("Loading boot code from ka655x.bin\n");
+ printf ("Loading boot code from %s\n", PATH_KA655X_BIN);
if (sim_log) fprintf (sim_log,
- "Loading boot code from ka655x.bin\n");
- r = load_cmd (0, "-R ka655x.bin");
+ "Loading boot code from %s\n", PATH_KA655X_BIN);
+ r = load_cmd (0, "-R " PATH_KA655X_BIN);
if (r != SCPE_OK) return r; }
return SCPE_OK;
}

167
emulators/simh/patches/patch-makefile
View File

@ -1,30 +1,38 @@
$OpenBSD: patch-makefile,v 1.7 2003/06/24 22:24:39 pvalchev Exp $
--- makefile.orig Sun Mar 2 15:44:14 2003
+++ makefile Sat Jun 14 05:07:07 2003
@@ -3,24 +3,26 @@
$OpenBSD: patch-makefile,v 1.8 2005/06/19 03:47:25 david Exp $
--- makefile.orig Thu Apr 7 16:56:36 2005
+++ makefile Sat Jun 18 03:49:17 2005
@@ -3,28 +3,29 @@
# Note: -O2 is sometimes broken in GCC when setjump/longjump is being
# used. Try -O2 only with released simulators.
#
-ifeq ($(WIN32),)
+#ifeq ($(WIN32),)
#Unix Environments
-CC = gcc -O2 -lm -I .
+#CC = gcc -O2 -lm -I .
#CC = gcc -O2 -g -lm -I .
-ifeq ($(OSTYPE),solaris)
-OS_CCDEFS = -lsocket -lnsl -lpthread -D_GNU_SOURCE
-else
-OS_CCDEFS = -D_GNU_SOURCE
-endif
+#ifeq ($(OSTYPE),solaris)
+#OS_CCDEFS = -lsocket -lnsl -lpthread -D_GNU_SOURCE
+#else
+OS_CCDEFS = -D_GNU_SOURCE ${CFLAGS}
+#endif
CC = gcc -std=c99 -O2 -U__STRICT_ANSI__ -g -lm $(OS_CCDEFS) -I .
-ifeq ($(USE_NETWORK),)
-else
+CFLAGS += -I.
+LDFLAGS += -lm
+#ifeq ($(USE_NETWORK),)
+#else
NETWORK_OPT = -DUSE_NETWORK -lpcap
-NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a
-endif
-else
+#ifeq ($(USE_NETWORK),)
+#else
+#NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a
+NETWORK_OPT = -DUSE_NETWORK -DNEED_PCAP_SENDPACKET -DDONT_USE_PCAP_FINDALLDEVS -lpcap
+#endif
+#else
#Win32 Environments
-LDFLAGS = -lm -lwsock32
-CC = gcc -O0 -I.
-CC = gcc -std=c99 -U__STRICT_ANSI__ -O0 -I.
-EXE = .exe
-ifeq ($(USE_NETWORK),)
-else
@ -32,7 +40,7 @@ $OpenBSD: patch-makefile,v 1.7 2003/06/24 22:24:39 pvalchev Exp $
-endif
-endif
+#LDFLAGS = -lm -lwsock32
+#CC = gcc -O0 -I.
+#CC = gcc -std=c99 -U__STRICT_ANSI__ -O0 -I.
+#EXE = .exe
+#ifeq ($(USE_NETWORK),)
+#else
@ -42,7 +50,7 @@ $OpenBSD: patch-makefile,v 1.7 2003/06/24 22:24:39 pvalchev Exp $
#
@@ -223,117 +225,117 @@ ALL = ${BIN}pdp1${EXE} ${BIN}pdp4${EXE}
@@ -253,11 +254,11 @@ ALL = ${BIN}pdp1${EXE} ${BIN}pdp4${EXE}
all : ${ALL}
clean :
@ -58,132 +66,3 @@ $OpenBSD: patch-makefile,v 1.7 2003/06/24 22:24:39 pvalchev Exp $
#
# Individual builds
#
${BIN}pdp1${EXE} : ${PDP1} ${SIM}
- ${CC} ${PDP1} ${SIM} ${PDP1_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${CFLAGS} ${PDP1} ${SIM} ${PDP1_OPT} -o $@ ${LDFLAGS}
${BIN}pdp4${EXE} : ${PDP18B} ${SIM}
- ${CC} ${PDP18B} ${SIM} ${PDP4_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${CFLAGS} ${PDP18B} ${SIM} ${PDP4_OPT} -o $@ ${LDFLAGS}
${BIN}pdp7${EXE} : ${PDP18B} ${SIM}
- ${CC} ${PDP18B} ${SIM} ${PDP7_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${CFLAGS} ${PDP18B} ${SIM} ${PDP7_OPT} -o $@ ${LDFLAGS}
${BIN}pdp8${EXE} : ${PDP8} ${SIM}
- ${CC} ${PDP8} ${SIM} ${PDP8_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${CFLAGS} ${PDP8} ${SIM} ${PDP8_OPT} -o $@ ${LDFLAGS}
${BIN}pdp9${EXE} : ${PDP18B} ${SIM}
- ${CC} ${PDP18B} ${SIM} ${PDP9_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${CFLAGS} ${PDP18B} ${SIM} ${PDP9_OPT} -o $@ ${LDFLAGS}
${BIN}pdp15${EXE} : ${PDP18B} ${SIM}
- ${CC} ${PDP18B} ${SIM} ${PDP15_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${CFLAGS} ${PDP18B} ${SIM} ${PDP15_OPT} -o $@ ${LDFLAGS}
${BIN}pdp10${EXE} : ${PDP10} ${SIM}
- ${CC} ${PDP10} ${SIM} ${PDP10_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${CFLAGS} ${PDP10} ${SIM} ${PDP10_OPT} -o $@ ${LDFLAGS}
${BIN}pdp11${EXE} : ${PDP11} ${SIM}
- ${CC} ${PDP11} ${SIM} ${PDP11_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${CFLAGS} ${PDP11} ${SIM} ${PDP11_OPT} -o $@ ${LDFLAGS}
${BIN}vax${EXE} : ${VAX} ${SIM}
- ${CC} ${VAX} ${SIM} ${VAX_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${CFLAGS} ${VAX} ${SIM} ${VAX_OPT} -o $@ ${LDFLAGS}
${BIN}nova${EXE} : ${NOVA} ${SIM}
- ${CC} ${NOVA} ${SIM} ${NOVA_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${CFLAGS} ${NOVA} ${SIM} ${NOVA_OPT} -o $@ ${LDFLAGS}
${BIN}eclipse${EXE} : ${ECLIPSE} ${SIM}
- ${CC} ${ECLIPSE} ${SIM} ${ECLIPSE_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${CFLAGS} ${ECLIPSE} ${SIM} ${ECLIPSE_OPT} -o $@ ${LDFLAGS}
${BIN}h316${EXE} : ${H316} ${SIM}
- ${CC} ${H316} ${SIM} ${H316_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${CFLAGS} ${H316} ${SIM} ${H316_OPT} -o $@ ${LDFLAGS}
${BIN}hp2100${EXE} : ${HP2100} ${SIM}
- ${CC} ${HP2100} ${SIM} ${HP2100_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${CFLAGS} ${HP2100} ${SIM} ${HP2100_OPT} -o $@ ${LDFLAGS}
${BIN}i1401${EXE} : ${I1401} ${SIM}
- ${CC} ${I1401} ${SIM} ${I1401_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${CFLAGS} ${I1401} ${SIM} ${I1401_OPT} -o $@ ${LDFLAGS}
${BIN}i1620${EXE} : ${I1620} ${SIM}
- ${CC} ${I1620} ${SIM} ${I1620_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${CFLAGS} ${I1620} ${SIM} ${I1620_OPT} -o $@ ${LDFLAGS}
${BIN}ibm1130${EXE} : ${IBM1130}
- ${CC} ${IBM1130} ${SIM} ${IBM1130_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${CFLAGS} ${IBM1130} ${SIM} ${IBM1130_OPT} -o $@ ${LDFLAGS}
${BIN}s3${EXE} : ${S3} ${SIM}
- ${CC} ${S3} ${SIM} ${S3_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${CFLAGS} ${S3} ${SIM} ${S3_OPT} -o $@ ${LDFLAGS}
${BIN}altair${EXE} : ${ALTAIR} ${SIM}
- ${CC} ${ALTAIR} ${SIM} ${ALTAIR_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${CFLAGS} ${ALTAIR} ${SIM} ${ALTAIR_OPT} -o $@ ${LDFLAGS}
${BIN}altairz80${EXE} : ${ALTAIRZ80} ${SIM}
- ${CC} ${ALTAIRZ80} ${SIM} ${ALTAIRZ80_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${CFLAGS} ${ALTAIRZ80} ${SIM} ${ALTAIRZ80_OPT} -o $@ ${LDFLAGS}
${BIN}gri${EXE} : ${GRI} ${SIM}
- ${CC} ${GRI} ${SIM} ${GRI_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${CFLAGS} ${GRI} ${SIM} ${GRI_OPT} -o $@ ${LDFLAGS}
${BIN}id16${EXE} : ${ID16} ${SIM}
- ${CC} ${ID16} ${SIM} ${ID16_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${CFLAGS} ${ID16} ${SIM} ${ID16_OPT} -o $@ ${LDFLAGS}
${BIN}id32${EXE} : ${ID32} ${SIM}
- ${CC} ${ID32} ${SIM} ${ID32_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${CFLAGS} ${ID32} ${SIM} ${ID32_OPT} -o $@ ${LDFLAGS}
${BIN}sds${EXE} : ${SDS} ${SIM}
- ${CC} ${SDS} ${SIM} ${SDS_OPT} -o $@ ${LDFLAGS}
+ ${CC} ${CFLAGS} ${SDS} ${SIM} ${SDS_OPT} -o $@ ${LDFLAGS}

8
emulators/simh/patches/patch-scp_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-scp_c,v 1.8 2003/05/28 16:31:07 fgsch Exp $
--- scp.c.orig Mon Mar 3 16:05:26 2003
+++ scp.c Wed May 28 13:23:37 2003
@@ -581,7 +581,10 @@ while (stat != SCPE_EXIT) { /* in cas
$OpenBSD: patch-scp_c,v 1.9 2005/06/19 03:47:25 david Exp $
--- scp.c.orig Tue May 3 06:55:10 2005
+++ scp.c Fri Jun 17 21:31:30 2005
@@ -602,7 +602,10 @@ while (stat != SCPE_EXIT) { /* in cas
else if (sim_vm_read != NULL) /* sim routine? */
cptr = (*sim_vm_read) (cbuf, CBUFSIZE, stdin);
else cptr = read_line (cbuf, CBUFSIZE, stdin); /* read command line */

32
emulators/simh/patches/patch-sim_ether_c Normal file
View File

@ -0,0 +1,32 @@
$OpenBSD: patch-sim_ether_c,v 1.3 2005/06/19 03:47:25 david Exp $
--- sim_ether.c.orig Wed Mar 31 14:38:58 2004
+++ sim_ether.c Wed Oct 20 19:46:41 2004
@@ -557,6 +557,12 @@ int pcap_sendpacket(pcap_t* handle, cons
}
#endif /* !HAS_PCAP_SENDPACKET */
+int pcap_setnonblock(pcap_t* handle, int nonblock, char *errbuf)
+{
+ fcntl(pcap_fileno(handle), F_SETFL, fcntl(pcap_fileno(handle), F_GETFL, 0) | O_NONBLOCK);
+ return 0;
+}
+
#if defined (USE_READER_THREAD)
#include <pthread.h>
@@ -1080,12 +1086,13 @@ int eth_host_devices(int used, int max,
int eth_devices(int max, ETH_LIST* list)
{
+ int i = 0;
+
+#ifndef DONT_USE_PCAP_FINDALLDEVS
pcap_if_t* alldevs;
pcap_if_t* dev;
- int i = 0;
char errbuf[PCAP_ERRBUF_SIZE];
-#ifndef DONT_USE_PCAP_FINDALLDEVS
/* retrieve the device list */
if (pcap_findalldevs(&alldevs, errbuf) == -1) {
char* msg = "Eth: error in pcap_findalldevs: %s\r\n";

12
emulators/simh/patches/patch-sim_sock_c
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-sim_sock_c,v 1.4 2003/02/02 20:19:56 fgsch Exp $
--- sim_sock.c.orig Thu Jan 2 12:27:10 2003
+++ sim_sock.c Sun Feb 2 16:37:44 2003
@@ -178,7 +178,7 @@ return newsock; /* got it! */
$OpenBSD: patch-sim_sock_c,v 1.5 2005/06/19 03:47:25 david Exp $
--- sim_sock.c.orig Thu Apr 14 18:04:40 2005
+++ sim_sock.c Fri Jun 17 21:30:01 2005
@@ -184,7 +184,7 @@ return newsock; /* got it! */
SOCKET sim_accept_conn (SOCKET master, uint32 *ipaddr)
{
int32 sta, err;
-#if defined (macintosh)
+#if defined (macintosh) || defined (USE_SOCKLEN_T)
socklen_t size;
#elif defined (WIN32) || defined (__EMX__)
int size;
#elif defined (_WIN32) || defined (__EMX__) || defined (__APPLE__) ||\
(defined (__ALPHA) && defined (__unix__))

7
emulators/simh/pkg/DESCR
View File

@ -8,13 +8,14 @@ and to publish them as freeware on the Internet, with freely available
copies of significant or representative software.
Simulators included in this package:
- Data Central Nova, Eclipse
- Data General Nova, Eclipse
- Digital Equipment Corporation PDP-1, PDP-4, PDP-7, PDP-8, PDP-9,
PDP-10, PDP-11, PDP-15, VAX
- GRI Corporation GRI-909
- IBM 1401, 1620, 1130, System 3
- Interdata (Perkin-Elmer) 16b and 32b systems
- Hewlett Packard HP 2116, 2100, 21MX
- Honeywell H316
- Hewlett-Packard 2116, 2100, 21MX
- Honeywell H316/H516
- MITS Altair 8800, with both 8080 and Z80
- Royal-Mcbee LGP-30, LGP-21
- Scientific Data Systems SDS 940

10
emulators/simh/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.16 2004/09/15 00:42:04 espie Exp $
@comment $OpenBSD: PLIST,v 1.17 2005/06/19 03:47:25 david Exp $
bin/simh-altair
bin/simh-altairz80
bin/simh-eclipse
@ -10,6 +10,7 @@ bin/simh-i1620
bin/simh-ibm1130
bin/simh-id16
bin/simh-id32
bin/simh-lgp
bin/simh-nova
bin/simh-pdp1
bin/simh-pdp10
@ -25,11 +26,12 @@ bin/simh-vax
lib/simh/
lib/simh/vax/
lib/simh/vax/ka655.bin
lib/simh/vax/ka655x.bin
share/doc/simh/
share/doc/simh/0readme_30.txt
share/doc/simh/0readme_34.txt
share/doc/simh/0readme_ethernet.txt
share/doc/simh/altair.txt
share/doc/simh/altairz80.txt
share/doc/simh/altairz80_doc.txt
share/doc/simh/eclipse.txt
share/doc/simh/gri_doc.txt
share/doc/simh/h316_doc.txt
@ -40,10 +42,12 @@ share/doc/simh/i1401_doc.txt
share/doc/simh/i1620_doc.txt
share/doc/simh/id_diag.txt
share/doc/simh/id_doc.txt
share/doc/simh/lgp_doc.txt
share/doc/simh/nova_doc.txt
share/doc/simh/pdp10_diag.txt
share/doc/simh/pdp10_doc.txt
share/doc/simh/pdp11_doc.txt
share/doc/simh/pdp18b_diag.txt
share/doc/simh/pdp18b_doc.txt
share/doc/simh/pdp1_doc.txt
share/doc/simh/pdp8_doc.txt