Debug version now builds OK and all_source compiles#2343
Merged
TakaRikka merged 16 commits intozeldaret:mainfrom Mar 23, 2025
Merged
Debug version now builds OK and all_source compiles#2343TakaRikka merged 16 commits intozeldaret:mainfrom
TakaRikka merged 16 commits intozeldaret:mainfrom
Conversation
The old cbea5fa... hash here was for the dol generated by the alf2dol.py script, which produces incorrect alignment. The dol with the new hash can be obtained by using `dtk elf2dol` to convert the debug .alf file to a dol. The DOL now builds OK.
All RELs now also build OK, meaning `ninja build/ShieldD/ok` now succeeds.
Cannot be linked due to weak function name mangling?
TakaRikka
approved these changes
Mar 23, 2025
Stbn-antier
pushed a commit
to Stbn-antier/tp
that referenced
this pull request
Mar 24, 2025
* Fix missing arg to JUT_ASSERT * Fix some MWCC version diff errors * Compile m_Do_ext, d_demo, actor_mng * Add VSCode task to quickly switch between versions * Unlink magLift for debug * Update the hash of the debug dol The old cbea5fa... hash here was for the dol generated by the alf2dol.py script, which produces incorrect alignment. The dol with the new hash can be obtained by using `dtk elf2dol` to convert the debug .alf file to a dol. The DOL now builds OK. * Fix all debug REL dtor splits All RELs now also build OK, meaning `ninja build/ShieldD/ok` now succeeds. * Add genMessage declarations to all HIO subclasses * Fixing more compilation errors * m_Do_mtx 100% on debug Cannot be linked due to weak function name mangling? * Improve various matches * Fix all remaining compilation errors * Fix new compilation errors from main * Fix retail regression * Link f_pc_profile_lst
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.
All ShieldD errors fixed:
You could add ShieldD to github CI now if you want to track progress and catch future build errors, note that if you do the .dol needed in the build repo must be converted via this dtk build: https://github.com/encounter/decomp-toolkit/actions/runs/14001786651
By using the
dtk elf2dolcommand on the debug .alf.No match% regressions for retail (only difference is two funcs in vrbox2 increased in % after I messed with them in debug).
I didn't link anything besides f_pc_profile_lst because there are some weird issues that aren't resolved yet.
For example, d_a_andsw matches 100% now, but the linker isn't stripping out weak functions that are used in the TU, only ones that are unused. I tried various linker flags (e.g. code merging) but nothing seemed to help.
Also name mangling issues for weak functions in m_Do_mtx:
void* JGeometry::TVec3<float>::TVec3<float>(float, float, float)vs
JGeometry::TVec3<float>::TVec3(float, float, float)