things

src/backend/Core.cpp

@@ -2,46 +2,49 @@
 #include <Scheduler.hpp>
 
 namespace n64 {
-Core::Core() : cpu{new Interpreter} {
+Core::Core() {
   if(SDL_GameControllerAddMappingsFromFile("resources/gamecontrollerdb.txt") < 0) {
     Util::warn("Failed to load game controller DB");
   }
 }
 
 void Core::Stop() {
-  cpu->Reset();
-  cpu->mem.Reset();
+  cpu.Reset();
+  cpu.mem.Reset();
   pause = true;
   romLoaded = false;
 }
 
 void Core::LoadROM(const std::string& rom_) {
   rom = rom_;
-  cpu->Reset();
+  cpu.Reset();
   pause = false;
   romLoaded = true;
 
   auto extension = fs::path(rom).extension().string();
+  bool isArchive = false;
+  for(const auto i : ARCHIVE_TYPES) {
+    if(extension == i) {
+      isArchive = true;
+      break;
+    }
+  }
 
-  bool isArchive = std::any_of(std::begin(ARCHIVE_TYPES), std::end(ARCHIVE_TYPES), [&](auto i) {
-    return extension == i;
-  });
-
-  cpu->mem.LoadROM(isArchive, rom);
-  GameDB::match(cpu->mem);
-  cpu->mem.mmio.vi.isPal = cpu->mem.IsROMPAL();
-  cpu->mem.mmio.si.pif.InitDevices(cpu->mem.saveType);
-  cpu->mem.mmio.si.pif.LoadMempak(rom);
-  cpu->mem.mmio.si.pif.LoadEeprom(cpu->mem.saveType, rom);
-  cpu->mem.flash.Load(cpu->mem.saveType, rom);
-  cpu->mem.LoadSRAM(cpu->mem.saveType, rom);
-  PIF::ExecutePIF(cpu->mem, cpu->regs);
+  cpu.mem.LoadROM(isArchive, rom);
+  GameDB::match(cpu.mem);
+  cpu.mem.mmio.vi.isPal = cpu.mem.IsROMPAL();
+  cpu.mem.mmio.si.pif.InitDevices(cpu.mem.saveType);
+  cpu.mem.mmio.si.pif.LoadMempak(rom);
+  cpu.mem.mmio.si.pif.LoadEeprom(cpu.mem.saveType, rom);
+  cpu.mem.flash.Load(cpu.mem.saveType, rom);
+  cpu.mem.LoadSRAM(cpu.mem.saveType, rom);
+  PIF::ExecutePIF(cpu.mem, cpu.regs);
 }
 
 void Core::Run(float volumeL, float volumeR) {
-  Mem& mem = cpu->mem;
+  Mem& mem = cpu.mem;
   MMIO& mmio = mem.mmio;
-  Registers& regs = cpu->regs;
+  Registers& regs = cpu.regs;
 
   for (int field = 0; field < mmio.vi.numFields; field++) {
     int frameCycles = 0;
@@ -53,7 +56,7 @@ void Core::Run(float volumeL, float volumeR) {
       }
 
       for(; cycles < mem.mmio.vi.cyclesPerHalfline; cycles++, frameCycles++) {
-        int taken = cpu->Step();
+        int taken = cpu.Step();
         static int cpuSteps = 0;
         cpuSteps += taken;
         if(mmio.rsp.spStatus.halt) {
@@ -83,7 +86,7 @@ void Core::Run(float volumeL, float volumeR) {
       InterruptRaise(mmio.mi, regs, Interrupt::VI);
     }
 
-    mmio.ai.Step(cpu->mem, regs, frameCycles, volumeL, volumeR);
+    mmio.ai.Step(cpu.mem, regs, frameCycles, volumeL, volumeR);
     scheduler.tick(frameCycles, mem, regs);
   }
 }