Repository navigation
decomp-repair 0.5.0: MSVC and C++ in the permuter, conditional compilation, MIPS padding - #5
Merged
Conversation
…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>
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.
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,mipsandpermuter_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
pytest107 passed, 1 skipped;ruffclean. 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