CVS commit: pkgsrc/emulators/hercules4sdl

["Olaf Seibert" <rhialto%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rhialto
Date:           Thu Mar  2 17:05:12 UTC 2023

Modified Files:
        pkgsrc/emulators/hercules4sdl: Makefile distinfo
Added Files:
        pkgsrc/emulators/hercules4sdl/patches: patch-hscutl.c

Log Message:
emulators/hercules4sdl: cherry-pick unreleased upstream patch

that is know to fix an issue that breaks the MVT operating system.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/emulators/hercules4sdl/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/emulators/hercules4sdl/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/hercules4sdl/patches/patch-hscutl.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/hercules4sdl/Makefile
diff -u pkgsrc/emulators/hercules4sdl/Makefile:1.10 pkgsrc/emulators/hercules4sdl/Makefile:1.11
--- pkgsrc/emulators/hercules4sdl/Makefile:1.10 Tue Dec 13 18:41:52 2022
+++ pkgsrc/emulators/hercules4sdl/Makefile      Thu Mar  2 17:05:12 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2022/12/13 18:41:52 rhialto Exp $
+# $NetBSD: Makefile,v 1.11 2023/03/02 17:05:12 rhialto Exp $
 
 PKGNAME=       hercules4sdl-4.5
-PKGREVISION=   1
+PKGREVISION=   2
 DISTNAME=      hyperion-Release_${PKGVERSION_NOREV}
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=SDL-Hercules-390/}

Index: pkgsrc/emulators/hercules4sdl/distinfo
diff -u pkgsrc/emulators/hercules4sdl/distinfo:1.6 pkgsrc/emulators/hercules4sdl/distinfo:1.7
--- pkgsrc/emulators/hercules4sdl/distinfo:1.6  Tue Dec 13 18:41:52 2022
+++ pkgsrc/emulators/hercules4sdl/distinfo      Thu Mar  2 17:05:12 2023
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.6 2022/12/13 18:41:52 rhialto Exp $
+$NetBSD: distinfo,v 1.7 2023/03/02 17:05:12 rhialto Exp $
 
 BLAKE2s (hyperion-Release_4.5.tar.gz) = 2e39391bdfcd789f46e247e74a108fafbab82da8cae6fad4ee6bf8ae13ea5aa1
 SHA512 (hyperion-Release_4.5.tar.gz) = 8129bd9129bd8aa1323cf9caa166eabbfe2f9fd2ac93bfc411060ee7d5bd81b1e4f489c816a2ce55a5d4e69f4658d87eae8c534fa5581ef2c951768be43e6be0
 Size (hyperion-Release_4.5.tar.gz) = 24271753 bytes
 SHA1 (patch-Makefile.am) = 6ae600095ffb29aab2a5e1e467f79a40e814f26d
 SHA1 (patch-configure.ac) = 734f64da8f4ce0f790d4eac0f352649d1b6d08f2
+SHA1 (patch-hscutl.c) = e8ff75e163b2339908a17c9aac6eeadef287f9a9
 SHA1 (patch-issue-525) = 6ec2b5cb760da92ca667bc3f29317bdf770fcbe0

Added files:

Index: pkgsrc/emulators/hercules4sdl/patches/patch-hscutl.c
diff -u /dev/null pkgsrc/emulators/hercules4sdl/patches/patch-hscutl.c:1.1
--- /dev/null   Thu Mar  2 17:05:12 2023
+++ pkgsrc/emulators/hercules4sdl/patches/patch-hscutl.c        Thu Mar  2 17:05:12 2023
@@ -0,0 +1,29 @@
+$NetBSD: patch-hscutl.c,v 1.1 2023/03/02 17:05:12 rhialto Exp $
+
+Pulled up a patch from the current development version.
+As discussed in the hercules-390 mailing list, of which the archives are
+currently members-only:
+https://hercules-390.groups.io/g/group/message/5475
+
+commit 2d443708f596dec8953758cabb4999c840f0d093
+Author: Fish (David B. Trout) <fish%infidels.org@localhost>
+Date:   Sat Feb 25 13:16:37 2023 -0800
+
+    Fix my careless bug causing MVT to fail!
+
+diff --git a/hscutl.c b/hscutl.c
+index 5e61e0f4..262ae056 100644
+--- hscutl.c
++++ hscutl.c
+@@ -2024,7 +2024,10 @@ DLL_EXPORT U64 do_make_psw64( PSW* psw, BYTE real_ilc, int arch /*370/390/900*/,
+             b23 = psw->intcode;
+ 
+             b4 = 0
+-                 | (real_ilc     << 6)
++                 | ((real_ilc >> 1) << 6)   // CAREFUL! Herc's ilc value
++                                            // is the ACTUAL length (2,
++                                            // 4 or 6), but the value in
++                                            // the PSW is either 1,2,3!)
+                  | (psw->cc << 4)
+                  |  psw->progmask
+                  ;