Fix emulation accuracy: resolution, 68K instructions, events, RAM init, logging

.github/workflows/c-cpp.yml

@@ -211,6 +211,32 @@ jobs:
         $CC -O2 -Wall -o test/tools/test_memory_map test/tools/test_memory_map.c $LDFLAGS
         ./test/tools/test_memory_map ./${{ matrix.config.artifact }}
 
+    - name: Run DSP instruction set tests
+      if: ${{ !matrix.config.emscripten && !matrix.config.android && !matrix.config.cross && runner.os != 'Windows' }}
+      run: |
+        CC="${{ matrix.config.cc }}"
+        if [ "$(uname)" = "Linux" ]; then LDFLAGS="-ldl"; else LDFLAGS=""; fi
+        $CC -O2 -Wall -o test/test_dsp_ops test/test_dsp_ops.c $LDFLAGS
+        $CC -O2 -Wall -o test/test_dsp_unit test/test_dsp_unit.c $LDFLAGS
+        ./test/test_dsp_ops
+        ./test/test_dsp_unit
+
+    - name: Run GPU instruction set tests
+      if: ${{ !matrix.config.emscripten && !matrix.config.android && !matrix.config.cross && runner.os != 'Windows' }}
+      run: |
+        CC="${{ matrix.config.cc }}"
+        if [ "$(uname)" = "Linux" ]; then LDFLAGS="-ldl"; else LDFLAGS=""; fi
+        $CC -O2 -Wall -o test/test_gpu_ops test/test_gpu_ops.c $LDFLAGS
+        ./test/test_gpu_ops
+
+    - name: Run 68K instruction set tests
+      if: ${{ !matrix.config.emscripten && !matrix.config.android && !matrix.config.cross && runner.os != 'Windows' }}
+      run: |
+        CC="${{ matrix.config.cc }}"
+        if [ "$(uname)" = "Linux" ]; then LDFLAGS="-ldl"; else LDFLAGS=""; fi
+        $CC -O2 -Wall -o test/test_m68k_ops test/test_m68k_ops.c $LDFLAGS
+        ./test/test_m68k_ops
+
     - name: Cache pinned rcheevos E2E build
       if: ${{ !matrix.config.emscripten && !matrix.config.android && !matrix.config.cross && runner.os != 'Windows' }}
       uses: actions/cache@v4

libretro.c

@@ -19,6 +19,7 @@
 #include "settings.h"
 #include "tom.h"
 #include "state.h"
+#include "log.h"
 
 #define SAMPLERATE 48000
 #define BUFPAL  1920
@@ -52,8 +53,8 @@ static retro_video_refresh_t video_cb;
 static retro_input_poll_t input_poll_cb;
 static retro_input_state_t input_state_cb;
 static retro_environment_t environ_cb;
-static retro_log_printf_t libretro_log_printf;
 retro_audio_sample_batch_t audio_batch_cb;
+retro_log_printf_t vj_log_cb = NULL;
 
 static bool libretro_supports_bitmasks = false;
 static bool save_data_needs_unpack = false;
@@ -64,7 +65,7 @@ void retro_set_audio_sample_batch(retro_audio_sample_batch_t cb) { audio_batch_c
 void retro_set_input_poll(retro_input_poll_t cb) { input_poll_cb = cb; }
 void retro_set_input_state(retro_input_state_t cb) { input_state_cb = cb; }
 
-int doom_res_hack=0; // Doom Hack to double pixel if pwidth==8 (163*2)
+
 
 #define ANALOG_THRESHOLD 20000
 #define BUTTON_NONE 21
@@ -293,16 +294,18 @@ void retro_set_environment(retro_environment_t cb)
 {
    struct retro_vfs_interface_info vfs_iface_info;
    struct retro_core_options_update_display_callback update_display_cb;
-   struct retro_log_callback logging;
    bool option_categories = false;
    bool achievements = true;
    environ_cb = cb;
 
-   logging.log = NULL;
-   if (cb(RETRO_ENVIRONMENT_GET_LOG_INTERFACE, &logging))
-      libretro_log_printf = logging.log;
-   else
-      libretro_log_printf = NULL;
+   {
+      struct retro_log_callback log_iface;
+      log_iface.log = NULL;
+      if (cb(RETRO_ENVIRONMENT_GET_LOG_INTERFACE, &log_iface))
+         vj_log_cb = log_iface.log;
+      else
+         vj_log_cb = NULL;
+   }
 
    libretro_set_core_options(environ_cb, &option_categories);
    update_display_cb.callback = update_option_visibility;
@@ -331,17 +334,6 @@ static void check_variables(void)
          vjs.useFastBlitter = false;
    }
 
-   var.key = "virtualjaguar_doom_res_hack";
-   var.value = NULL;
-
-   if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
-   {
-      if (strcmp(var.value, "enabled") == 0)
-         doom_res_hack = 1;
-      else
-         doom_res_hack = 0;
-   }
-
    var.key = "virtualjaguar_bios";
    var.value = NULL;
 
@@ -910,9 +902,7 @@ static void cheat_write_jaguar(uint32_t addr, uint32_t value,
       case 2: JaguarWriteWord(addr, (uint16_t)value, UNKNOWN); break;
       case 4: JaguarWriteLong(addr, value,           UNKNOWN); break;
       default:
-         if (libretro_log_printf)
-            libretro_log_printf(RETRO_LOG_WARN,
-               "[Virtual Jaguar] cheat: unsupported write size %u at 0x%06X\n",
+         LOG_WRN("[Virtual Jaguar] cheat: unsupported write size %u at 0x%06X\n",
                (unsigned)size, (unsigned)(addr & 0xFFFFFFU));
          break;
    }
@@ -1036,6 +1026,13 @@ bool retro_load_game(const struct retro_game_info *info)
    JaguarLoadFile((uint8_t*)info->data, info->size);
    JaguarReset();
 
+   /* JaguarReset() randomizes RAM contents, which destroys RAM-loaded
+    * executables (ABS, COFF, JAGSERVER formats).  Cart ROMs are safe
+    * because they live at $800000+ which isn't touched by reset.
+    * Re-load the file so the program data is back in place. */
+   if (!jaguarCartInserted)
+      JaguarLoadFile((uint8_t*)info->data, info->size);
+
    /* Advertise the Jaguar memory map so frontends (RetroArch, etc.) can
     * resolve emulated addresses to host buffers. Required for rcheevos.
     *

libretro_core_options.h

@@ -105,20 +105,6 @@ struct retro_core_option_v2_definition option_defs_us[] = {
       },
       "disabled"
    },
-   {
-      "virtualjaguar_doom_res_hack",
-      "Doom Resolution Hack",
-      NULL,
-      "Hack to fix the halved resolution in Doom.",
-      NULL,
-      NULL,
-      {
-         { "disabled", NULL },
-         { "enabled",  NULL },
-         { NULL, NULL },
-      },
-      "disabled"
-   },
    {
       "virtualjaguar_bios",
       "BIOS",

link.T

@@ -1,5 +1,21 @@
 {
-   global: retro_*;
+   global:
+      retro_*;
+      DSP*;
+      dsp_*;
+      m68k_*;
+      jaguarMainRAM;
+      jaguarMainROM;
+      jagMemSpace;
+      pcQueue;
+      pcQPtr;
+      a6Queue;
+      d0Queue;
+      GPU*;
+      gpu_*;
+      JERRY*;
+      TOM*;
+      tomRam8;
    local: *;
 };
 

src/dac.c

@@ -47,6 +47,7 @@
 #include "event.h"
 #include "jerry.h"
 #include "jaguar.h"
+#include "log.h"
 #include "m68000/m68kinterface.h"
 #include "settings.h"
 
@@ -72,6 +73,10 @@ static int bufferIndex = 0;
 static int numberOfSamples = 0;
 static bool bufferDone = false;
 
+// Audio diagnostics
+static uint32_t dacLtxdWriteCount = 0;
+static uint32_t dacDiagFrameCount = 0;
+
 // Private function prototypes
 
 void DACInit(void)
@@ -89,6 +94,8 @@ void DACReset(void)
 {
    *ltxd = 0;
    lrxd  = 0;
+   dacLtxdWriteCount = 0;
+   dacDiagFrameCount = 0;
 }
 
 void DACDone(void)
@@ -138,6 +145,13 @@ void SoundCallback(void * userdata, uint16_t * buffer, int length)
          buffer[i + 1] = *rtxd;
       }
 
+      if (dacDiagFrameCount++ % 60 == 0)
+      {
+         uint32_t ctrl, flags;
+         DSPGetAudioDiagnostics(&ctrl, &flags);
+         LOG_WRN("[AUDIO] DSP NOT running  ctrl=%04X flags=%04X sclk=%u smode=%04X ltxd=%04X rtxd=%04X writes=%u\n",
+                  ctrl, flags, (unsigned)*sclk, (unsigned)*smode, (unsigned)*ltxd, (unsigned)*rtxd, dacLtxdWriteCount);
+      }
       return;
    }
 
@@ -169,6 +183,26 @@ void SoundCallback(void * userdata, uint16_t * buffer, int length)
       HandleNextEvent(EVENT_JERRY);
    }
    while (!bufferDone);
+
+   if (dacDiagFrameCount++ % 60 == 0)
+   {
+      uint32_t ctrl, flags;
+      int nonZero = 0;
+      int i;
+      for (i = 0; i < length; i++)
+      {
+         if (sampleBuffer[i] != 0)
+         {
+            nonZero++;
+            break;
+         }
+      }
+      DSPGetAudioDiagnostics(&ctrl, &flags);
+      LOG_INF("[AUDIO] DSP running  ctrl=%04X flags=%04X sclk=%u smode=%04X ltxd=%04X rtxd=%04X writes=%u samples=%s\n",
+               ctrl, flags, (unsigned)*sclk, (unsigned)*smode, (unsigned)*ltxd, (unsigned)*rtxd,
+               dacLtxdWriteCount, nonZero ? "NON-ZERO" : "ALL-ZERO");
+   }
+
    audio_batch_cb((int16_t*)sampleBuffer, length / 2);
 }
 
@@ -183,7 +217,10 @@ void DACWriteByte(uint32_t offset, uint8_t data, uint32_t who)
 void DACWriteWord(uint32_t offset, uint16_t data, uint32_t who)
 {
    if (offset == LTXD + 2)
+   {
       *ltxd = data;
+      dacLtxdWriteCount++;
+   }
    else if (offset == RTXD + 2)
       *rtxd = data;
    else if (offset == SCLK + 2)					// Sample rate
@@ -194,7 +231,9 @@ void DACWriteWord(uint32_t offset, uint16_t data, uint32_t who)
       JERRYI2SCallback();
    }
    else if (offset == SMODE + 2)
+   {
       *smode = data;
+   }
 }
 
 uint8_t DACReadByte(uint32_t offset, uint32_t who)