--- nono/vm/pio.h 2026/04/29 17:04:45 1.1.1.5 +++ nono/vm/pio.h 2026/04/29 17:04:50 1.1.1.6 @@ -68,9 +68,9 @@ class PPIDevice protected: // BusIO インタフェース static const uint32 NPORT = 4; - uint64 Read(uint32 addr); - uint64 Write(uint32 addr, uint32 data); - uint64 Peek(uint32 addr); + uint64 Read(uint32 offset); + uint64 Write(uint32 offset, uint32 data); + uint64 Peek(uint32 offset); }; class PIO0Device @@ -97,9 +97,9 @@ class PIO0Device protected: // BusIO インタフェース static const uint32 NPORT = 4; - uint64 Read(uint32 addr); - uint64 Write(uint32 addr, uint32 data); - uint64 Peek(uint32 addr); + uint64 Read(uint32 offset); + uint64 Write(uint32 offset, uint32 data); + uint64 Peek(uint32 offset); private: uint32 GetPA() const; @@ -130,9 +130,9 @@ class PIO1Device protected: // BusIO インタフェース static const uint32 NPORT = 4; - uint64 Read(uint32 addr); - uint64 Write(uint32 addr, uint32 data); - uint64 Peek(uint32 addr); + uint64 Read(uint32 offset); + uint64 Write(uint32 offset, uint32 data); + uint64 Peek(uint32 offset); private: void SetPC(int, int) override; @@ -143,5 +143,6 @@ class PIO1Device Event poffevent {}; // 電源オフイベント }; +extern std::unique_ptr gPPI; extern std::unique_ptr gPIO0; extern std::unique_ptr gPIO1;