CVS commit: pkgsrc/emulators/tme

["Jason R Thorpe" <thorpej%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   thorpej
Date:           Thu Mar  5 14:55:17 UTC 2020

Modified Files:
        pkgsrc/emulators/tme: Makefile distinfo
Added Files:
        pkgsrc/emulators/tme/patches: patch-ic_mm58167.c

Log Message:
Don't abort the emulator if the mm58167 gets a read to an unexpected
register, just return 0 instead.


To generate a diff of this commit:
cvs rdiff -u -r1.73 -r1.74 pkgsrc/emulators/tme/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/emulators/tme/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/tme/patches/patch-ic_mm58167.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/tme/Makefile
diff -u pkgsrc/emulators/tme/Makefile:1.73 pkgsrc/emulators/tme/Makefile:1.74
--- pkgsrc/emulators/tme/Makefile:1.73  Wed Mar  4 07:52:11 2020
+++ pkgsrc/emulators/tme/Makefile       Thu Mar  5 14:55:16 2020
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.73 2020/03/04 07:52:11 rin Exp $
+# $NetBSD: Makefile,v 1.74 2020/03/05 14:55:16 thorpej Exp $
 #
 
 DISTNAME=              tme-0.8
-PKGREVISION=           40
+PKGREVISION=           41
 CATEGORIES=            emulators
 MASTER_SITES=          http://csail.mit.edu/~fredette/tme/
 

Index: pkgsrc/emulators/tme/distinfo
diff -u pkgsrc/emulators/tme/distinfo:1.24 pkgsrc/emulators/tme/distinfo:1.25
--- pkgsrc/emulators/tme/distinfo:1.24  Wed Mar  4 07:52:11 2020
+++ pkgsrc/emulators/tme/distinfo       Thu Mar  5 14:55:16 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2020/03/04 07:52:11 rin Exp $
+$NetBSD: distinfo,v 1.25 2020/03/05 14:55:16 thorpej Exp $
 
 SHA1 (tme-0.8.tar.gz) = dd4f3421c20ceed548c5328a21dbb26e80f46b9c
 RMD160 (tme-0.8.tar.gz) = 6bd505c5fa7810d37f436883383c4ba655df2ded
@@ -19,6 +19,7 @@ SHA1 (patch-ic_m68k_m6888x.c) = fe42dce7
 SHA1 (patch-ic_m68k_m68k-insns-auto.sh) = c493b4c6b066135e093abd7482e0a1e99294848b
 SHA1 (patch-ic_m68k_m68k-m68k-insns.c) = 1a9d8e3d4e11c5710d1f67b65954d6e3de68d99f
 SHA1 (patch-ic_m68k_m68k-misc.c) = 7aeef098631196fe60b9940600cf90c86d1be375
+SHA1 (patch-ic_mm58167.c) = 1c35c599f56f6a13a9dfc85dc5154f094bd8c0d0
 SHA1 (patch-libtme_memory-auto.sh) = f7d989831b2468d1288faabc10b6fc53ce5bd0f4
 SHA1 (patch-machine_sun2_SUN2-MULTIBUS) = cf9f55fcc15e2d977823dd54b9a10c42b11a6666
 SHA1 (patch-machine_sun2_sun2-mainbus.c) = 91b901d37d5f9a72064831d440c4371b81857640

Added files:

Index: pkgsrc/emulators/tme/patches/patch-ic_mm58167.c
diff -u /dev/null pkgsrc/emulators/tme/patches/patch-ic_mm58167.c:1.1
--- /dev/null   Thu Mar  5 14:55:17 2020
+++ pkgsrc/emulators/tme/patches/patch-ic_mm58167.c     Thu Mar  5 14:55:16 2020
@@ -0,0 +1,17 @@
+$NetBSD: patch-ic_mm58167.c,v 1.1 2020/03/05 14:55:16 thorpej Exp $
+
+Don't abort the emulator if we get a read for an unexpected register (which
+seems to happen with NetBSD 9 on sun2); just return 0 instead.
+
+--- ic/mm58167.c.orig  2020-03-05 14:20:42.000000000 +0000
++++ ic/mm58167.c       2020-03-05 14:21:25.000000000 +0000
+@@ -219,7 +219,8 @@ _tme_mm58167_bus_cycle(void *_mm58167, s
+       mm58167->tme_mm58167_status = 0;
+       break;
+     default:
+-      abort();
++      value = 0;
++      break;
+     }
+ 
+     /* if needed, convert this value to BCD: */