--- nono/vm/mpu64180.h 2026/04/29 17:05:29 1.1.1.3 +++ nono/vm/mpu64180.h 2026/04/29 17:05:33 1.1.1.4 @@ -81,13 +81,6 @@ class MPU64180Device : public MPUDevice, bool GetIEF1() const { return ief1; } bool GetIEF2() const { return ief2; } - // CPU からの論理メモリアクセス - // (MSXDOSDevice からも呼ぶので public にしてある) - uint32 Read1(uint32 addr); - uint32 Write1(uint32 addr, uint32 data); - uint32 Read2(uint32 addr); - void Write2(uint32 addr, uint32 data); - // アドレス変換 (デバッガ用) uint32 TranslatePeek(uint32) const; @@ -119,8 +112,14 @@ class MPU64180Device : public MPUDevice, uint32 GetWW(uint) const; void SetWW(uint, uint32); + // CPU からの論理メモリアクセス uint32 Fetch1(); uint32 Fetch2(); + uint32 Read1(uint32 addr); + uint32 Write1(uint32 addr, uint32 data); + uint32 Read2(uint32 addr); + void Write2(uint32 addr, uint32 data); + void Jump(uint16); void op_illegal(int pos); @@ -302,9 +301,9 @@ class MPU64180Device : public MPUDevice, DECLARE_MONITOR_CALLBACK(MonitorUpdateReg); DECLARE_MONITOR_CALLBACK(MonitorUpdateIO); DECLARE_MONITOR_CALLBACK(MonitorUpdateIntr); - Monitor reg_monitor { this }; - Monitor io_monitor { this }; - Monitor intr_monitor { this }; + Monitor *reg_monitor {}; + Monitor *io_monitor {}; + Monitor *intr_monitor {}; // 実行コールバック EventCallback_t exec_func {};