Update to 3.0.2. From Todd Vierling in PR pkg/22967. Changes:

1. New Features in 3.0-2

1.1 PDP-1
- The LOAD command takes an optional argument specifying the memory field
  to be loaded.
- The PTR BOOT command takes its starting memory field from the TA (address
  switch) register.

2. Bugs Fixed in 3.0-2

2.1 SCP and libraries
- Fixed end of file problem in dep, idep.
- Fixed handling of trailing spaces in dep, idep.

2.2 PDP-1
- Fixed system hang if continue after PTR error.
- Fixed PTR to start/stop on successive rpa instructions.

2.3 PDP 18b family
- Fixed priorities in PDP-15 API (differs from PDP-9).
- Fixed sign handling in PDP-15 EAE unsigned mul/div (differs from PDP-9).
- Fixed bug in CAF, clears API subsystem.

2.4 1401
- Fixed tape read end-of-record handling based on real 1401.
- Added diagnostic read (space forward).

2.5 1620
- Fixed bug in immediate index add (found by Michael Short).

3. New Features in 3.0 vs prior releases

3.1 SCP and Libraries
- Added ASSIGN/DEASSIGN (logical name) commands.
- Changed RESTORE to unconditionally detach files.
- Added E11 and TPC format support to magtape library.
- Fixed bug in SHOW CONNECTIONS.
- Added USE_ADDR64 support

3.2 All magtapes
- Magtapes support SIMH format, E11 format, and TPC format (read only).
- SET <tape_unit> FORMAT=format sets the specified tape unit's format.
- SHOW <tape_unit> FORMAT displays the specified tape unit's format.
- Tape format can also be set as part of the ATTACH command, using
  the -F switch.

3.3 VAX
- VAX can be compiled without USE_INT64.
- If compiled with USE_INT64 and USE_ADDR64, RQ and TQ controllers support
  files > 2GB.
- VAX ROM has speed control (SET ROM DELAY/NODELAY).

3.4 PDP-1
- Added block loader format support to LOAD.
- Changed BOOT PTR to allow loading of all of the first bank of memory.

3.5 PDP-18b Family
- Added PDP-4 EAE support.
- Added PDP-15 FP15 support.
- Added PDP-15 XVM support.
- Added PDP-15 "re-entrancy ECO".
- Added PDP-7, PDP-9, PDP-15 hardware RIM loader support in BOOT PTR.

4. Bugs Fixed in 3.0 vs prior releases

4.1 VAX
- Fixed CVTfi bug: integer overflow not set if exponent out of range
- Fixed EMODx bugs:
  o First and second operands reversed
  o Separated fraction received wrong exponent
  o Overflow calculation on separated integer incorrect
  o Fraction not set to zero if exponent out of range
- Fixed interval timer and ROM access to pass power-up self-test even on very
  fast host processors (fixes from Mark Pizzolato).
- Fixed bug in user disk size (found by Chaskiel M Grundman).

4.2 1401
- Fixed mnemonic, instruction lengths, and reverse scan length check bug for
  MCS.
- Fixed MCE bug, BS off by 1 if zero suppress.
- Fixed chaining bug, D lost if return to SCP.
- Fixed H branch, branch occurs after continue.
- Added check for invalid 8 character MCW, LCA.
- Fixed magtape load-mode end of record response.
- Revised fetch to model hardware more closely.

4.3 Nova
- Fixed DSK variable size interaction with restore.
- Fixed bug in DSK set size routine.

4.4 PDP-1
- Fixed DT variable size interaction with restore.
- Updated CPU, line printer, standard devices to detect indefinite I/O wait.
- Fixed incorrect logical, missing activate, break in drum simulator.
- Fixed bugs in instruction decoding, overprinting for line printer.

4.5 PDP-11
- Fixed DT variable size interaction with restore.
- Fixed bug in MMR1 update (found by Tim Stark).
- Added XQ features and fixed bugs:
  o Corrected XQ interrupts on IE state transition (code by Tom Evans).
  o Added XQ interrupt clear on soft reset.
  o Removed XQ interrupt when setting XL or RL (multiple people).
  o Added SET/SHOW XQ STATS.
  o Added SHOW XQ FILTERS.
  o Added ability to split received packet into multiple buffers.
  o Added explicit runt and giant packet processing.
- Fixed bug in user disk size (found by Chaskiel M Grundman).

4.6 PDP-18B
- Fixed DT, RF variable size interaction with restore.
- Fixed MT bug in MTTR.
- Fixed bug in PDP-4 line printer overprinting.
- Fixed bug in PDP-15 memory protect/skip interaction.
- Fixed bug in RF set size routine.
- Increased PTP TIME for PDP-15 operating systems.

4.7 PDP-8
- Fixed DT, DF, RF, RX variable size interaction with restore.
- Fixed MT bug in SKTR.
- Fixed bug in DF, RF set size routine.

4.8 HP2100
- Fixed bug in DP (13210A controller only), DQ read status.
- Fixed bug in DP, DQ seek complete.
- Fixed DR drum sizes.
- Fixed DR variable capacity interaction with SAVE/RESTORE.

4.9 GRI
- Fixed bug in SC queue pointer management.

4.10 PDP-10
- Fixed bug in RP read header.

4.11 Ibm1130
- Fixed bugs found by APL 1130.

4.12 Altairz80
- Fixed bug in real-time clock on Windows host.

4 files changed, 32 insertions, 11 deletions

diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile
index 990a0fe53ee..9f6fb181385 100644
--- a/emulators/simh/Makefile
+++ b/emulators/simh/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2003/07/17 21:35:44 grant Exp $
+# $NetBSD: Makefile,v 1.16 2003/09/26 21:36:11 jmmv Exp $
 #
 
-DISTNAME=	simhv210-4
-PKGNAME=	simh-2.10.4
-PKGREVISION=	1
+DISTNAME=	simhv30-2
+PKGNAME=	simh-3.0.2
 WRKSRC=		${WRKDIR}
 CATEGORIES=	emulators
 MASTER_SITES=	http://simh.trailing-edge.com/sources/
diff --git a/emulators/simh/PLIST b/emulators/simh/PLIST
index 5b4d62fef5d..9cc0153bcd6 100644
--- a/emulators/simh/PLIST
+++ b/emulators/simh/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2003/05/31 16:10:52 thorpej Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/09/26 21:36:11 jmmv Exp $
 bin/simh-altair
 bin/simh-altairz80
 bin/simh-eclipse
@@ -22,9 +22,7 @@ bin/simh-pdp9
 bin/simh-s3
 bin/simh-sds
 bin/simh-vax
-share/simh/ka655.bin
-@dirrm share/simh
-share/doc/simh/0readme_210.txt
+share/doc/simh/0readme_30.txt
 share/doc/simh/0readme_ethernet.txt
 share/doc/simh/altair.txt
 share/doc/simh/altairz80.txt
@@ -51,7 +49,10 @@ share/doc/simh/readme_update.txt
 share/doc/simh/sds_diag.txt
 share/doc/simh/sds_doc.txt
 share/doc/simh/simh_doc.txt
+share/doc/simh/simh_faq.txt
 share/doc/simh/simh_swre.txt
 share/doc/simh/system3.txt
 share/doc/simh/vax_doc.txt
+share/simh/ka655.bin
+@dirrm share/simh
 @dirrm share/doc/simh
diff --git a/emulators/simh/distinfo b/emulators/simh/distinfo
index 0d88f33257f..8ceca410583 100644
--- a/emulators/simh/distinfo
+++ b/emulators/simh/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.9 2003/05/31 16:10:52 thorpej Exp $
+$NetBSD: distinfo,v 1.10 2003/09/26 21:36:11 jmmv Exp $
 
-SHA1 (simhv210-4.zip) = 889e4a61eb8ed3eec768700920f69022f81c2fe2
-Size (simhv210-4.zip) = 1678424 bytes
+SHA1 (simhv30-2.zip) = 539822d9c3c87a49483c3a14310a02bee1372c09
+Size (simhv30-2.zip) = 1757964 bytes
 SHA1 (patch-aa) = caa25e4f265d03f65347a2e873e0e736baa43750
 SHA1 (patch-ab) = 97d66b3fcf79c51feb54a6cba3cdc3f58d15eb3f
+SHA1 (patch-ac) = 1366392ef1fcdf8de64d8606fde10df20212b49a
diff --git a/emulators/simh/patches/patch-ac b/emulators/simh/patches/patch-ac
new file mode 100644
index 00000000000..42ad0b2dddd
--- /dev/null
+++ b/emulators/simh/patches/patch-ac
@@ -0,0 +1,20 @@
+$NetBSD: patch-ac,v 1.3 2003/09/26 21:36:11 jmmv Exp $
+
+--- scp.c.orig	Thu Sep 11 17:24:08 2003
++++ scp.c
+@@ -3731,13 +3731,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 */
+-		printf ("Running\n");			/* print transition */
++		printf ("Running\r\n");			/* print transition */
+ 		fflush (stdout);  }
+ 	    return SCPE_OK;  }				/* ready to proceed */
+ 	c = sim_os_poll_kbd ();				/* check for stop char */
+ 	if ((c == SCPE_STOP) || stop_cpu) return SCPE_STOP;
+ 	if ((i % 10) == 0) {				/* Status every 10 sec */
+-	    printf ("Waiting for console Telnet connection\n");
++	    printf ("Waiting for console Telnet connection\r\n");
+ 	    fflush (stdout);  }
+ 	sim_os_sleep (1);				/* wait 1 second */
+ 	}