--- nono/vm/mpu.cpp 2026/04/29 17:05:54 1.1.1.18 +++ nono/vm/mpu.cpp 2026/04/29 17:05:59 1.1.1.19 @@ -58,11 +58,26 @@ MPUDevice::Init() } void +MPUDevice::ResetHard(bool poweron) +{ + inherited::ResetHard(poweron); + last_vector = -1; +} + +void MPUDevice::PowerOff() { scheduler->StopEvent(exec_event); } +int32 +MPUDevice::GetAndResetLastVector() +{ + auto vector = last_vector; + last_vector = -1; + return vector; +} + // // メイン MPU (680x0/88xx0) 共通部 @@ -104,12 +119,16 @@ MainMPUDevice::Init() item.Err(); return false; } - clock_nsec = 1000 * 1000 / clock_khz; - if (clock_nsec < 1) { + clock_tsec = 1_msec / clock_khz; + if (clock_tsec < 1) { item.Err("Clock speed too high"); return false; } + // キャッシュを無効にするテスト用。 + force_disable_dcache = gConfig->Find("mpu-force-disable-dcache").AsBool(); + force_disable_icache = gConfig->Find("mpu-force-disable-icache").AsBool(); + scheduler->ConnectMessage(MessageID::MPU_TRACE_MAIN, this, ToMessageCallback(&MainMPUDevice::TraceMessage));