Received: by mail.netbsd.org (Postfix, from userid 605) id DC95B84E9F; Sun, 2 Jun 2019 09:19:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 668FB84E98 for ; Sun, 2 Jun 2019 09:19:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id IH5L0JVGwbeK for ; Sun, 2 Jun 2019 09:19:58 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id D345784D56 for ; Sun, 2 Jun 2019 09:19:58 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D10F1FBF4; Sun, 2 Jun 2019 09:19:58 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_155946719887600" MIME-Version: 1.0 Date: Sun, 2 Jun 2019 09:19:58 +0000 From: "Andreas Gustafsson" Subject: CVS commit: pkgsrc/emulators/gxemul To: pkgsrc-changes@NetBSD.org Reply-To: gson@netbsd.org X-Mailer: log_accum Message-Id: <20190602091958.D10F1FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_155946719887600 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gson Date: Sun Jun 2 09:19:58 UTC 2019 Modified Files: pkgsrc/emulators/gxemul: Makefile distinfo pkgsrc/emulators/gxemul/patches: patch-ad Log Message: emulators/gxemul: fix hpcmips emulation Add a patch from Anders Gavare that makes the hpcmips installation work again. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 pkgsrc/emulators/gxemul/Makefile cvs rdiff -u -r1.57 -r1.58 pkgsrc/emulators/gxemul/distinfo cvs rdiff -u -r1.3 -r1.4 pkgsrc/emulators/gxemul/patches/patch-ad Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_155946719887600 Content-Disposition: inline Content-Length: 3002 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/emulators/gxemul/Makefile diff -u pkgsrc/emulators/gxemul/Makefile:1.64 pkgsrc/emulators/gxemul/Makefile:1.65 --- pkgsrc/emulators/gxemul/Makefile:1.64 Thu Apr 11 12:50:30 2019 +++ pkgsrc/emulators/gxemul/Makefile Sun Jun 2 09:19:58 2019 @@ -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/} Index: pkgsrc/emulators/gxemul/distinfo diff -u pkgsrc/emulators/gxemul/distinfo:1.57 pkgsrc/emulators/gxemul/distinfo:1.58 --- pkgsrc/emulators/gxemul/distinfo:1.57 Thu Apr 11 12:50:30 2019 +++ pkgsrc/emulators/gxemul/distinfo Sun Jun 2 09:19:58 2019 @@ -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 Index: pkgsrc/emulators/gxemul/patches/patch-ad diff -u pkgsrc/emulators/gxemul/patches/patch-ad:1.3 pkgsrc/emulators/gxemul/patches/patch-ad:1.4 --- pkgsrc/emulators/gxemul/patches/patch-ad:1.3 Fri Jan 4 13:35:16 2019 +++ pkgsrc/emulators/gxemul/patches/patch-ad Sun Jun 2 09:19:58 2019 @@ -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 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)) --_----------=_155946719887600--