--- nono/vm/romemu_luna88k.h 2026/04/29 17:05:17 1.1.1.11 +++ nono/vm/romemu_luna88k.h 2026/04/29 17:05:24 1.1.1.12 @@ -12,7 +12,6 @@ #include "romemu_luna.h" -class InterruptDevice; class MPU88xx0Device; class Luna88kPROMEmuDevice : public LunaPROMEmuDevice @@ -29,7 +28,7 @@ class Luna88kPROMEmuDevice : public Luna public: Luna88kPROMEmuDevice(); - virtual ~Luna88kPROMEmuDevice() override; + ~Luna88kPROMEmuDevice() override; bool Init() override; @@ -37,14 +36,13 @@ class Luna88kPROMEmuDevice : public Luna bool FLineCallback(MPU88xx0Device *cpu); private: - uint32 ROM_Init() override; - uint32 ROM_Entry() override; + void ROM_InitMD() override; void ProcessChar(char asciicode) override; + uint32 LoadFile(const std::string& fname) override; void Command() override; void CommandH(const std::vector& arg); void CommandB(const std::vector& arg); - void CommandBH(); void CommandNvram(const std::vector& arg); void CommandNvramShowAll(); void CommandNvramShow(const std::vector& arg); @@ -57,10 +55,8 @@ class Luna88kPROMEmuDevice : public Luna // NVRAM uint32 FindNVRAM(const std::string& key) const; - bool InitNVRAM(); - void GetNVRAM(bootinfo_t&); - - uint32 b_entrypoint {}; + bool InitNVRAM() override; + void GetNVRAM(bootinfo_t&) override; // nvram コマンドの遷移で覚えておくもの int nvram_offset {}; @@ -71,6 +67,4 @@ class Luna88kPROMEmuDevice : public Luna // 0 (PROMPT_DEFAULT) が通常の行入力プロンプト。 // PROMPT_NVRAM_* は nvram コマンドでの確認プロンプト。 int prompt_idx {}; - - InterruptDevice *interrupt {}; };