Emulator: Put startup into a Loader class

src/loader.cpp

@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2022 Riyyi
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "loader.h"
+#include "cpu.h"
+#include "emu.h"
+#include "ppu.h"
+#include "ruc/file.h"
+
+void Loader::init()
+{
+	destroy();
+
+	Emu::the().init(8000000);
+
+	CPU cpu(8000000);
+	PPU ppu(4000000);
+
+	Emu::the().addProcessingUnit("cpu", &cpu);
+	Emu::the().addProcessingUnit("ppu", &ppu);
+
+	// https://gbdev.io/pandocs/Memory_Map.html
+	// https://gbdev.io/pandocs/Power_Up_Sequence.html
+	Emu::the().addMemorySpace("BOOTROM1", 0x0000, 0x00ff);   // 256B
+	Emu::the().addMemorySpace("BOOTROM2", 0x0200, 0x08ff);   // 1792B
+	Emu::the().addMemorySpace("VRAM", 0x8000, 0x9fff, 2);    // 8KiB * 2 banks
+	Emu::the().addMemorySpace("CARDRAM", 0xa000, 0xbfff, 1); // 8KiB * ? banks, if any
+	Emu::the().addMemorySpace("WRAM1", 0xc000, 0xcfff);      // 4 KiB, Work RAM
+	Emu::the().addMemorySpace("WRAM2", 0xd000, 0xdfff, 7);   // 4 KiB * 7 banks, Work RAM
+	Emu::the().addMemorySpace("ECHORAM", 0xe000, 0xfdff);    // 7680B, Mirror of 0xc000~0xddff
+	Emu::the().addMemorySpace("OAM", 0xfe00, 0xfe9f);        // 160B, Object Attribute Memory (VRAM Sprite Attribute Table)
+	Emu::the().addMemorySpace("Not Usable", 0xfea0, 0xfeff); // 96B, Nintendo probibits this area
+	Emu::the().addMemorySpace("IO", 0xff00, 0xff7f);         // 128B, I/O Registers
+	Emu::the().addMemorySpace("HRAM", 0xff80, 0xfffe);       // 127B, High RAM (CPU cache)
+	Emu::the().addMemorySpace("IE", 0xffff, 0xffff);         // 1B, Interrupt Enable register
+
+	// Load bootrom
+	auto bootrom = ruc::File("gbc_bios.bin").data();
+	for (size_t i = 0; i < bootrom.length(); ++i) {
+		// Skip cartridge header memory range
+		if (i >= 0x0100 && i <= 0x01ff) {
+			continue;
+		}
+
+		Emu::the().writeMemory(i, bootrom[i]);
+	}
+
+	while (true) {
+		Emu::the().update();
+	}
+}
+
+void Loader::destroy()
+{
+	Emu::destroy();
+}

src/loader.h

@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2022 Riyyi
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#pragma once
+
+#include "ruc/singleton.h"
+#include <string_view>
+
+class Loader final : public ruc::Singleton<Loader> {
+public:
+	Loader(s) {}
+
+	void init();
+	void destroy();
+
+	void setRomPath(std::string_view rom_path) { m_rom_path = rom_path; }
+
+private:
+	std::string_view m_rom_path;
+};

src/main.cpp

@@ -5,63 +5,22 @@
  * SPDX-License-Identifier: MIT
  */
 
-#include "cpu.h"
+#include "loader.h"
-#include "emu.h"
+#include "ruc/argparser.h"
-#include "ppu.h"
-#include "ruc/file.h"
 #include "ruc/format/print.h"
 #include "ruc/timer.h"
+#include <string_view>
 
-int main(int argc, char* argv[])
+int main(int argc, const char* argv[])
 {
-	(void)argc;
+	std::string_view rom_path;
-	(void)argv;
 
-	ruc::Timer t;
+	ruc::ArgParser argParser;
+	argParser.addOption(rom_path, 'r', "rom", nullptr, nullptr, "", ruc::ArgParser::Required::Yes);
+	argParser.parse(argc, argv);
 
-	print("{}ms\n", t.elapsedNanoseconds() / 1000000.0);
+	Loader::the().setRomPath(rom_path);
-
+	Loader::the().init();
-	Emu::the().init(8000000);
-
-	CPU cpu(8000000);
-	PPU ppu(4000000);
-
-	Emu::the().addProcessingUnit("cpu", &cpu);
-	Emu::the().addProcessingUnit("ppu", &ppu);
-
-	// https://gbdev.io/pandocs/Memory_Map.html
-	// https://gbdev.io/pandocs/Power_Up_Sequence.html
-	Emu::the().addMemorySpace("BOOTROM1", 0x0000, 0x00ff);   // 256B
-	Emu::the().addMemorySpace("BOOTROM2", 0x0200, 0x08ff);   // 1792B
-	Emu::the().addMemorySpace("VRAM", 0x8000, 0x9fff, 2);    // 8KiB * 2 banks
-	Emu::the().addMemorySpace("CARDRAM", 0xa000, 0xbfff, 1); // 8KiB * ? banks, if any
-	Emu::the().addMemorySpace("WRAM1", 0xc000, 0xcfff);      // 4 KiB, Work RAM
-	Emu::the().addMemorySpace("WRAM2", 0xd000, 0xdfff, 7);   // 4 KiB * 7 banks, Work RAM
-	Emu::the().addMemorySpace("ECHORAM", 0xe000, 0xfdff);    // 7680B, Mirror of 0xc000~0xddff
-	Emu::the().addMemorySpace("OAM", 0xfe00, 0xfe9f);        // 160B, Object Attribute Memory (VRAM Sprite Attribute Table)
-	Emu::the().addMemorySpace("Not Usable", 0xfea0, 0xfeff); // 96B, Nintendo probibits this area
-	Emu::the().addMemorySpace("IO", 0xff00, 0xff7f);         // 128B, I/O Registers
-	Emu::the().addMemorySpace("HRAM", 0xff80, 0xfffe);       // 127B, High RAM (CPU cache)
-	Emu::the().addMemorySpace("IE", 0xffff, 0xffff);         // 1B, Interrupt Enable register
-
-	// Load bootrom
-	auto bootrom = ruc::File("gbc_bios.bin").data();
-	for (size_t i = 0; i < bootrom.length(); ++i) {
-		// Skip cartridge header memory range
-		if (i >= 0x0100 && i <= 0x01ff) {
-			continue;
-		}
-
-		Emu::the().writeMemory(i, bootrom[i]);
-	}
-
-	// Get shared register
-	print("{}\n", *Emu::the().processingUnit("cpu")->sharedRegister("a"));
-	print("{}\n", *Emu::the().processingUnit("cpu")->sharedRegister("b"));
-
-	while (true) {
-		Emu::the().update();
-	}
 
 	return 0;
 }