From b870a9f860197b3ac1ce6b62445c7179de644c62 Mon Sep 17 00:00:00 2001 From: shenjack <3695888@qq.com> Date: Mon, 16 Nov 2026 19:23:22 +0800 Subject: [PATCH 1/4] Add high-frame-rate climbing and gear rotation fixes for 1.1.0 Port the climbing compensation and frame-delta-scaled gear checks to verified 1.1.0 sites, preserving full-width scratch registers and local stack state. Read patch tables explicitly as UTF-8. --- recomp/patches-v110.txt | 17 +++++++++++++++++ recomp/patches.py | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/recomp/patches-v110.txt b/recomp/patches-v110.txt index 0741a5ee..ecd1c1ba 100644 --- a/recomp/patches-v110.txt +++ b/recomp/patches-v110.txt @@ -119,6 +119,23 @@ site cascade main 1158040 52a84408 @page:x8 b9404508 site cascade main 11580c8 52a85408 @page:x8 b9404908 site cascade main 115814c 52a86408 @page:x8 b9404d08 +# High-frame-rate climbing (#35, #276, #1001): r is in s9 in the local 1.1.0 controller at main+0x1927948. +# The shipping formula multiplies by -0.181, doubles with fadd, then adds 1.272; keep its rounding and [0.5, 1.5] clamp. +# For r<1 use the 1.2.1 climb h(r,u), u=max(page+0,r); the normal 30 Hz factor stays unchanged. +# runtime/frame_rate.c disables climb when realtime=0; TOTK_CLIMB_FIX=0 keeps the original instruction. +# A 96-byte, 16-byte-aligned stack frame saves x8 and full q5/q6/q7/q16/q17; only s0/s1 are outputs. +set climb TOTK_CLIMB_FIX 1 +site climb main 19279f0 1e2f1001 d10183ff f90003e8 ad009be5 ad01c3e7 3d8017f1 @page:x8 bd400111 1e296a31 1e2e1005 1e3138a5 52862508 72a7e308 1e270106 1e2608a5 1e2528a5 529a1ca8 72a7f448 1e270106 1e2628a5 1e201006 1e2678a5 52946dc8 72a7e528 1e270106 1e3118c6 52828248 72a7dfe8 1e270107 1e2728c6 529573e8 72a7b5a8 1e270107 1f1118e6 1e283a27 2f00e410 1e3068e7 1e261010 1f1098e6 1e241010 1e3078c6 1e2668a5 1e256800 1e2f1001 1e256821 3dc017f1 ad41c3e7 ad409be5 f94003e8 910183ff + +# Gear rotation check (#330, #984): main+0x213eec4, vtable 0x347e8e8 slot +0x110. +# AI dispatchers 0x1205b90 / 0x2ae29ac pass a context with frame delta at +8; keep it in the already-saved s12. +# Scale RotateStartDeg/30 by that delta for all three angle compares: 0x213f10c/0x213f174/0x213f1b0. +# The second site saves full q4 in a 16-byte stack slot, without relying on a later callee killing it. +# This set does not read the patch page and works with realtime=0; TOTK_HIGHFPS_FIX=0 keeps both original sites. +set gears TOTK_HIGHFPS_FIX 1 +site gears main 213eee4 f9402001 bd40082c f9402001 +site gears main 213f0d4 1e24180c 3c9f0fe4 1e241804 1e2c088c 3cc107e4 + # Spin waits, from tools/spin_waits.py --exefs build/extracted/v110/exefs --patches recomp/patches-v110.txt: loops that only # another thread can end; their back-edges pass rt_spin_gate (runtime/kernel.c), TOTK_SPIN=0 keeps the core. diff --git a/recomp/patches.py b/recomp/patches.py index 0f62b2c7..a3746ac5 100644 --- a/recomp/patches.py +++ b/recomp/patches.py @@ -186,7 +186,7 @@ def load(path, mods): """Table from a patch file; mods is layout() output [(name, base, size)].""" sets, index, sites, spins, hooks, ordered, plugins = [], {}, {}, {}, {}, set(), {} bases = {n: (b, s) for n, b, s in mods} - for no, raw in enumerate(Path(path).read_text().splitlines(), 1): + for no, raw in enumerate(Path(path).read_text(encoding='utf-8').splitlines(), 1): f = raw.split('#', 1)[0].split() if not f: continue From 90bf2f25aaf43d22c329a21c494a04a4af81810b Mon Sep 17 00:00:00 2001 From: shenjack <3695888@qq.com> Date: Mon, 16 Nov 2026 19:23:23 +0800 Subject: [PATCH 2/4] Test and document the 1.1.0 climbing and gear patch contracts Add native and Unicorn numeric comparisons, switch gating, register and stack preservation checks, and optional local ExeFS anchor validation. Document supported sites and acceptance boundaries. --- docs/patches-v110.md | 62 +++++- tests/patches_v110_highfps_check.py | 306 ++++++++++++++++++++++++++++ 2 files changed, 367 insertions(+), 1 deletion(-) create mode 100644 tests/patches_v110_highfps_check.py diff --git a/docs/patches-v110.md b/docs/patches-v110.md index 07cb0082..66b20c05 100644 --- a/docs/patches-v110.md +++ b/docs/patches-v110.md @@ -14,7 +14,7 @@ The built-in table is [recomp/patches-v110.txt](../recomp/patches-v110.txt). The | shadow | 1 | The sun shadow map takes its fixed size from page +92 before rounding. The shadow-resolution setting enables it; `shadow_res=game` leaves the game's sizing. | | cascade | 4 | Read the four sun shadow cascade defaults from page +64..76. Shadow range 100 leaves the original constructor. | -The table has 12 sets and 50 instruction sites in total. Its existing 889 spin back-edges are unchanged. The new sets use the existing runtime page and settings; no new setting, allocator or renderer path is introduced. +At the current upstream baseline `6b0974f08d580571ebf16f6f1405367c61405eec`, the table has 14 sets and 51 instruction sites before this follow-up, and 16 sets and 54 instruction sites after adding one climb site and two gears sites. Its existing 889 spin back-edges are unchanged. The new sets use the existing runtime page and settings; no new setting, allocator or renderer path is introduced. The camera sites were cross-checked by normalized instruction-window matching from the local 1.0.0 main. The viewport routine has two matching copies: both are patched. Other sites were checked through their data flow: the equipment timer and its gate, the map clock, the ability clock, the NVN texture storage/package calls, the shadow size publication and the cascade parameter constructor. FOV's s8 is overwritten by the next original instruction; x10 is saved. The cursor sites use the same scratch registers as their 1.2.1 counterparts. @@ -39,3 +39,63 @@ python tests/patches_v110_check.py --exefs Without ExeFS, the test uses synthetic memory and the patch table only. It compares the complete integer/SIMD register state, SP and NZCV of the lifted C and Unicorn for all 17 additions, on and off, at 30/60/120 Hz, including pool offsets immediately below and above 2 GiB and at the end of the 32-bit range. Windows test mappings respect its 64 KiB allocation granularity. With ExeFS it additionally validates every original word and spin target. Extracted images and generated C are local build artifacts, never repository content. These checks establish instruction and code-generation contracts. World-scene visual acceptance, texture packs allocating a pool above 2 GiB, physical gyro and comparisons of shadow quality still require gameplay checks. + +## 0.4.0 follow-up: climbing and gears + +The historical audit below compared the final patches and runtime gating added after `3d386fe` against upstream `c89b0f3ee3b131275c5c5c26426128f16469f2cd`. The target is **1.1.0 / v131072**, not 1.1.1. The current baseline is `6b0974f08d580571ebf16f6f1405367c61405eec`: upstream now supplies the 1.1.0 fixed-dynamic-resolution exit (`fixres`) and the version-specific `sync_ahead` frame-wait address. Those are retained unchanged; this follow-up still adds only climb and gears. The table records the older audit boundary, not a claim that current upstream lacks those features. + +| Upstream change | 1.1.0 audit | Scope of this follow-up | +| --- | --- | --- | +| climb | Local main+0x1927948 has the matching velocity compensation, r=s9 and s8=0.5 clamp, but computes the coefficients in a different order. | Port one site at +0x19279f0, using the existing TOTK_CLIMB_FIX and realtime dependency. | +| gears | main+0x213eec4 tests rotation against RotateStartDeg/30 without the update context delta. | Port two sites under TOTK_HIGHFPS_FIX, independently of realtime. | +| fixres / large scene sizes | Existing output/scene sites remain; +0xce9280 is a candidate fixed-dynamic-resolution exit. | Not ported: tiers, render scale, HeapDef and actual rendering still need acceptance checks. | +| grass | +0x100e838 and its +0x100e890 range constant are candidates. | Not ported: locating all six sites and checking textures, heaps and world scenes remain separate work. | +| optref / ability / report | The same crash root cause has not been established on v110; the report loop is not structurally equivalent on every version. | Not ported; guards must not hide an unlocated problem. | +| sync_ahead | frame_wait_lr in [nvn_api_core.c](../runtime/nvn_api_core.c) lists only 121/143 and also requires shadow storage. | Keep the version gating; GPU, readback and fence behaviour has not been accepted. | + +### Shipping code and compensation semantics + +The climb compensation comes from this repository's [1.2.1 climb definition](../recomp/patches-v121.txt) at the fixed baseline. Local 1.1.0 first multiplies by -0.181, doubles with fadd, then adds 1.272. This is algebraically 1.272 - 0.362(r-1), but merging the multiplication changes its floating-point rounding order. This patch extends only the final clamp and preserves the preceding v110 instructions. + +The shipping factor's lower 32 bits stay unchanged at normal 30 Hz and at slower steps with r>=1. The 60 Hz change is intentional: at normal r=0.5, compensation is about 1.8665 instead of the shipping 1.453. Above 60 Hz it uses upstream g(u), with u=max(page+0,r), so reducing the time scale alone does not trigger the higher-frame-rate g branch. It reads existing page+0 without adding fields. + +climb uses a 96-byte, 16-byte-aligned stack frame to preserve x8 and full q5/q6/q7/q16/q17. Only s0/s1 are declared outputs; scalar writes clear their vector upper bits. This avoids relying on 1.2.1 dead-register assumptions. TOTK_CLIMB_FIX=0 executes only the original fmov; existing [frame_step_init](../runtime/frame_rate.c) disables the set when realtime=0. + +The gear function is reached through vtable 0x347e8e8 slot +0x110. AI dispatchers +0x1205b90 and +0x2ae29ac copy context+8 into the passed structure's +8; AI root update +0x1085c88 calls the owner's virtual +0x30 and publishes its returned frame delta there. The first site, +0x213eee4, follows the original str d12 save. This function does not write s12/d12/q12 between that site and the threshold site. Across calls it relies only on AAPCS64 preserving d12's low 64 bits: the delta occupies the low 32 bits and does not depend on the vector upper half surviving. The second site produces a fresh scalar s12, and the original epilogue restores d12; q12's upper half is not callee-saved. + +The threshold becomes (RotateStartDeg/30)*ctx.delta, shared by the three original fcmp/b.le pairs at +0x213f10c, +0x213f174 and +0x213f1b0. The second site also preserves full q4 and restores SP before continuing. gears does not read the patch page, remains active with realtime=0, and restores both shipping sites with TOTK_HIGHFPS_FIX=0. + +### Unique matches and original-word guards + +Each of these original windows occurs exactly once in the local 1.1.0 main. These are addresses and hashes, not game-byte dumps: + +| Window | Length | SHA-256 | +| --- | ---: | --- | +| +0x19279b0 | 108 bytes | 8262a11c180c734f2692a74e9563140f26d743f0f1f95d31732f975b46c27331 | +| +0x213eee4 | 32 bytes | 17487c0fe195655e9a1bcaf49835208bd1ebca86eeef9a2ca0059752f503e378 | +| +0x213f0d0 | 28 bytes | d07279a2abea53cffbd8861e95034cd1a5c85edf90f6094c5261ba55da203577 | + +The generator still checks each original instruction. Optional local tests also check the shipping constants, d12 save, vtable entry, all three compares and their b.le targets. No version-wide fixed address shift was used. + +### Added validation + +The [high-frame-rate patch test](../tests/patches_v110_highfps_check.py) reuses shared CC selection, platform suffixes and mappings, with pathlib paths. The [patch parser](../recomp/patches.py) explicitly reads UTF-8, including the Unicode encoding fixture, independently of the Windows default code page. + +```sh +env CC=clang python tests/patches_v110_highfps_check.py +python tests/patches_v110_highfps_check.py --cflags=-march=x86-64-v2 +python tests/patches_v110_highfps_check.py --exefs --work-dir +``` + +- Windows v3/v2, each with synthetic and local ExeFS input: 3240 native/Unicorn cases per run passed, covering on/off, zero/tiny deltas, adjacent ULPs around 0.5, 30/60/120/240 Hz, slower steps and all 16 NZCV values. +- All 31 GPRs, 32 full 128-bit SIMD registers, SP, NZCV and the complete scratch-memory CRC are compared. Every undeclared output must match its input bit for bit. Nonzero upper-64-bit sentinels in q4/q8/q9 are explicit preconditions. +- Exact save-slot contents, 16-byte stack alignment, restored SP, slot gaps, surrounding canaries and all other scratch memory are checked. No whole memory region or broad SIMD allowlist is excluded. +- Nine default/explicit setting combinations compile the real [patches.c](../runtime/patches.c), frame_step_init and step_store and pass. The existing [#1002 regression](../tests/patches_v110_check.py) retains its SIMD allowlist fix; all four runs pass 408 cases each. +- All five in-memory negative mutations are rejected: corrupt x8, corrupt q17, write outside the save area, restore only d4, and restore only s4. No mutation was applied to the patch file. Combined cases also clobber q12's upper 64 bits to check that calls need preserve only low d12. +- Native WSL Ubuntu 22.04 compilation and execution pass all nine gating combinations. The complete SIMD native replay fails to compile with the installed Clang 14 because the shared [simd_fp.h](../runtime/simd_fp.h) requires newer elementwise builtins. **There is no claim that 3240 Linux replay cases passed.** Synthetic inputs/outputs remain local for a newer-toolchain replay and are not committed. Linux Python differential dependencies were not installed, and the distribution environment was not modified. + +These establish instruction, numeric and configuration contracts, not acceptance of real climbing, shrine gears, slow motion, severe stalls or GPU scenes. This branch did not launch or deploy the game; maintainers perform full builds, installation updates and gameplay acceptance separately. + +### Regeneration requirements + +Re-lift the generated chunks containing main+0x1927948 and main+0x213eec4 and regenerate patch metadata. A normal complete generation is recommended; never hand-edit generated C. RT_PATCH_COUNT changes from 12 to 14, retaining the original 12 indices and appending climb/gears. The patch page address and layout stay unchanged: climb reuses +0 and gears adds no page fields. Do not reuse stale generated objects or lift hashes; rebuild runtime libraries against the regenerated patch macros. diff --git a/tests/patches_v110_highfps_check.py b/tests/patches_v110_highfps_check.py new file mode 100644 index 00000000..bba2da97 --- /dev/null +++ b/tests/patches_v110_highfps_check.py @@ -0,0 +1,306 @@ +"""Check the 1.1.0 climb/gear numeric, switch, full-width register and local-stack contracts. + +Synthetic checks need no game; --exefs also checks local original words and semantic anchors. +Uses the shared differential harness CC selection, Windows/Linux suffixes and mappings, without fixed host paths. +""" +import argparse +import math +import os +import struct +import subprocess +import sys +import tempfile +import zlib +from pathlib import Path + +ROOT = Path(__file__).resolve().parents[1] +sys.path.insert(0, str(ROOT / 'tests' / 'diff')) +from common import BUF, BUF_SIZE, Emu, build_harness, compiler, diff_state, run_harness +import patches +from layout import layout +from lifter import Lifter +from module import Module + +NL = chr(10) +CLIMB, GEAR_LOAD, GEAR_SCALE = 0x19279f0, 0x213eee4, 0x213f0d4 +COMPARES = (0x213f10c, 0x213f174, 0x213f1b0) +SITES = (CLIMB, GEAR_LOAD, GEAR_SCALE) + + +def f32(x): + return struct.unpack(' +#include +#include +#include +#include +#include +static _Alignas(16) unsigned char test_page[4096]; +static int real_on, climb_on, high_on; +static const char *cfg_get(const char *e) { + if (!strcmp(e,"TOTK_REALTIME")) return real_on<0?NULL:real_on?"1":"0"; + if (!strcmp(e,"TOTK_CLIMB_FIX")) return climb_on<0?NULL:climb_on?"1":"0"; + if (!strcmp(e,"TOTK_HIGHFPS_FIX")) return high_on<0?NULL:high_on?"1":"0"; + return NULL; +} +static const void *cfg_meta(const char *e) { + return !strcmp(e,"TOTK_REALTIME") || !strcmp(e,"TOTK_CLIMB_FIX") || !strcmp(e,"TOTK_HIGHFPS_FIX") ? e : NULL; +} +static int cfg_bool(const char *e) { const char *v=cfg_get(e); return !v || strcmp(v,"0"); } +static int plat_mem_commit(uint64_t a, size_t n) { return a==(uintptr_t)test_page && n==4096; } +static void rt_fatal(const char *s, ...) { (void)s; abort(); } +static void rt_log(const char *s, ...) { (void)s; } +''' + macro = '#define RT_PATCH_COUNT %d' % len(table.sets) + NL + macro += '#define RT_PATCH_PAGE ((uintptr_t)test_page)' + NL + macro += '#define RT_PATCH_SETS(X) ' + ' '.join('X(%d,%s,"%s",%d)' % (i, *s) for i, s in enumerate(table.sets)) + NL + frame_pre = '''static _Atomic uint64_t *step_word; +static _Atomic uint32_t *step_interval; +static double step_now; +#define STEP_FIRST_S (1.0/60.0) +static void frame_limit_live(void) {} +''' + main = '''int main(void) { + for (int i=-1;i<8;i++) { + real_on=i<0?-1:!!(i&1); climb_on=i<0?-1:!!(i&2); high_on=i<0?-1:!!(i&4); + memset(test_page,0x5a,sizeof test_page); step_word=NULL; step_interval=NULL; + rt_patches_init(); frame_step_init(); + assert(rt_patch_enabled(rt_patch_set("climb"))==((real_on!=0)&&(climb_on!=0))); + assert(rt_patch_enabled(rt_patch_set("gears"))==(high_on!=0)); + assert((step_word!=NULL)==(real_on!=0)); + if (real_on==0) for (size_t j=0;jx[30]) { ' + lower(on) + ' } else { ' + lower(off) + ' }') + programs.append((off, on)) + args.work_dir.mkdir(parents=True, exist_ok=True) + with tempfile.TemporaryDirectory(prefix='v110-highfps-', dir=args.work_dir) as temp: + work = Path(temp) + gating_check(work, table) + exe = build_harness(work, bodies, 2, args.cflags) + total = 0 + raw_steps = (0.0, 1e-8, 0.125, 0.25, f32(0.5 - 2**-24), 0.5, f32(0.5 + 2**-23), 1.0, 2.0, 16.0) + for raw in raw_steps: + raw = f32(raw) + mem = bytearray((i * 37 + 19) & 255 for i in range(BUF_SIZE)) + struct.pack_into('> 64 for reg in (4, 8, 9)), 'Upper 64-bit SIMD sentinels must be nonzero' + threshold = f32(f32(shipping(r) / 30) * raw) if enabled else f32(shipping(r) / 30) + # Adjacent ULPs exercise greater-than, equal and less-than at all three branch thresholds. + tb = bits(threshold) + v[8] = (v[8] & ~0xffffffff) | (bits(0.5) if k == 0 else max(0, tb + edge)) + sp, nzcv = BUF + BUF_SIZE - 0x100, ((total + len(cases)) % 16) << 28 + code = programs[k][enabled] + pc = base + spec[0] + lo = pc & ~0xffff + text = bytearray(pc - lo + 4 * len(code)) + struct.pack_into('<' + 'I' * len(code), text, pc - lo, *code) + emu = Emu([(lo, text), (table.page, page)]) + emu.mu.mem_write(BUF, bytes(mem)) + ex, esp, enz, epc, ev = emu.run(pc, 0, x, sp, nzcv, v, count=len(code)) + allowed_x = {1} if GEAR_LOAD in spec else set() + if len(spec) == 3: + allowed_x |= {24} + allowed_v = {0, 1} if k == 0 else {12} + preservation(ex, esp, ev, x, sp, v, allowed_x, allowed_v) + if len(spec) != 3: + assert enz == nzcv + touched = [] + if enabled and k == 0: + touched = [(sp - 96, x[8].to_bytes(8, 'little'))] + touched += [(sp - 80 + i * 16, v[reg].to_bytes(16, 'little')) + for i, reg in enumerate((5, 6, 7, 16, 17))] + h = compensation(r, raw) + for reg, want in ((0, max(shipping(r), h)), (1, max(1.5, h))): + assert math.isclose(scalar(ev[reg]), want, rel_tol=2e-6, abs_tol=2e-7), (reg, r, raw, scalar(ev[reg]), want) + assert ev[reg] >> 32 == 0 + if r >= 1 and raw <= r: + assert ev[0] & 0xffffffff == v[0] & 0xffffffff and ev[1] == bits(1.5), 'Shipping factor bits unchanged at 30 Hz and slower steps' + if not enabled and k == 0: + assert ev[0] == v[0] and ev[1] == bits(1.5) + if enabled and GEAR_SCALE in spec: + touched = [(sp - 16, v[4].to_bytes(16, 'little'))] + want = f32(f32(scalar(v[0]) / scalar(v[4])) * raw) + assert ev[12] == bits(want) + if GEAR_LOAD in spec: + assert ex[1] == BUF + 0x4000 + if k == 1 and enabled: + assert ev[12] == bits(raw) + if len(spec) == 3: + angle, limit = scalar(v[8]), scalar(ev[12]) + # ARM64 b.le also accepts unordered (N != V), unlike Python NaN <= comparisons. + want_branch = math.isnan(angle) or math.isnan(limit) or angle <= limit + assert ex[24] == want_branch, (spec, enabled, raw, r, edge, ex[24], angle, limit, hex(enz)) + want_mem = bytearray(mem) + for address, data in touched: + at = address - BUF + want_mem[at:at + len(data)] = data + actual_mem = bytes(emu.mu.mem_read(BUF, BUF_SIZE)) + assert actual_mem == want_mem, 'Only exact save slots may change; all other memory, gaps and canaries must stay intact' + assert actual_mem[sp - BUF - 112:sp - BUF - 96] == mem[sp - BUF - 112:sp - BUF - 96] + assert actual_mem[sp - BUF:sp - BUF + 16] == mem[sp - BUF:sp - BUF + 16] + cases.append((k, 0, x, sp, nzcv, v, True)) + expected.append((ex, esp, enz, epc, ev, zlib.crc32(actual_mem))) + page_path = work / 'page.bin' + page_base = table.page & ~0xffff + page_path.write_bytes(bytes(table.page - page_base) + page) + records, err = run_harness(exe, work, mem, cases, [(page_base, page_path)]) + assert not err and len(records) == len(cases), err + for case, want, got in zip(cases, expected, records): + delta = diff_state(got, want, False, True) + assert not delta, (specs[case[0]], delta) + total += len(cases) + print(f'v110: {total} native/Unicorn cases passed; 6 contracts, on/off, 16 NZCV, full GPR/SIMD/SP/memory') + return 0 + + +if __name__ == '__main__': + sys.exit(main()) From a7f24442b6cbdef58b6706c7161f7bdcaea6dee5 Mon Sep 17 00:00:00 2001 From: Valiantsin Dzerakh Date: Thu, 19 Nov 2026 21:07:01 +0300 Subject: [PATCH 3/4] The cheat, ExeFS patch and plugin tools read and write their patch files as UTF-8, the encoding recomp/patches.py load now reads them in Without Python's UTF-8 mode these tools used the locale code page, so a plugin image path with non-ASCII characters (tools/exefs_plugins.py plugin_lines) would reach the generator in a code page it no longer reads. Co-Authored-By: Claude Opus 5.5 --- tools/cheats.py | 6 +++--- tools/exefs_patches.py | 4 ++-- tools/exefs_plugins.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/cheats.py b/tools/cheats.py index e7ca05b6..3620aa34 100644 --- a/tools/cheats.py +++ b/tools/cheats.py @@ -349,7 +349,7 @@ def main(): args = ap.parse_args() sys.stdout.reconfigure(errors='replace') # cheat names in a console without their characters m = Main(args.exefs / 'main') - text = args.patches.read_text() + text = args.patches.read_text(encoding='utf-8') files = cheat_files(args.mods, build_id(args.exefs / 'main')) cheats = [c for mod, f in files for c in parse(f.read_text(encoding='utf-8-sig', errors='replace'), mod)] sets, sites, status = [], [], [] @@ -357,7 +357,7 @@ def main(): classify(m, c) if c.sites: name = f'cheat_{c.key.lower()}' - label = c.name.encode('ascii', 'replace').decode() # recomp/patches.py reads the file as ASCII + label = c.name.encode('ascii', 'replace').decode() # a comment only, kept ASCII like the mod labels sets.append(f'set {name} TOTK_CHEAT_{c.key} {1 if c.kind == "master" else 0} # {label}') for a, repl in sorted(c.sites.items()): sites.append(f'site {name} main {a:x} {m.word(a):08x} {" ".join(f"{w:08x}" for w in repl)}') @@ -367,7 +367,7 @@ def main(): print(f'cheats: {c.kind:11} {c.name}' + (f' ({note})' if note else '')) if sets: text += ('\n# Cheats of the mods folder (tools/cheats.py)\n' + '\n'.join(sets) + '\n' + '\n'.join(sites) + '\n') - args.out.write_text(text) + args.out.write_text(text, encoding='utf-8') args.status.parent.mkdir(parents=True, exist_ok=True) args.status.write_text('\n'.join(status) + ('\n' if status else ''), encoding='utf-8') kinds = {} diff --git a/tools/exefs_patches.py b/tools/exefs_patches.py index 51417447..ee81712e 100644 --- a/tools/exefs_patches.py +++ b/tools/exefs_patches.py @@ -319,7 +319,7 @@ def build(args): m = Main(args.exefs / 'main') md = MainData(m) if args.data else None bid = m.nso.build_id - text = args.patches.read_text() + text = args.patches.read_text(encoding='utf-8') builtin = builtin_sites(text) files = patch_files(args.mods) sets, sites, status, data_lines, kinds = [], [], [], [], {} @@ -351,7 +351,7 @@ def build(args): if sets: text += ('\n# ExeFS patches of the mods folder (tools/exefs_patches.py)\n' + '\n'.join(sets) + '\n' + '\n'.join(sites) + '\n') - args.out.write_text(text) + args.out.write_text(text, encoding='utf-8') args.status.parent.mkdir(parents=True, exist_ok=True) args.status.write_text('\n'.join(status) + ('\n' if status else ''), encoding='utf-8') if args.data: diff --git a/tools/exefs_plugins.py b/tools/exefs_plugins.py index 73421bdb..8e51bb94 100644 --- a/tools/exefs_plugins.py +++ b/tools/exefs_plugins.py @@ -454,7 +454,7 @@ def plugin_files(mods): def emit(results, args): """--patches-out and --status from the checked plugins. results: one (module, its NSO file, its record or None, the record's directory, hooks, reasons) per plugin of the layout; no reasons: accepted.""" - text = args.patches.read_text() if args.patches else '' + text = args.patches.read_text(encoding='utf-8') if args.patches else '' builtin = builtin_sites(text) status, sets = [], [] files = {str(f.resolve()): (m, rel, f) for m, rel, f in plugin_files(args.mods)} @@ -482,7 +482,7 @@ def emit(results, args): if over else '')) if sets: text += '\n# Mod plugins (tools/exefs_plugins.py)\n' + '\n'.join(line for s in sets for line in s) + '\n' - args.patches_out.write_text(text) + args.patches_out.write_text(text, encoding='utf-8') args.status.parent.mkdir(parents=True, exist_ok=True) args.status.write_text('\n'.join(status) + ('\n' if status else ''), encoding='utf-8') From aec59b033bf8f4352dbda6305b8647a83ecb3042 Mon Sep 17 00:00:00 2001 From: Valiantsin Dzerakh Date: Thu, 19 Nov 2026 21:07:35 +0300 Subject: [PATCH 4/4] The 1.1.0 patch doc lists climb and gears with the other sets and describes their sites, register contract and tests in one short section The section the pull request added named the set count wrong (RT_PATCH_COUNT 12 to 14; the table goes from 14 to 16 sets), quoted branch hashes as baselines, and carried the author's audit history and WSL toolchain notes, which do not describe the current state. Co-Authored-By: Claude Opus 5.5 --- docs/patches-v110.md | 56 +++++++++----------------------------------- 1 file changed, 11 insertions(+), 45 deletions(-) diff --git a/docs/patches-v110.md b/docs/patches-v110.md index 66b20c05..06846667 100644 --- a/docs/patches-v110.md +++ b/docs/patches-v110.md @@ -13,8 +13,10 @@ The built-in table is [recomp/patches-v110.txt](../recomp/patches-v110.txt). The | pooloff | 2 | Widen texture-pool offsets unsigned, covering 2..4 GiB without changing offsets below 2 GiB. Enabled by default; `TOTK_POOL_OFFSET_PATCH=0` retains the original path. | | shadow | 1 | The sun shadow map takes its fixed size from page +92 before rounding. The shadow-resolution setting enables it; `shadow_res=game` leaves the game's sizing. | | cascade | 4 | Read the four sun shadow cascade defaults from page +64..76. Shadow range 100 leaves the original constructor. | +| climb | 1 | Climbing speed above 60 fps: the 1.2.1 climb factor in the 1.1.0 climb controller. Follows `TOTK_CLIMB_FIX` and needs the real-time step. | +| gears | 2 | The gear rotation check scales its one-frame threshold by the update's frame delta, so shrine gears read as turning above 30 fps. Follows `TOTK_HIGHFPS_FIX`. | -At the current upstream baseline `6b0974f08d580571ebf16f6f1405367c61405eec`, the table has 14 sets and 51 instruction sites before this follow-up, and 16 sets and 54 instruction sites after adding one climb site and two gears sites. Its existing 889 spin back-edges are unchanged. The new sets use the existing runtime page and settings; no new setting, allocator or renderer path is introduced. +The table has 16 sets and 54 instruction sites in total. Its 889 spin back-edges are unchanged. The sets use the existing runtime page and settings; no new setting, allocator or renderer path is introduced. The camera sites were cross-checked by normalized instruction-window matching from the local 1.0.0 main. The viewport routine has two matching copies: both are patched. Other sites were checked through their data flow: the equipment timer and its gate, the map clock, the ability clock, the NVN texture storage/package calls, the shadow size publication and the cascade parameter constructor. FOV's s8 is overwritten by the next original instruction; x10 is saved. The cursor sites use the same scratch registers as their 1.2.1 counterparts. @@ -40,34 +42,15 @@ Without ExeFS, the test uses synthetic memory and the patch table only. It compa These checks establish instruction and code-generation contracts. World-scene visual acceptance, texture packs allocating a pool above 2 GiB, physical gyro and comparisons of shadow quality still require gameplay checks. -## 0.4.0 follow-up: climbing and gears +## Climbing and gears -The historical audit below compared the final patches and runtime gating added after `3d386fe` against upstream `c89b0f3ee3b131275c5c5c26426128f16469f2cd`. The target is **1.1.0 / v131072**, not 1.1.1. The current baseline is `6b0974f08d580571ebf16f6f1405367c61405eec`: upstream now supplies the 1.1.0 fixed-dynamic-resolution exit (`fixres`) and the version-specific `sync_ahead` frame-wait address. Those are retained unchanged; this follow-up still adds only climb and gears. The table records the older audit boundary, not a claim that current upstream lacks those features. +Both sets port their 1.2.1 counterparts in [recomp/patches-v121.txt](../recomp/patches-v121.txt); the comments there explain the formulas. -| Upstream change | 1.1.0 audit | Scope of this follow-up | -| --- | --- | --- | -| climb | Local main+0x1927948 has the matching velocity compensation, r=s9 and s8=0.5 clamp, but computes the coefficients in a different order. | Port one site at +0x19279f0, using the existing TOTK_CLIMB_FIX and realtime dependency. | -| gears | main+0x213eec4 tests rotation against RotateStartDeg/30 without the update context delta. | Port two sites under TOTK_HIGHFPS_FIX, independently of realtime. | -| fixres / large scene sizes | Existing output/scene sites remain; +0xce9280 is a candidate fixed-dynamic-resolution exit. | Not ported: tiers, render scale, HeapDef and actual rendering still need acceptance checks. | -| grass | +0x100e838 and its +0x100e890 range constant are candidates. | Not ported: locating all six sites and checking textures, heaps and world scenes remain separate work. | -| optref / ability / report | The same crash root cause has not been established on v110; the report loop is not structurally equivalent on every version. | Not ported; guards must not hide an unlocated problem. | -| sync_ahead | frame_wait_lr in [nvn_api_core.c](../runtime/nvn_api_core.c) lists only 121/143 and also requires shadow storage. | Keep the version gating; GPU, readback and fence behaviour has not been accepted. | +**climb**, one site at main+0x19279f0 (1.2.1: main+0x19182cc) in the climb controller's velocity step at main+0x1927948. The site replaces `fmov s1, #1.5` after the shipping factor 1.272 - 0.362 (r - 1), r in s9, s8 = 0.5. The body between prologue and epilogue is word for word the 1.2.1 one: it reads u = max(page +0, r) and gives s0 = max(s0, h), s1 = max(1.5, h). At r >= 1 h stays at or below the shipping factor, so 30 fps and slower keep it bit for bit; at 60 fps the factor becomes 1.4.3's, about 1.8665 instead of 1.453; above 60 fps g(u) takes over. Unlike 1.2.1, the site does not rely on dead registers: a 96-byte stack frame saves x8 and full q5, q6, q7, q16 and q17 and restores them before the original code continues, so only s0 and s1 change. `TOTK_CLIMB_FIX=0` runs the original `fmov`; [frame_step_init](../runtime/frame_rate.c) switches the set off without the real-time step, where the page is not written. -### Shipping code and compensation semantics +**gears**, two sites in the ActorCheckRotateModule update at main+0x213eec4 (vtable 0x347e8e8 slot +0x110; 1.2.1: main+0x21350c0). The first, main+0x213eee4, loads the update context's frame delta (x1 + 8) into s12 before the function overwrites x1; the prologue saved d12 at main+0x213eec8, nothing writes s12 before the second site, and callees preserve the low 64 bits of v12. The second, main+0x213f0d4, turns `fdiv s12, s0, s4` into s12 = (s0 / s4) * delta, the RotateStartDeg / 30 threshold scaled by the delta, which the three `fcmp s8, s12` at main+0x213f10c, +0x213f174 and +0x213f1b0 read. It saves full q4 in a 16-byte stack slot and restores it and SP. The set does not read the patch page and works with or without the real-time step; `TOTK_HIGHFPS_FIX=0` keeps both original sites. -The climb compensation comes from this repository's [1.2.1 climb definition](../recomp/patches-v121.txt) at the fixed baseline. Local 1.1.0 first multiplies by -0.181, doubles with fadd, then adds 1.272. This is algebraically 1.272 - 0.362(r-1), but merging the multiplication changes its floating-point rounding order. This patch extends only the final clamp and preserves the preceding v110 instructions. - -The shipping factor's lower 32 bits stay unchanged at normal 30 Hz and at slower steps with r>=1. The 60 Hz change is intentional: at normal r=0.5, compensation is about 1.8665 instead of the shipping 1.453. Above 60 Hz it uses upstream g(u), with u=max(page+0,r), so reducing the time scale alone does not trigger the higher-frame-rate g branch. It reads existing page+0 without adding fields. - -climb uses a 96-byte, 16-byte-aligned stack frame to preserve x8 and full q5/q6/q7/q16/q17. Only s0/s1 are declared outputs; scalar writes clear their vector upper bits. This avoids relying on 1.2.1 dead-register assumptions. TOTK_CLIMB_FIX=0 executes only the original fmov; existing [frame_step_init](../runtime/frame_rate.c) disables the set when realtime=0. - -The gear function is reached through vtable 0x347e8e8 slot +0x110. AI dispatchers +0x1205b90 and +0x2ae29ac copy context+8 into the passed structure's +8; AI root update +0x1085c88 calls the owner's virtual +0x30 and publishes its returned frame delta there. The first site, +0x213eee4, follows the original str d12 save. This function does not write s12/d12/q12 between that site and the threshold site. Across calls it relies only on AAPCS64 preserving d12's low 64 bits: the delta occupies the low 32 bits and does not depend on the vector upper half surviving. The second site produces a fresh scalar s12, and the original epilogue restores d12; q12's upper half is not callee-saved. - -The threshold becomes (RotateStartDeg/30)*ctx.delta, shared by the three original fcmp/b.le pairs at +0x213f10c, +0x213f174 and +0x213f1b0. The second site also preserves full q4 and restores SP before continuing. gears does not read the patch page, remains active with realtime=0, and restores both shipping sites with TOTK_HIGHFPS_FIX=0. - -### Unique matches and original-word guards - -Each of these original windows occurs exactly once in the local 1.1.0 main. These are addresses and hashes, not game-byte dumps: +Each original window below occurs once in the 1.1.0 main (addresses and hashes, not game bytes): | Window | Length | SHA-256 | | --- | ---: | --- | @@ -75,27 +58,10 @@ Each of these original windows occurs exactly once in the local 1.1.0 main. Thes | +0x213eee4 | 32 bytes | 17487c0fe195655e9a1bcaf49835208bd1ebca86eeef9a2ca0059752f503e378 | | +0x213f0d0 | 28 bytes | d07279a2abea53cffbd8861e95034cd1a5c85edf90f6094c5261ba55da203577 | -The generator still checks each original instruction. Optional local tests also check the shipping constants, d12 save, vtable entry, all three compares and their b.le targets. No version-wide fixed address shift was used. - -### Added validation - -The [high-frame-rate patch test](../tests/patches_v110_highfps_check.py) reuses shared CC selection, platform suffixes and mappings, with pathlib paths. The [patch parser](../recomp/patches.py) explicitly reads UTF-8, including the Unicode encoding fixture, independently of the Windows default code page. - ```sh -env CC=clang python tests/patches_v110_highfps_check.py +python tests/patches_v110_highfps_check.py python tests/patches_v110_highfps_check.py --cflags=-march=x86-64-v2 -python tests/patches_v110_highfps_check.py --exefs --work-dir +python tests/patches_v110_highfps_check.py --exefs ``` -- Windows v3/v2, each with synthetic and local ExeFS input: 3240 native/Unicorn cases per run passed, covering on/off, zero/tiny deltas, adjacent ULPs around 0.5, 30/60/120/240 Hz, slower steps and all 16 NZCV values. -- All 31 GPRs, 32 full 128-bit SIMD registers, SP, NZCV and the complete scratch-memory CRC are compared. Every undeclared output must match its input bit for bit. Nonzero upper-64-bit sentinels in q4/q8/q9 are explicit preconditions. -- Exact save-slot contents, 16-byte stack alignment, restored SP, slot gaps, surrounding canaries and all other scratch memory are checked. No whole memory region or broad SIMD allowlist is excluded. -- Nine default/explicit setting combinations compile the real [patches.c](../runtime/patches.c), frame_step_init and step_store and pass. The existing [#1002 regression](../tests/patches_v110_check.py) retains its SIMD allowlist fix; all four runs pass 408 cases each. -- All five in-memory negative mutations are rejected: corrupt x8, corrupt q17, write outside the save area, restore only d4, and restore only s4. No mutation was applied to the patch file. Combined cases also clobber q12's upper 64 bits to check that calls need preserve only low d12. -- Native WSL Ubuntu 22.04 compilation and execution pass all nine gating combinations. The complete SIMD native replay fails to compile with the installed Clang 14 because the shared [simd_fp.h](../runtime/simd_fp.h) requires newer elementwise builtins. **There is no claim that 3240 Linux replay cases passed.** Synthetic inputs/outputs remain local for a newer-toolchain replay and are not committed. Linux Python differential dependencies were not installed, and the distribution environment was not modified. - -These establish instruction, numeric and configuration contracts, not acceptance of real climbing, shrine gears, slow motion, severe stalls or GPU scenes. This branch did not launch or deploy the game; maintainers perform full builds, installation updates and gameplay acceptance separately. - -### Regeneration requirements - -Re-lift the generated chunks containing main+0x1927948 and main+0x213eec4 and regenerate patch metadata. A normal complete generation is recommended; never hand-edit generated C. RT_PATCH_COUNT changes from 12 to 14, retaining the original 12 indices and appending climb/gears. The patch page address and layout stay unchanged: climb reuses +0 and gears adds no page fields. Do not reuse stale generated objects or lift hashes; rebuild runtime libraries against the regenerated patch macros. +The test lifts both sets and runs them against Unicorn on and off, at 30, 60, 120 and 240 Hz and slower steps, with zero and tiny deltas, adjacent ULPs around 0.5 and at each compare threshold, and all 16 NZCV values (3240 cases). It compares all general and full 128-bit SIMD registers, SP, NZCV and the whole scratch memory: only s0/s1 (climb), x1/s12 (gears) and the exact save slots may change. It also compiles [patches.c](../runtime/patches.c) with frame_step_init for the nine combinations of the three switches. With `--exefs` it checks every original word, the shipping constants, the d12 save, the vtable entry and the three compares with their branch targets. These are instruction and switch contracts; climbing and the shrine gears still need checks in the game.