--- nono/vm/rom.h 2026/04/29 17:05:17 1.1.1.10 +++ nono/vm/rom.h 2026/04/29 17:05:25 1.1.1.11 @@ -17,21 +17,21 @@ class ROMDevice : public IODevice using inherited = IODevice; public: ROMDevice(int objid_); - virtual ~ROMDevice() override; + ~ROMDevice() 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; + 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; // ファイル名を取得。なければ NULL。 const char *GetFilename() const; - // アクセスウェイトを設定 - void SetWait(uint32 wait_) { wait = wait_; } + // アクセスウェイト [clock] を取得/設定 + void SetWait(uint32 wait_); protected: bool LoadROM(const char *name, int size); @@ -55,8 +55,8 @@ class ROMDevice : public IODevice // ライトアクセス時の動作 (Write*() の戻り値)。 // 派生クラスが指定すること。 - uint64 write_op {}; + busdata write_op {}; // アクセスウェイト - uint32 wait {}; + busdata wait {}; };