--- nono/vm/pedec.h 2026/04/29 17:05:24 1.1.1.9 +++ nono/vm/pedec.h 2026/04/29 17:05:59 1.1.1.11 @@ -16,7 +16,7 @@ class PEDECDevice : public InterruptDevi { using inherited = InterruptDevice; - static const int baseaddr = 0xe9c000; + static const uint32 baseaddr = 0xe9c000; public: // SPC からの割り込みはここでマスク制御しないので intmap_enable には @@ -42,14 +42,15 @@ class PEDECDevice : public InterruptDevi busdata InterruptAcknowledge(int lv) override; // 割り込みコントローラからのモニタ表示 - void MonitorUpdate(TextScreen& screen, uint intr_level, int y); + void MonitorScreen(TextScreen& screen, uint intr_level, int y); protected: // BusIO インタフェース static const uint32 NPORT = 8; - busdata Read(uint32 offset); - busdata Write(uint32 offset, uint32 data); - busdata Peek(uint32 offset); + busdata ReadPort(uint32 offset); + busdata WritePort(uint32 offset, uint32 data); + busdata PeekPort(uint32 offset); + bool PokePort(uint32 offset, uint32 data); private: // 割り込みステータスレジスタの値を取得 @@ -63,6 +64,6 @@ class PEDECDevice : public InterruptDevi InterruptDevice *interrupt {}; }; -static inline PEDECDevice *GetPEDECDevice() { +inline PEDECDevice *GetPEDECDevice() { return Object::GetObject(OBJ_PEDEC); }