--- nono/vm/subram.h 2026/04/29 17:05:17 1.1.1.1 +++ nono/vm/subram.h 2026/04/29 17:05:25 1.1.1.2 @@ -18,22 +18,22 @@ class SubRAMBaseDevice : public IODevice using inherited = IODevice; public: SubRAMBaseDevice(int objid_, uint ramsize_kb); - virtual ~SubRAMBaseDevice() override; + ~SubRAMBaseDevice() 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 Read8(uint32 addr) override; + busdata Read16(uint32 addr) override; + busdata Read32(uint32 addr) override; + busdata Write8(uint32 addr, uint32 data) override; + busdata Write16(uint32 addr, uint32 data) override; + busdata Write32(uint32 addr, uint32 data) override; + busdata Peek8(uint32 addr) override; + bool Poke8(uint32 addr, uint32 data) override; private: // アドレスデコーダ - uint64 Decoder(uint32 addr) const; + uint32 Decoder(uint32 addr) const; std::unique_ptr ram {}; uint ramsize {};