update to simh 2.10-4.

This commit is contained in:
fgsch 2003-05-28 16:31:07 +00:00
parent 1e4c052555
commit 21c8c4e4b3
7 changed files with 30 additions and 71 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.36 2003/02/03 08:34:32 fgsch Exp $
# $OpenBSD: Makefile,v 1.37 2003/05/28 16:31:07 fgsch Exp $
# $NetBSD: Makefile,v 1.2 1998/08/23 20:48:03 frueauf Exp $
COMMENT= "PDP, IBM 1401, Nova and other CPUs simulator"
VER= 2.10-2
VER= 2.10-4
DISTNAME= simh-${VER}
CATEGORIES= emulators
MASTER_SITES= http://simh.trailing-edge.com/sources/

View File

@ -1,3 +1,3 @@
MD5 (simhv210-2.zip) = 26768318d093a7770ca17d0a9cebc40d
RMD160 (simhv210-2.zip) = 77b005fccd8c2a3eb6968048e602fc7a07a4fd0d
SHA1 (simhv210-2.zip) = 3be42f496b01cc4897cd24f121bd07808eadd740
MD5 (simhv210-4.zip) = 874ce696111bcf9848b158991da43388
RMD160 (simhv210-4.zip) = d93882a3a97ea3c035638e5bb1f2f956e8e6d9af
SHA1 (simhv210-4.zip) = 889e4a61eb8ed3eec768700920f69022f81c2fe2

View File

@ -1,43 +0,0 @@
$OpenBSD: patch-NOVA_nova_cpu_c,v 1.4 2003/02/02 20:19:56 fgsch Exp $
--- NOVA/nova_cpu.c.orig Mon Nov 25 14:11:50 2002
+++ NOVA/nova_cpu.c Sun Feb 2 16:41:07 2003
@@ -391,21 +391,21 @@ if (IR & I_OPR) { /* operate? */
src = src ^ DMASK;
break;
case 1: /* NEG */
- src = ((src ^ DMASK) + 1) & CMASK;
+ src = ((src ^ DMASK) + 1) & NOVA_CMASK;
break;
case 2: /* MOV */
break;
case 3: /* INC */
- src = (src + 1) & CMASK;
+ src = (src + 1) & NOVA_CMASK;
break;
case 4: /* ADC */
- src = ((src ^ DMASK) + AC[dstAC]) & CMASK;
+ src = ((src ^ DMASK) + AC[dstAC]) & NOVA_CMASK;
break;
case 5: /* SUB */
- src = ((src ^ DMASK) + AC[dstAC] + 1) & CMASK;
+ src = ((src ^ DMASK) + AC[dstAC] + 1) & NOVA_CMASK;
break;
case 6: /* ADD */
- src = (src + AC[dstAC]) & CMASK;
+ src = (src + AC[dstAC]) & NOVA_CMASK;
break;
case 7: /* AND */
src = src & (AC[dstAC] | CBIT);
@@ -417,10 +417,10 @@ if (IR & I_OPR) { /* operate? */
case 0: /* nop */
break;
case 1: /* L */
- src = ((src << 1) | (src >> 16)) & CMASK;
+ src = ((src << 1) | (src >> 16)) & NOVA_CMASK;
break;
case 2: /* R */
- src = ((src >> 1) | (src << 16)) & CMASK;
+ src = ((src >> 1) | (src << 16)) & NOVA_CMASK;
break;
case 3: /* S */
src = ((src & 0377) << 8) | ((src >> 8) & 0377) |

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-NOVA_nova_defs_h,v 1.2 2002/10/29 23:55:01 fgsch Exp $
--- NOVA/nova_defs.h.orig Thu Oct 3 16:59:44 2002
+++ NOVA/nova_defs.h Thu Oct 24 20:37:41 2002
@@ -67,7 +67,7 @@
#define SIGN 0100000 /* sign */
#define DMASK 0177777 /* data mask */
#define CBIT (DMASK + 1) /* carry bit */
-#define CMASK (CBIT | DMASK) /* carry + data */
+#define NOVA_CMASK (CBIT | DMASK) /* carry + data */
/* Reserved memory locations */

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-makefile,v 1.5 2003/02/02 20:24:47 fgsch Exp $
--- makefile.orig Mon Jan 13 20:36:40 2003
+++ makefile Sun Feb 2 17:04:30 2003
$OpenBSD: patch-makefile,v 1.6 2003/05/28 16:31:07 fgsch Exp $
--- makefile.orig Sun Mar 2 15:44:14 2003
+++ makefile Wed May 28 13:24:55 2003
@@ -3,24 +3,25 @@
# Note: -O2 is sometimes broken in GCC when setjump/longjump is being
# used. Try -O2 only with released simulators.
@ -41,7 +41,20 @@ $OpenBSD: patch-makefile,v 1.5 2003/02/02 20:24:47 fgsch Exp $
#
@@ -225,108 +226,108 @@ all : ${BIN}pdp1${EXE} ${BIN}pdp4${EXE}
@@ -223,117 +224,117 @@ ALL = ${BIN}pdp1${EXE} ${BIN}pdp4${EXE}
all : ${ALL}
clean :
-ifeq ($(WIN32),)
+#ifeq ($(WIN32),)
${RM} ${ALL}
-else
- if exist BIN\*.exe del /q BIN\*.exe
-endif
+#else
+# if exist BIN\*.exe del /q BIN\*.exe
+#endif
#
# Individual builds
#
${BIN}pdp1${EXE} : ${PDP1} ${SIM}

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-scp_c,v 1.7 2003/02/02 20:19:56 fgsch Exp $
--- scp.c.orig Mon Jan 13 20:24:36 2003
+++ scp.c Sun Feb 2 16:35:36 2003
@@ -570,7 +570,10 @@ while (stat != SCPE_EXIT) { /* in cas
if (sim_vm_read != NULL) /* sim routine? */
$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
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 */
- if (cptr == NULL) continue; /* ignore EOF */
@ -11,5 +11,5 @@ $OpenBSD: patch-scp_c,v 1.7 2003/02/02 20:19:56 fgsch Exp $
+ continue; /* ignore EOF */
+ }
if (*cptr == 0) continue; /* ignore blank */
if (sim_log) fprintf (sim_log, "sim> %s\n", cbuf); /* log cmd */
if (sim_log) fprintf (sim_log, "sim> %s\n", cptr); /* log cmd */
cptr = get_glyph (cptr, gbuf, 0); /* get command glyph */

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.13 2003/02/02 20:19:56 fgsch Exp $
@comment $OpenBSD: PLIST,v 1.14 2003/05/28 16:31:07 fgsch Exp $
bin/simh-altair
bin/simh-altairz80
bin/simh-eclipse
@ -38,6 +38,7 @@ share/doc/simh/i1620_doc.txt
share/doc/simh/id_diag.txt
share/doc/simh/id_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_doc.txt