From 9be72ae9c0ccef34dcd5a0aa8068edb5fa3b4fd2 Mon Sep 17 00:00:00 2001 From: chrg6 Date: Tue, 10 Nov 2026 23:24:12 -0500 Subject: [PATCH] When the system-event table is full, reuse the slot of an event the guest has destroyed instead of ending the process. Entries were never removed, and every reload of a save binds two events at new addresses. Co-Authored-By: Claude Fable 5.2 --- runtime/kernel.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/runtime/kernel.c b/runtime/kernel.c index e61faccf..62ea9726 100644 --- a/runtime/kernel.c +++ b/runtime/kernel.c @@ -2090,8 +2090,14 @@ void kern_bind_system_event(Cpu *c, uint64_t ev, int autoclear) { plat_mutex_lock(&g_se_lock); int i = 0; while (i < g_nse && g_se[i].ev != ev) i++; - if (i == g_nse) { - if (g_nse == (int)(sizeof g_se / sizeof *g_se)) rt_fatal("kern_bind_system_event: table full"); + if (i == g_nse && g_nse == (int)(sizeof g_se / sizeof *g_se)) { + // Full: entries are never removed, and a long session binds events at new addresses (two per reload of a + // save). An entry whose event the guest destroyed (its state byte is 0, or its memory is gone) gives its slot. + i = 0; + while (i < g_nse && mem_readable(g_se[i].ev + SE_STATE, 1) && se_live(g_se[i].ev)) i++; + if (i == g_nse) rt_fatal("kern_bind_system_event: table full (%d live system events)", g_nse); + g_se[i].ev = ev; + } else if (i == g_nse) { g_se[g_nse++].ev = ev; } g_se[i].wh = wh;