Skip to content

Bump the engine to bbc3b73 and drop patch 0039, superseded upstream - #373

Merged
v0lumehi merged 1 commit into
fix/ci-cachesfrom
fix/engine-bump-bbc3b73
Nov 1, 2026
Merged

v0lumehi merged 1 commit into
fix/ci-cachesfrom
fix/engine-bump-bbc3b73

Conversation

@v0lumehi

@v0lumehi v0lumehi commented Nov 1, 2026

Copy link
Copy Markdown
Collaborator

Fix or feature

  • Fix
  • Feature

What and why

The nightly sync could not bump the pin from c5fe6b5 to bbc3b73. It stopped at patch 0039 (the zero-extending and of the jump table index, Mario Tennis Aces, #305) with a conflict in docs/reference/rewriter.md. The other patches applied cleanly.

Fixes #371.

Upstream closed seedds/nxnative#778 with a different implementation, so the bump did not drop the patch on its own. Commit 6a78766 ("Recognize guarded zero-extended jump-table indices") is inside the bump range. It adds jump_zero_extended to dm/tools/patch_nso.py. It handles the same case: cmp w8,#4; b.hi exit; and x18,x8,#0xffffffff; ldrsw x18,[x16,x18,lsl #2]; add; br x18 at main+0x35837c. Its tests in test_jump_copies.py cover that form. It runs as a final recognizer after the earlier ones, so their results stay the same.

This PR deletes patch 0039 and moves the pin to bbc3b73. The other 33 patches apply cleanly. bump refreshed the patch contexts and the links into nxnative. Thanks to @iheb69nachet for the original patch and the upstream PR, the landed version is based on it (Co-authored-by in 6a78766).

Open PRs add patches under numbers that are already taken or will collide: #372 (0054, 0055), #368 (0054), #342 (0054), #230 (0054), #329 (0039, 0040) and #325 (0038). 0039 is free again after this PR. Whoever merges renumbers them as usual. I did not touch them.

Checked

  • Tests: python3 tools/engine.py check passes (33 patches apply to bbc3b73). sync builds engine/ on the new pin. tools/tests (patches, engine, release manifest) 85 tests OK. make -C dm/host/tests GAME=010015100B514000 -j3 run exits 0. test_jump_copies (47), test_nso (12) and test_nso_match (25) pass.
  • Not clean: test_docs (gallery) and test_env_switches fail in my local engine/ run. The gallery one fails the same way on the old pin in my main checkout. I did not run the full CI matrix locally.
  • Visual QA: not applicable.
  • Run on a device or Mac: not run. Mario Tennis Aces gameplay is untested, as upstream also says.

Screenshots

None, no visible change.

Scope

  • No engine file (dm/, scripts/, docs/, ref/) is added to the repository: a change there is a patch in patches/ (a commit in engine/, then tools/engine.py export, and tools/engine.py check passes), with its Upstream-Status
  • A fix to the engine or a game profile also goes to seedds/nxnative as a PR in parallel: this PR's patch says forwarded seedds/nxnative#..., or pending until that PR is open
  • A change to a launcher view has before and after screenshots above
  • No keys, game files or data extracted from a game in the change or the attachments

@github-actions github-actions Bot added documentation Improvements or additions to documentation launcher The NX2Apple launcher app patch-queue Changes the patch queue or the upstream pin labels Nov 1, 2026
@v0lumehi
v0lumehi changed the base branch from main to fix/ci-caches November 1, 2026 01:12
@v0lumehi
v0lumehi added this pull request to stack #375 November 1, 2026 01:12
@v0lumehi
v0lumehi force-pushed the fix/engine-bump-bbc3b73 branch from b832301 to 9e127e6 Compare November 1, 2026 01:13
@v0lumehi
v0lumehi merged commit 3ce469d into main Nov 1, 2026
13 checks passed
@v0lumehi
v0lumehi deleted the fix/engine-bump-bbc3b73 branch November 1, 2026 02:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Improvements or additions to documentation launcher The NX2Apple launcher app patch-queue Changes the patch queue or the upstream pin

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Upstream sync blocked at bbc3b73

1 participant