From c477b67a0993421eabdb87819df498bcc5320107 Mon Sep 17 00:00:00 2001 From: Valiantsin Dzerakh Date: Tue, 17 Nov 2026 10:35:49 +0300 Subject: [PATCH] The runtime library's module tables hold 32 modules, not the release's MOD_COUNT: an install's plugins fit (#845) loader.c and memory.c sized their tables by MOD_COUNT of the layout.h make_release.py built libtotkrt.a against (3: main, subsdk0, sdk). An install whose rebuild adds a plugin has 4, and its service run stopped at once with "loader: 4 modules in the layout"; dev builds compile those files against their own layout and never saw it. RT_MAX_MODULES (host.h) is the bound now; the loader still refuses a layout above it. Co-Authored-By: Claude Opus 5.5 --- runtime/host.h | 3 +++ runtime/loader.c | 8 ++++---- runtime/memory.c | 4 ++-- tools/make_release.py | 3 ++- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/runtime/host.h b/runtime/host.h index d4f8c060..8bb2804a 100644 --- a/runtime/host.h +++ b/runtime/host.h @@ -207,6 +207,9 @@ typedef struct { void ldr_load(const char *exefs_dir); // load, relocate (overrides applied), seal; once extern GuestFn ldr_plugin_import; // set before ldr_load (plugin_init.c): every JUMP_SLOT // import of a plugin binds to this observer +// The module tables of the runtime library: it is built once per release (tools/build_game.py --make-runtime-lib), +// before an install's layout (recomp/layout.py) adds its mod plugins after sdk, so they do not use that MOD_COUNT. +#define RT_MAX_MODULES 32 int ldr_count(void); const RtLoaded *ldr_module(int i); // order: main, subsdk0, sdk uint64_t ldr_symbol(const char *name); // exported definition, 0 if none diff --git a/runtime/loader.c b/runtime/loader.c index 6c698ffb..b1911fe7 100644 --- a/runtime/loader.c +++ b/runtime/loader.c @@ -47,11 +47,11 @@ typedef struct { uint64_t *plt_slot, *plt_stub, nplt; // PLT stubs sorted by GOT slot (ldr_plt_stub), built on first use // statistics uint64_t kinds[K_COUNT], sym_import, sym_own; - uint32_t imports, import_to[MOD_COUNT], weak_unresolved, strong_unresolved; + uint32_t imports, import_to[RT_MAX_MODULES], weak_unresolved, strong_unresolved; uint32_t init_off; } Mod; -static Mod mods[MOD_COUNT]; +static Mod mods[RT_MAX_MODULES]; GuestFn ldr_plugin_import; static int nmods; static uint64_t identity_refs, stubs; @@ -503,7 +503,7 @@ static void seal(Mod *m) { void ldr_load(const char *exefs_dir) { if (nmods) rt_fatal("ldr_load called twice"); if (!mem_layout()->pool) rt_fatal("ldr_load before mem_init"); - if (rt_layout_count > MOD_COUNT) rt_fatal("loader: %d modules in the layout", rt_layout_count); + if (rt_layout_count > RT_MAX_MODULES) rt_fatal("loader: %d modules in the layout", rt_layout_count); int n = 0; for (int i = 0; i < rt_layout_count; i++) { // A mod plugin's file that is gone or changed since the build is left out at play time: its patch set cannot @@ -622,7 +622,7 @@ uint64_t ldr_plt_stub(const char *module, const char *name) { typedef struct { const char *name; uint64_t kinds[K_COUNT], total, sym_import, sym_own; - uint32_t imports, to[MOD_COUNT], weak, init_off, init_array; + uint32_t imports, to[RT_MAX_MODULES], weak, init_off, init_array; } Expect; static const Expect expect_121[] = { {"main", {508816, 1415, 32, 641}, 510904, 2088, 0, 675, {0, 16, 647}, 12, 0x30, 10673}, diff --git a/runtime/memory.c b/runtime/memory.c index c452c398..5df53916 100644 --- a/runtime/memory.c +++ b/runtime/memory.c @@ -57,7 +57,7 @@ static uint8_t *alias_pages; // 1 per mapped 4 KiB page of the alias regi typedef struct { uint64_t dst, src, size; } StackMap; static StackMap stack_maps[MAX_STACK_MAPS]; static unsigned nstack_maps; -static uint8_t *module_perm[MOD_COUNT]; // per data page of each module: perm | ATTR_PERMISSION_LOCKED +static uint8_t *module_perm[RT_MAX_MODULES]; // per data page of each module: perm | ATTR_PERMISSION_LOCKED static uint64_t align_up(uint64_t v, uint64_t a) { return (v + a - 1) & ~(a - 1); } @@ -530,7 +530,7 @@ uint32_t mem_unmap_physical(uint64_t a, uint64_t n) { return alias_map(1, a, n); // as taken (Code, RX), so the SDK never picks it. static void taken_gap(uint64_t a, uint64_t *base, uint64_t *size) { uint64_t lo = 0, hi = RT_ADDRESS_LIMIT; - RtRange known[3 + MOD_COUNT + 2]; + RtRange known[3 + RT_MAX_MODULES + 2]; int n = 0; known[n++] = (RtRange){L.aslr.base, low_size}; known[n++] = L.alias; diff --git a/tools/make_release.py b/tools/make_release.py index 2122ccd2..5cc9ede6 100644 --- a/tools/make_release.py +++ b/tools/make_release.py @@ -25,7 +25,8 @@ runtime/ and bin/ (PATH holds the Windows system directory and those), then runs Both need one game version extracted and lifted first (tools/extract.py, recomp/gen.py): generated/v121 or, without it, generated/v143, and for --prove its build/extracted/ (they are read, nothing is written to them). The -runtime library reads only what both versions' layout.h share (MOD_COUNT, MOD_MAIN_BASE), so either serves. +runtime library reads only what both versions' layout.h share (MOD_MAIN_BASE; its module tables hold RT_MAX_MODULES, so an +install's layout may add mod plugins), so either serves. A release also needs build/xlate built from the current sources (tools/build_xlate.py); the script stops first if not.