Update simh to 3.3.0. Too many new features and bug fixes to list here.

3 files changed, 64 insertions, 23 deletions

diff --git a/emulators/simh/patches/patch-aa b/emulators/simh/patches/patch-aa
index 5ba1a2b9a70..402c4d444a9 100644
--- a/emulators/simh/patches/patch-aa
+++ b/emulators/simh/patches/patch-aa
@@ -1,28 +1,41 @@
-$NetBSD: patch-aa,v 1.6 2003/05/31 16:10:53 thorpej Exp $
+$NetBSD: patch-aa,v 1.7 2004/12/22 21:07:01 skrll Exp $
 
---- Makefile.orig	2003-03-02 15:44:14.000000000 -0800
-+++ Makefile	2003-05-31 08:55:03.000000000 -0700
-@@ -3,24 +3,24 @@
+--- Makefile.orig	2004-10-30 18:32:50.000000000 +0100
++++ Makefile
+@@ -3,28 +3,30 @@
  # 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 -g -lm -I . 
+-ifeq ($(OSTYPE),solaris)
+-OS_CCDEFS = -lsocket -lnsl -lpthread -D_GNU_SOURCE
+-else
+-OS_CCDEFS = -D_GNU_SOURCE
+-endif
+-CC = gcc -std=c99 -O2 -U__STRICT_ANSI__ -g -lm $(OS_CCDEFS) -I .
 -ifeq ($(USE_NETWORK),)
 -else
-+#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 ($(OSTYPE),solaris)
++#OS_CCDEFS = -lsocket -lnsl -lpthread -D_GNU_SOURCE
++#else
++#OS_CCDEFS = -D_GNU_SOURCE
++#endif
++#CC = gcc -std=c99 -O2 -U__STRICT_ANSI__ -g -lm $(OS_CCDEFS) -I .
++CC = gcc -O2 -g -lm -I . -DDONT_USE_PCAP_FINDALLDEVS -DNEED_PCAP_SENDPACKET
++#ifeq ($(USE_NETWORK),)
++#else
++#NETWORK_OPT = -DUSE_NETWORK -isystem /usr/local/include /usr/local/lib/libpcap.a
++NETWORK_OPT = -DUSE_NETWORK -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
@@ -30,7 +43,7 @@ $NetBSD: patch-aa,v 1.6 2003/05/31 16:10:53 thorpej 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
@@ -40,7 +53,7 @@ $NetBSD: patch-aa,v 1.6 2003/05/31 16:10:53 thorpej Exp $
  
  
  #
-@@ -223,11 +223,11 @@
+@@ -252,11 +254,11 @@ ALL = ${BIN}pdp1${EXE} ${BIN}pdp4${EXE} 
  all : ${ALL}
  
  clean :
diff --git a/emulators/simh/patches/patch-ab b/emulators/simh/patches/patch-ab
index 48ccaee8cab..11179bfc0b0 100644
--- a/emulators/simh/patches/patch-ab
+++ b/emulators/simh/patches/patch-ab
@@ -1,11 +1,27 @@
-$NetBSD: patch-ab,v 1.4 2003/05/31 16:10:53 thorpej Exp $
+$NetBSD: patch-ab,v 1.5 2004/12/22 21:07:01 skrll Exp $
 
---- sim_ether.c.orig	2003-01-16 09:45:04.000000000 -0800
-+++ sim_ether.c	2003-05-31 08:51:54.000000000 -0700
-@@ -383,6 +383,14 @@
-     /* set data in passed read packet */
+--- sim_ether.c.orig	2004-03-31 13:38:58.000000000 +0100
++++ sim_ether.c
+@@ -830,6 +830,15 @@ void eth_callback(u_char* info, const st
+     tmp_packet.len = header->len;
+     memcpy(tmp_packet.msg, data, header->len);
+ 
++    /*
++     * Pad packet to minimum ethernet len, in case it comes from the local
++     * host.
++     */
++    if (header->len < 60) {
++        tmp_packet.len = 60;
++        memset(dev->read_packet->msg + header->len, 0, 60 - header->len);
++    }
++
+     eth_packet_trace (dev, tmp_packet.msg, tmp_packet.len, "rcvqd");
+ 
+     pthread_mutex_lock (&dev->lock);
+@@ -840,6 +849,15 @@ void eth_callback(u_char* info, const st
      dev->read_packet->len = header->len;
      memcpy(dev->read_packet->msg, data, header->len);
+ 
 +    /*
 +     * Pad packet to minimum ethernet len, in case it comes from the local
 +     * host.
@@ -14,6 +30,18 @@ $NetBSD: patch-ab,v 1.4 2003/05/31 16:10:53 thorpej Exp $
 +        dev->read_packet->len = 60;
 +        memset(dev->read_packet->msg + header->len, 0, 60 - header->len);
 +    }
++
+     eth_packet_trace (dev, dev->read_packet->msg, dev->read_packet->len, "reading");
+ 
+     /* call optional read callback function */
+@@ -1080,8 +1098,10 @@ int eth_host_devices(int used, int max, 
+ 
+ int eth_devices(int max, ETH_LIST* list)
+ {
++#ifndef DONT_USE_PCAP_FINDALLDEVS
+   pcap_if_t* alldevs;
+   pcap_if_t* dev;
++#endif
+   int i = 0;
+   char errbuf[PCAP_ERRBUF_SIZE];
  
- #ifdef ETH_DEBUG
-     eth_packet_trace (dev->read_packet, "reading");
diff --git a/emulators/simh/patches/patch-ac b/emulators/simh/patches/patch-ac
index 42ad0b2dddd..02ef9cec68d 100644
--- a/emulators/simh/patches/patch-ac
+++ b/emulators/simh/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2003/09/26 21:36:11 jmmv Exp $
+$NetBSD: patch-ac,v 1.4 2004/12/22 21:07:01 skrll Exp $
 
---- scp.c.orig	Thu Sep 11 17:24:08 2003
-+++ scp.c
-@@ -3731,13 +3731,13 @@ for (i = 0; i < sec; i++) {				/* loop *
+--- sim_console.c.orig	2004-11-05 19:39:24.000000000 +0000
++++ sim_console.c
+@@ -347,13 +347,13 @@ for (i = 0; i < sec; i++) {				/* loop *
  	if (tmxr_poll_conn (&sim_con_tmxr) >= 0) {	/* poll connect */
  	    sim_con_ldsc.rcve = 1;			/* rcv enabled */
  	    if (i) {					/* if delayed */