--- nono/vm/mainbus_x68k.h 2026/04/29 17:05:25 1.1.1.1 +++ nono/vm/mainbus_x68k.h 2026/04/29 17:05:33 1.1.1.3 @@ -28,15 +28,10 @@ class X68kMainbus final : public Mainbus void ResetByMPU() override; void ResetHard(bool poweron) override; - busdata Peek8(uint32 addr) override; - bool Poke8(uint32 addr, uint32 data) override; - - busdata Read8(busaddr addr) override; - busdata Read16(busaddr addr) override; - busdata Read32(busaddr addr) override; - busdata Write8(busaddr addr, uint32 data) override; - busdata Write16(busaddr addr, uint32 data) override; - busdata Write32(busaddr addr, uint32 data) override; + busdata Read(busaddr addr) override; + busdata Write(busaddr addr, uint32 data) override; + busdata Peek1(uint32 addr) override; + bool Poke1(uint32 addr, uint32 data) override; private: DECLARE_MONITOR_CALLBACK(MonitorUpdate); @@ -53,17 +48,8 @@ class X68kMainbus final : public Mainbus std::unique_ptr pInterrupt {}; std::array is_intio {}; - // 拡張メモリの開始位置 [MB] - int extstart {}; - // 拡張メモリのサイズ [MB] - int extsize {}; - - // アクセス状況はとりあえず 1GB 分を 1048 * 1MB ずつ。 - std::array accstat_read {}; - std::array accstat_write {}; - Monitor monitor { this }; - Monitor monitor_accstat { this }; + Monitor *monitor {}; std::array bankram /*{}*/; };