--- nono/vm/extram.h 2026/04/29 17:05:18 1.1.1.1 +++ nono/vm/extram.h 2026/04/29 17:06:01 1.1.1.4 @@ -17,19 +17,15 @@ class ExtRAMDevice : public IODevice using inherited = IODevice; public: ExtRAMDevice(); - virtual ~ExtRAMDevice() override; + ~ExtRAMDevice() override; bool Init() override; void ResetHard(bool poweron) override; - uint64 Read8(uint32 addr) override; - uint64 Read16(uint32 addr) override; - uint64 Read32(uint32 addr) override; - uint64 Write8(uint32 addr, uint32 data) override; - uint64 Write16(uint32 addr, uint32 data) override; - uint64 Write32(uint32 addr, uint32 data) override; - uint64 Peek8(uint32 addr) override; - uint64 Poke8(uint32 addr, uint32 data) override; + busdata Read(busaddr addr) override; + busdata Write(busaddr, uint32 data) override; + busdata Peek1(uint32 addr) override; + bool Poke1(uint32 addr, uint32 data) override; // 拡張メモリ容量(バイト単位)を取得 int GetSize() const { return ram_size; } @@ -48,6 +44,6 @@ class ExtRAMDevice : public IODevice uint ram_size {}; }; -static inline ExtRAMDevice *GetExtRAMDevice() { +inline ExtRAMDevice *GetExtRAMDevice() { return Object::GetObject(OBJ_EXTRAM); }