[pkgsrc/trunk]: pkgsrc/emulators/gxemul emulators/gxemul: fix hpcmips emulation

[gson <gson%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/90343e2d52d5
branches:  trunk
changeset: 334671:90343e2d52d5
user:      gson <gson%pkgsrc.org@localhost>
date:      Sun Jun 02 09:19:58 2019 +0000

description:
emulators/gxemul: fix hpcmips emulation

Add a patch from Anders Gavare that makes the hpcmips installation
work again.  Bump PKGREVISION.

diffstat:

 emulators/gxemul/Makefile         |   4 ++--
 emulators/gxemul/distinfo         |   4 ++--
 emulators/gxemul/patches/patch-ad |  13 ++++++++++++-
 3 files changed, 16 insertions(+), 5 deletions(-)

diffs (55 lines):

diff -r 634a4cf1884a -r 90343e2d52d5 emulators/gxemul/Makefile
--- a/emulators/gxemul/Makefile Sun Jun 02 09:07:39 2019 +0000
+++ b/emulators/gxemul/Makefile Sun Jun 02 09:19:58 2019 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.64 2019/04/11 12:50:30 christos Exp $
+# $NetBSD: Makefile,v 1.65 2019/06/02 09:19:58 gson Exp $
 
 DISTNAME=      gxemul-0.6.1
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gxemul/}
 
diff -r 634a4cf1884a -r 90343e2d52d5 emulators/gxemul/distinfo
--- a/emulators/gxemul/distinfo Sun Jun 02 09:07:39 2019 +0000
+++ b/emulators/gxemul/distinfo Sun Jun 02 09:19:58 2019 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.57 2019/04/11 12:50:30 christos Exp $
+$NetBSD: distinfo,v 1.58 2019/06/02 09:19:58 gson Exp $
 
 SHA1 (gxemul-0.6.1.tar.gz) = 150e495e91a968a49ffc7fe2390c3edff100508d
 RMD160 (gxemul-0.6.1.tar.gz) = 0434bff07970d8828531d222cc8b95c64c2d62f1
 SHA512 (gxemul-0.6.1.tar.gz) = 03dbbaa9ba5e36b4644a984f06bffa5ff9e763f395c472c0fbdfc8bca975a5fb184a676d3a6c5e1a3483c3c62a2778af9c36d2bf4ab8dcaf21b3dfac8abcd301
 Size (gxemul-0.6.1.tar.gz) = 5617712 bytes
-SHA1 (patch-ad) = 7f02cce83c58bbd5399b157a9da9c6c4260122f0
+SHA1 (patch-ad) = d4964bc672b690ee2a5c7148b9b9852d7f87776a
 SHA1 (patch-src_components_cpu_CPUDyntransComponent.cc) = dd7a9a83d8abce053e5e61a6aa6ae057c6c51a6a
 SHA1 (patch-src_components_cpu_M88K__CPUComponent.cc) = 4b456721aa0639b91d2dab82fb28f61a951ec8f4
 SHA1 (patch-src_components_cpu_MIPS__CPUComponent.cc) = 9bcb304937ccfa491e37da6f57729854294c420d
diff -r 634a4cf1884a -r 90343e2d52d5 emulators/gxemul/patches/patch-ad
--- a/emulators/gxemul/patches/patch-ad Sun Jun 02 09:07:39 2019 +0000
+++ b/emulators/gxemul/patches/patch-ad Sun Jun 02 09:19:58 2019 +0000
@@ -1,10 +1,21 @@
-$NetBSD: patch-ad,v 1.3 2019/01/04 13:35:16 ryoon Exp $
+$NetBSD: patch-ad,v 1.4 2019/06/02 09:19:58 gson Exp $
+
+short-term hack to fix hpcmips emulation from Anders Gavare
 
 patch to fix big-endian mips support from matt%netbsd.org@localhost
 
 diff -rup src/cpus/cpu_mips_coproc.cc src/cpus/cpu_mips_coproc.cc
 --- src/cpus/cpu_mips_coproc.cc.orig   2018-12-07 06:29:22.000000000 +0000
 +++ src/cpus/cpu_mips_coproc.cc
+@@ -1927,7 +1927,7 @@ void coproc_tlbwri(struct cpu *cpu, int 
+                *             be too expensive to add e.g. 16MB pages like
+                *             this.
+                */
+-              if (psize == 0x1000) {
++              if (psize == 0x1000 && cpu->cd.mips.cpu_type.rev != MIPS_R4100) {
+                       memblock = memory_paddr_to_hostaddr(cpu->mem, paddr0, 0);
+                       if (memblock != NULL && cp->reg[COP0_ENTRYLO0] & ENTRYLO_V)
+                               cpu->update_translation_table(cpu, vaddr0, memblock,
 @@ -2029,6 +2029,13 @@ void coproc_function(struct cpu *cpu, st
  
        if (cpnr < 2 && (((function & 0x03e007f8) == (COPz_MTCz << 21))