Skip to content

decomp-repair 0.5.0: MSVC and C++ in the permuter, conditional compilation, MIPS padding - #5

Merged
RetroGameDeveloper merged 1 commit into
mainfrom
feat/upstream-1.0.10-alpha.2
Nov 15, 2026
Merged

RetroGameDeveloper merged 1 commit into
mainfrom
feat/upstream-1.0.10-alpha.2

Conversation

@RetroGameDeveloper

Copy link
Copy Markdown
Contributor

decompdecomp's upstream (n-delic/decompdecomp 1.0.10-alpha.2) changed four modules that, in the RetroReversing fork, live in this library: permuter_gen, csource, mips and permuter_local. This merges those changes into the library's versions so decompdecomp can take the upstream release (RetroReversing/decompdecomp sync PR) without forking them.

  • permuter_gen: msvc_as_c, cxx_as_c, Restorer, expand_in_source, type_names. A PC or Xbox game's MSVC words and C++ methods are read as C and restored in each variant. Kept ours: private_inline, supported_methods, and lineage traces. Each variant is now restored and keeps its lineage.
  • csource: conditional compilation (surely_compiled, hidden_by, condition_names, at_file_scope, opens_body, marker_above).
  • mips: is_padding, ends_in_delay_branch (split asks the processor for its padding).
  • permuter_local: no change; upstream's version was a subset.

Merged with git merge-file (base = the common ancestor in decompdecomp). Each conflict was both sides adding code at the same place, kept as a union.

Tests: library pytest 107 passed, 1 skipped; ruff clean. decompdecomp's upstream tests for these functions (test_permute, test_arch_padding, test_forks, test_ps4_targets) pass against this branch installed in a scratch environment.

🤖 Generated with Claude Code

…ation, MIPS padding

decompdecomp's upstream (n-delic/decompdecomp 1.0.10-alpha.2) changed four modules that live here in the
RetroReversing fork: permuter_gen (MSVC words and C++ read as C, so a PC or Xbox game's near misses reach
decomp-permuter), csource (which #if branches surely compile), mips (alignment padding for split) and
permuter_local. Their changes are merged into this library's versions, keeping its own (private_inline,
supported_methods, lineage traces), so decompdecomp can take the upstream release without forking these files.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@RetroGameDeveloper
RetroGameDeveloper merged commit 85eb4c2 into main Nov 15, 2026
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant