history, fix npe, minor stuff

Author: Federico Berti

HISTORY.md

@@ -1,3 +1,18 @@
+#25.0203
+32x: fifa hack (disabled)
+32x: reads to cache purge behave like writes
+32x: hack for COMM race conditions, fixes Brutal
+gg: always 60fps
+helios: {pwm, pcm} can be muted
+helios: initial TowerOfPower (MegaCd_S32x) support
+helios: fix an issue with stuck keys
+helios: improve multi-screen behaviour
+infra: update to gradle 8
+mcd: lots of fixes, still WIP
+md: parse supported devices from rom header
+md: ignore byte-wide ioWrites on even address, fix read timeControl area
+sms: change default z80 SP value
+
 #24.0720
 helios: fix setByteInWordBE
 helios: show rom info dialog, show region flag

build.gradle

@@ -1,14 +1,15 @@
 def dateString = getDate()
 group 'com.fbdev.helios'
 
+
+def javaVersion = JavaVersion.VERSION_17;
+
 //version dateString
 version dateString + '-SNAPSHOT'
 def jarNameHead = rootProject.name + "-" + version
 
 String packageDir = getLayout().getBuildDirectory().dir("packageDir").get()
 
-assert JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17) : "Java 17 or newer is required"
-
 apply plugin: 'java'
 
 repositories {
@@ -51,6 +52,13 @@ def static getDate() {
     date.substring(0,2) + "." + date.substring(2)
 }
 
+// Java
+java.toolchain {
+    languageVersion.set(JavaLanguageVersion.of(javaVersion.getMajorVersion()))
+    assert JavaVersion.current().isCompatibleWith(javaVersion): "Java " + javaVersion + " or newer is required"
+    println("Java version: " + JavaVersion.current())
+}
+
 //create a single Jar with all dependencies
 tasks.register('fatJar', Jar) {
     manifest {
@@ -78,7 +86,7 @@ tasks.register('copyRes') {
             include "res/**"
         }
         into packageDir
-        exclude "**/*.col", "**/bios.sms", "**/site/**", "**/misc/**", "**/sms/**", "**/mcd/**"
+        exclude "**/*.col", "**/bios.sms", "**/site/**", "**/misc/**", "**/sms/**", "**/mcd/**", "**/32x_bios_?.bin"
     }
     copy {
         from {

src/main/java/omegadrive/ui/DisplayWindow.java

@@ -40,8 +40,8 @@ public interface DisplayWindow {
     class DisplayContext {
         public int[] data;
         public VideoMode videoMode;
-        public Optional<String> label;
-        public Optional<Integer> megaCdLedState;
+        public Optional<String> label = Optional.empty();
+        public Optional<Integer> megaCdLedState = Optional.empty();
     }
 
 

src/main/java/omegadrive/ui/SwingWindow.java

@@ -250,7 +250,13 @@ public void renderScreenLinear(DisplayContext dc) {
             dcCopy.megaCdLedState = dc.megaCdLedState;
             dcCopy.label = dc.label;
             dcCopy.videoMode = dc.videoMode;
-            previousFrame = executorService.submit(() -> renderScreenLinearInternal(pixelsSrc, dcCopy));
+            previousFrame = executorService.submit(() -> {
+                try {
+                    renderScreenLinearInternal(pixelsSrc, dcCopy);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            });
         } else {
             renderScreenLinearInternal(pixelsSrc, dc);
         }

src/main/java/s32x/util/MarsLauncherHelper.java

@@ -38,7 +38,8 @@ public class MarsLauncherHelper {
     static final boolean masterDebug = Boolean.parseBoolean(System.getProperty("sh2.master.debug", "false"));
     static final boolean slaveDebug = Boolean.parseBoolean(System.getProperty("sh2.slave.debug", "false"));
 
-    static final boolean homebrewBios = Boolean.parseBoolean(System.getProperty("32x.use.homebrew.bios", "true"));
+    //TODO cd32x requires official 32x bios, as the homebrew bioses do not support boot from CD
+    static final boolean homebrewBios = Boolean.parseBoolean(System.getProperty("32x.use.homebrew.bios", "false"));
 
     static String biosBasePath = "res/bios/";