Repository navigation
Bump the engine to bbc3b73 and drop patch 0039, superseded upstream - #373
Merged
Merged
Conversation
v0lumehi
force-pushed
the
fix/engine-bump-bbc3b73
branch
from
November 1, 2026 01:13
b832301 to
9e127e6
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix or feature
What and why
The nightly sync could not bump the pin from c5fe6b5 to bbc3b73. It stopped at patch 0039 (the zero-extending
andof the jump table index, Mario Tennis Aces, #305) with a conflict indocs/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_extendedtodm/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 x18at main+0x35837c. Its tests intest_jump_copies.pycover 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.
bumprefreshed 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
python3 tools/engine.py checkpasses (33 patches apply to bbc3b73).syncbuilds engine/ on the new pin.tools/tests(patches, engine, release manifest) 85 tests OK.make -C dm/host/tests GAME=010015100B514000 -j3 runexits 0.test_jump_copies(47),test_nso(12) andtest_nso_match(25) pass.test_docs(gallery) andtest_env_switchesfail 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.Screenshots
None, no visible change.
Scope
dm/,scripts/,docs/,ref/) is added to the repository: a change there is a patch inpatches/(a commit inengine/, thentools/engine.py export, andtools/engine.py checkpasses), with itsUpstream-Statusforwarded seedds/nxnative#..., orpendinguntil that PR is open