DSP JIT

Makefile

@@ -452,6 +452,30 @@ ifeq (,$(findstring msvc,$(platform)))
     CXXFLAGS += -MMD -MP
 endif
 
+# DSP JIT (SCU + SCSP MPROG): on by default.  The aarch64 backend uses
+# oaknut (C++20, header-only) via thin extern-"C" shims
+# (scu_dsp_jit_oaknut.cpp / scsp_dsp_jit_oaknut.cpp); the JIT bodies
+# themselves are C (scu_dsp_jit.c / scsp_dsp_jit.c).  Source-level
+# guards keep the JIT a no-op on non-aarch64 builds.  A runtime
+# libretro option (`beetle_saturn_jit`) further gates whether the
+# compiled JIT code is dispatched.  Pass WANT_JIT=0 to drop the JIT at
+# compile time (slightly smaller binary, no oaknut dep).
+WANT_JIT ?= 1
+ifeq ($(WANT_JIT), 1)
+    CFLAGS   += -DWANT_JIT
+    CXXFLAGS += -DWANT_JIT
+endif
+# SCU DSP JIT perf jitdump emitter: writes /tmp/jit-<pid>.dump in the
+# Linux perf jitdump format so `perf inject --jit` can resolve [JIT] tid
+# samples to per-slot symbols (dsp_<l|n>_pc<XX>_<kind>).  Diagnostic
+# only; the writer itself is cheap (one writev per compiled slot) but
+# the dump file grows unbounded over long runs.  Requires WANT_JIT=1.
+ifeq ($(WANT_DSP_JIT_PERF_DUMP), 1)
+    CFLAGS += -DWANT_DSP_JIT_PERF_DUMP
+endif
+$(CORE_EMU_DIR)/scu_dsp_jit_oaknut.o:   CXXFLAGS += -std=c++20 -I$(DEPS_DIR)/oaknut/include
+$(CORE_EMU_DIR)/scsp_dsp_jit_oaknut.o:  CXXFLAGS += -std=c++20 -I$(DEPS_DIR)/oaknut/include
+
 OBJOUT   = -o
 LINKOUT  = -o 
 

Makefile.common

@@ -55,18 +55,20 @@ ifeq ($(NEED_TREMOR), 1)
    FLAGS += -DNEED_TREMOR
 endif
 
-SOURCES_CXX += \
-	$(CORE_EMU_DIR)/sound_glue.cpp \
-	$(CORE_EMU_DIR)/ss.cpp
-
-# sound.cpp -> sound.c + sound_glue.cpp.  The orchestration half
-# (SOUND_* public ABI, the SOUND_Update 32.32 fixed-point cycle
-# loop, the SCSP IBuffer ring, the setjmp recovery point) moves
-# to C; the C++ class instances (SS_SCSP SCSP, M68K SoundCPU),
-# the eight M68K bus callbacks they need, and scsp.inc stay in
-# the new sound_glue.cpp.  The two halves exchange state through
-# sound_internal.h: a handful of extern "C" SoundGlue_* wrappers
-# around the M68K / SS_SCSP class methods sound.c needs, and four
+SOURCES_C += $(CORE_EMU_DIR)/ss.c \
+             $(CORE_EMU_DIR)/sound_glue.c \
+             $(CORE_EMU_DIR)/scsp_dsp_jit.c \
+             $(CORE_EMU_DIR)/jitdump.c
+
+# sound.cpp -> sound.c + sound_glue.cpp (Phase-6c) -> sound_glue.c
+# (Phase-9).  The orchestration half (SOUND_* public ABI, the
+# SOUND_Update 32.32 fixed-point cycle loop, the SCSP IBuffer ring,
+# the setjmp recovery point) lives in sound.c; the struct instances
+# (SS_SCSP SCSP, M68K SoundCPU -- both retired from being C++
+# class types), the eight M68K bus callbacks they need, and
+# scsp.inc live in sound_glue.c.  The two halves exchange state
+# through sound_internal.h: a set of SoundGlue_* C-linkage wrappers
+# around the M68K_* / SS_SCSP_* free-function APIs, and four
 # extern symbols (SOUND_next_scsp_time, SOUND_jbuf, IBuffer,
 # SOUND_IBufferCount) owned by sound.c that the glue side reads /
 # writes during the bus-callback and RunSCSP paths.
@@ -90,6 +92,10 @@ SOURCES_CXX += \
 # The STATE_MASK_* enum was hoisted out of `struct DSPS` to file
 # scope so the same `STATE_MASK_EXECUTE` spelling compiles in
 # both C and C++.
+# scu_dsp_jit.c: the SCU DSP slot-dispatch JIT body lives in C
+# (orchestration, emit_*, entry/exit stubs, looped-slot cache,
+# perf jitdump writer).  Instructions are emitted directly via the
+# in-tree a64emit C library.
 
 # db.cpp -> db.c. Dead std:: helpers (DB_GetInternalDB,
 # DB_GetHHDescriptions, FDIDToString) were removed in an earlier
@@ -147,6 +153,8 @@ SOURCES_C += $(CORE_EMU_DIR)/db.c \
 		$(CORE_EMU_DIR)/scu_dsp_mvi.c \
 		$(CORE_EMU_DIR)/scu_dsp_jmp.c \
 		$(CORE_EMU_DIR)/scu_dsp_misc.c \
+		$(CORE_EMU_DIR)/scu_dsp_jit.c \
+		$(CORE_EMU_DIR)/a64emit.c \
 		$(CORE_EMU_DIR)/sound.c \
 		$(CORE_EMU_DIR)/ss_state.c \
 		$(CORE_EMU_DIR)/ss_init.c

libretro.c

@@ -299,6 +299,26 @@ static void check_variables(bool startup)
             cdimagecache = true;
       }
 
+      var.key = "beetle_saturn_jit_scu";
+      var.value = NULL;
+      if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
+      {
+         if (!strcmp(var.value, "disabled"))
+            setting_jit_scu = false;
+         else
+            setting_jit_scu = true;
+      }
+
+      var.key = "beetle_saturn_jit_scsp";
+      var.value = NULL;
+      if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
+      {
+         if (!strcmp(var.value, "disabled"))
+            setting_jit_scsp = false;
+         else
+            setting_jit_scsp = true;
+      }
+
       var.key = "beetle_saturn_shared_int";
       var.value = NULL;
       if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)

libretro_core_options.h

@@ -142,6 +142,34 @@ struct retro_core_option_v2_definition option_defs_us[] = {
       },
       "disabled"
    },
+   {
+      "beetle_saturn_jit_scu",
+      "SCU DSP JIT Binary Translator",
+      NULL,
+      "Use the native aarch64 JIT binary translator for the SCU DSP. Has no effect on non-aarch64 builds. Restart required.",
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled"
+   },
+   {
+      "beetle_saturn_jit_scsp",
+      "SCSP DSP JIT Binary Translator",
+      NULL,
+      "Use the native aarch64 JIT binary translator for the SCSP DSP (MPROG). Has no effect on non-aarch64 builds. Restart required.",
+      NULL,
+      "system",
+      {
+         { "disabled", NULL },
+         { "enabled",  NULL },
+         { NULL, NULL },
+      },
+      "enabled"
+   },
    {
       "beetle_saturn_initial_scanline",
       "Initial Scanline",

libretro_settings.c

@@ -15,3 +15,5 @@ bool setting_multitap_port1;
 bool setting_multitap_port2;
 bool opposite_directions;
 bool setting_midsync;
+bool setting_jit_scu = true;
+bool setting_jit_scsp = true;

libretro_settings.h

@@ -1,7 +1,7 @@
 #ifndef __LIBRETRO_SETTINGS_HDR__
 #define __LIBRETRO_SETTINGS_HDR__
 
-#include <stdbool.h>
+#include <boolean.h>
 
 enum
 {
@@ -33,5 +33,7 @@ extern bool setting_multitap_port1;
 extern bool setting_multitap_port2;
 extern bool opposite_directions;
 extern bool setting_midsync;
+extern bool setting_jit_scu;
+extern bool setting_jit_scsp;
 
 #endif

mednafen/emuspec.h

@@ -2,9 +2,7 @@
 #define __MDFN_EMUSPEC_H
 
 #include <stdint.h>
-#ifndef __cplusplus
-#include <stdbool.h>
-#endif
+#include <boolean.h>
 
 #include "video/surface.h"
 

mednafen/git.h

@@ -1,54 +1,14 @@
 #ifndef __MDFN_GIT_H
 #define __MDFN_GIT_H
 
-#include <algorithm>
-#include <string>
-#include <vector>
-#include <map>
 #include <libretro.h>
 
 #include "video/surface.h"
 
 #include "state.h"
-#include "settings-common.h"
 
 struct MemoryPatch;
 
-struct CheatFormatStruct
-{
- const char *FullName;		//"Game Genie", "GameShark", "Pro Action Catplay", etc.
- const char *Description;	// Whatever?
-
- bool (*DecodeCheat)(const std::string& cheat_string, MemoryPatch* patch);	// *patch should be left as initialized by MemoryPatch::MemoryPatch(), unless this is the
-										// second(or third or whatever) part of a multipart cheat.
-										//
-										// Will throw an std::exception(or derivative) on format error.
-										//
-										// Will return true if this is part of a multipart cheat.
-};
-
-MDFN_HIDE extern const std::vector<CheatFormatStruct> CheatFormatInfo_Empty;
-
-struct CheatInfoStruct
-{
- //
- // InstallReadPatch and RemoveReadPatches should be non-NULL(even if only pointing to dummy functions) if the emulator module supports
- // read-substitution and read-substitution-with-compare style(IE Game Genie-style) cheats.
- //
- // See also "SubCheats" global stuff in mempatcher.h.
- //
- void (*InstallReadPatch)(uint32_t address, uint8_t value, int compare); // Compare is >= 0 when utilized.
- void (*RemoveReadPatches)(void);
- uint8_t (*MemRead)(uint32_t addr);
- void (*MemWrite)(uint32_t addr, uint8_t val);
-
- const std::vector<CheatFormatStruct>& CheatFormatInfo;
-
- bool BigEndian;	// UI default for cheat search and new cheats.
-};
-
-MDFN_HIDE extern const CheatInfoStruct CheatInfo_Empty;
-
 /* EmulateSpecStruct now lives in mednafen/emuspec.h so it can be
    included from C TUs (the libretro entry-point is converted to C
    in the same commit that introduced emuspec.h).  This include
@@ -58,24 +18,6 @@ MDFN_HIDE extern const CheatInfoStruct CheatInfo_Empty;
    relying on those defaults now zero-init explicitly. */
 #include "emuspec.h"
 
-struct GameDB_Entry
-{
- std::string GameID;
- bool GameIDIsHash = false;
- std::string Name;
- std::string Setting;
- std::string Purpose;
-};
-
-struct GameDB_Database
-{
- std::string ShortName;
- std::string FullName;
- std::string Description;
-
- std::vector<GameDB_Entry> Entries;
-};
-
 //===========================================
 
 #include "mdfn_gameinfo.h"