diff --git a/include/emulator.hpp b/include/emulator.hpp index 366f86f2..f7d947f6 100644 --- a/include/emulator.hpp +++ b/include/emulator.hpp @@ -40,9 +40,11 @@ enum class ROMType { class Emulator { EmulatorConfig config; + + Memory memory; + // We want memory to be constructed before the rest of the emulator, so it's at the top of the struct CPU cpu; GPU gpu; - Memory memory; Kernel kernel; std::unique_ptr dsp; Scheduler scheduler;