CVS commit: pkgsrc/emulators/gxemul

["matthew green" <mrg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mrg
Date:           Sun Apr 19 22:48:15 UTC 2026

Modified Files:
        pkgsrc/emulators/gxemul: Makefile distinfo
Added Files:
        pkgsrc/emulators/gxemul/patches: patch-src_cpus_cpu__sh.c
            patch-src_cpus_cpu__sh__instr.c

Log Message:
support the SH4-A "synco" instruction as a no-op.

fixes running landisk "dig" from recent builds, which would cause the
emulator to hard exit.

bump pkg version.


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 pkgsrc/emulators/gxemul/Makefile
cvs rdiff -u -r1.69 -r1.70 pkgsrc/emulators/gxemul/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/gxemul/patches/patch-src_cpus_cpu__sh.c \
    pkgsrc/emulators/gxemul/patches/patch-src_cpus_cpu__sh__instr.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/gxemul/Makefile
diff -u pkgsrc/emulators/gxemul/Makefile:1.77 pkgsrc/emulators/gxemul/Makefile:1.78
--- pkgsrc/emulators/gxemul/Makefile:1.77       Sat Dec 27 08:11:42 2025
+++ pkgsrc/emulators/gxemul/Makefile    Sun Apr 19 22:48:14 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.77 2025/12/27 08:11:42 wiz Exp $
+# $NetBSD: Makefile,v 1.78 2026/04/19 22:48:14 mrg Exp $
 
 DISTNAME=      gxemul-0.7.0
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gxemul/}
 

Index: pkgsrc/emulators/gxemul/distinfo
diff -u pkgsrc/emulators/gxemul/distinfo:1.69 pkgsrc/emulators/gxemul/distinfo:1.70
--- pkgsrc/emulators/gxemul/distinfo:1.69       Sun Oct 27 20:01:43 2024
+++ pkgsrc/emulators/gxemul/distinfo    Sun Apr 19 22:48:14 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.69 2024/10/27 20:01:43 jakllsch Exp $
+$NetBSD: distinfo,v 1.70 2026/04/19 22:48:14 mrg Exp $
 
 BLAKE2s (gxemul-0.7.0.tar.gz) = b379c244d2e56b5fec53f9af66974f3ef91cca7cf3ee586d85e1a7c5ab2adbd9
 SHA512 (gxemul-0.7.0.tar.gz) = d977342843e903aedd9dcdf6fdab81ceb5ee1552bf3b90deb77eb59b42e5fad3a65f216ce33cf33259372ff9a10af5b1365827de949f0c61fb9859b417972c71
@@ -7,6 +7,8 @@ SHA1 (patch-doc_machine__cats.html) = 1c
 SHA1 (patch-src_cpus_cpu__arm.c) = c34c78a13a65b06d8a0011a8bbb27ecaed3f4db9
 SHA1 (patch-src_cpus_cpu__arm__instr.c) = b91c6b4de6f47de28db259dac6146f46d3f81787
 SHA1 (patch-src_cpus_cpu__arm__instr__dpi.c) = 160d870151cd25e5393f57acbf91525b69fa41f3
+SHA1 (patch-src_cpus_cpu__sh.c) = 40c8989dcb2e17989a64b6ea4d19f85439fd6e69
+SHA1 (patch-src_cpus_cpu__sh__instr.c) = da365d33c9dbb29d755042bdef6caef549c68fde
 SHA1 (patch-src_include_thirdparty_bootblock.h) = fa1c2aadbe93746201484a8140d8e2b917fce2db
 SHA1 (patch-src_include_thirdparty_dp83932reg.h) = b64223191f039ebb6b0ac4ef83f239a93ae170b1
 SHA1 (patch-src_include_thirdparty_pcireg.h) = 304767b2ca861eb6626e09b8d6af9fae56a38164

Added files:

Index: pkgsrc/emulators/gxemul/patches/patch-src_cpus_cpu__sh.c
diff -u /dev/null pkgsrc/emulators/gxemul/patches/patch-src_cpus_cpu__sh.c:1.1
--- /dev/null   Sun Apr 19 22:48:15 2026
+++ pkgsrc/emulators/gxemul/patches/patch-src_cpus_cpu__sh.c    Sun Apr 19 22:48:15 2026
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_cpus_cpu__sh.c,v 1.1 2026/04/19 22:48:15 mrg Exp $
+
+Implement "synco" from SH4-A.  GCC 14 likes to emit it.
+
+
+--- src/cpus/cpu_sh.c.orig     2021-04-22 11:04:18.000000000 -0700
++++ src/cpus/cpu_sh.c  2026-04-19 15:31:39.839125158 -0700
+@@ -905,6 +905,8 @@ int sh_cpu_disassemble_instr(struct cpu *cpu, unsigned
+                       debug("ocbi\t@r%i\n", r8);
+               else if (lo8 == 0xa3)
+                       debug("ocbp\t@r%i\n", r8);
++              else if (iword == 0x00ab)
++                      debug("synco\n");
+               else if (lo8 == 0xb3)
+                       debug("ocbwb\t@r%i\n", r8);
+               else if (lo8 == 0xc3)
Index: pkgsrc/emulators/gxemul/patches/patch-src_cpus_cpu__sh__instr.c
diff -u /dev/null pkgsrc/emulators/gxemul/patches/patch-src_cpus_cpu__sh__instr.c:1.1
--- /dev/null   Sun Apr 19 22:48:15 2026
+++ pkgsrc/emulators/gxemul/patches/patch-src_cpus_cpu__sh__instr.c     Sun Apr 19 22:48:15 2026
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_cpus_cpu__sh__instr.c,v 1.1 2026/04/19 22:48:15 mrg Exp $
+
+Implement SH4-A "synco" as a nop for now.
+
+
+--- src/cpus/cpu_sh_instr.c.orig       2021-04-22 11:04:18.000000000 -0700
++++ src/cpus/cpu_sh_instr.c    2026-04-19 15:41:22.590946901 -0700
+@@ -3387,6 +3387,12 @@ X(to_be_translated)
+                       /*  STC Rm_BANK, Rn  */
+                       ic->f = instr(copy_privileged_register);
+                       ic->arg[0] = (size_t)&cpu->cd.sh.r_bank[(lo8 >> 4) & 7];
++              } else if (iword == 0x00ab) {
++                      /*  SYNCO  */
++                      /*  Treat as nop for now:  */
++                      /*  TODO: Implement this.  */
++                      ic->f = instr(nop);
++                      break;
+               } else if (iword == SH_INVALID_INSTR) {
+                       /*  PROM emulation (GXemul specific)  */
+                       ic->f = instr(prom_emul);