--- nono/vm/cmmu.h 2026/04/29 17:05:18 1.1.1.5 +++ nono/vm/cmmu.h 2026/04/29 17:06:01 1.1.1.8 @@ -42,20 +42,20 @@ class CMMUDevice : public IODevice public: CMMUDevice(); - virtual ~CMMUDevice() override; + ~CMMUDevice() override; bool Init() override; - uint64 Read32(uint32 addr) override; - uint64 Write32(uint32 addr, uint32 data) override; - uint64 Peek8(uint32 addr) override; + busdata Read(busaddr addr) override; + busdata Write(busaddr addr, uint32 data) override; + busdata Peek1(uint32 addr) override; private: // アドレスデコーダ static uint32 Decoder(uint32 addr); - // Peek8() の下請け - uint32 Peek32(uint32 addr) const; + // Peek1() の下請け + uint32 Peek4(uint32 addr) const; // 指定された ID の CMMU(m88200) を返す。なければ NULL を返す。 m88200 *GetCMMU(uint id) const { @@ -69,6 +69,6 @@ class CMMUDevice : public IODevice std::array cmmus {}; }; -static inline CMMUDevice *GetCMMUDevice() { +inline CMMUDevice *GetCMMUDevice() { return Object::GetObject(OBJ_CMMUIO); }