- Stop using inheritance for CPU, instead use composition.

- Introduce KAIZEN_JIT_ENABLED optional define instead of relying on __aarch64__ and the like.
- More cache work

src/backend/Core.cpp

@@ -4,18 +4,18 @@
 #include <Options.hpp>
 
 namespace n64 {
-Core::Core() {
+Core::Core() :
+    interpreter(*mem, regs)
+#ifdef KAIZEN_JIT_ENABLED
+    ,
+    jit(*mem, regs)
+#endif
+{
     const auto selectedCpu = Options::GetInstance().GetValue<std::string>("cpu", "type");
     if (selectedCpu == "interpreter") {
         cpuType = Interpreted;
-        cpu = std::make_unique<Interpreter>(*mem, regs);
     } else if (selectedCpu == "jit") {
-#ifndef __aarch64__
         cpuType = DynamicRecompiler;
-        cpu = std::make_unique<JIT>(*mem, regs);
-#else
-        panic("JIT currently unsupported on aarch64");
-#endif
     } else {
         panic("Unimplemented CPU type");
     }
@@ -30,7 +30,7 @@ void Core::Stop() {
 void Core::Reset() {
     regs.Reset();
     mem->Reset();
-    cpu->Reset();
+    interpreter.Reset();
     if (romLoaded)
         mem->mmio.si.pif.Execute();
 }
@@ -62,7 +62,17 @@ void Core::LoadROM(const std::string &rom_) {
     romLoaded = true;
 }
 
-u32 Core::StepCPU() { return cpu->Step() + regs.PopStalledCycles(); }
+u32 Core::StepCPU() {
+    if (cpuType == Interpreted)
+        return interpreter.Step() + regs.PopStalledCycles();
+
+#ifdef KAIZEN_JIT_ENABLED
+    if (cpuType == DynamicRecompiler)
+        return jit.Step() + regs.PopStalledCycles();
+#endif
+
+    panic("Invalid CPU type?");
+}
 
 void Core::StepRSP(const u32 cpuCycles) {
     MMIO &mmio = mem->mmio;