mirror of
https://github.com/zeldaret/mm.git
synced 2026-05-25 23:35:04 -04:00
7743e5a2c4
* wip * fix * add disassembler * Disasm builds OK * Variable addends * More wip * Rodata migration implemented * Cleanup old tools * Try fix submodule -> subrepo merge * git subrepo pull --force --remote=https://github.com/zeldaret/ZAPD.git tools/ZAPD subrepo: subdir: "tools/ZAPD" merged: "602e609" upstream: origin: "https://github.com/zeldaret/ZAPD.git" branch: "master" commit: "602e609" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Builds again but assets are totally broken * git subrepo pull --force tools/asm-processor subrepo: subdir: "tools/asm-processor" merged: "1ffdb08a" upstream: origin: "https://github.com/simonlindholm/asm-processor.git" branch: "master" commit: "1ffdb08a" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * More cleanup, move functions.txt and variables.txt to tools/disasm and rm tables * rm z64compress in preparation for subrepo * git subrepo clone (merge) https://github.com/z64me/z64compress.git tools/z64compress subrepo: subdir: "tools/z64compress" merged: "eb11085c" upstream: origin: "https://github.com/z64me/z64compress.git" branch: "main" commit: "eb11085c" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Fix asset extraction * Fix diff-init make rule * Split code bss * Split assumed linker bug padding from assembly files * add filelists for mm.us.rev1 * Maybe working, but I'm not sure * add overlays to spec * Add rodata to actos * Everything compiles * Make a lot of C files for code * Add almost every file in code to spec * whoops * 3 code files left * add scenes to spec * More progress on progress.py * Fix skelanime in spec * audio files! * Fix merge issues * Fix some C files in code * Fix remaining code files * Use existing O1 C files in spec * reorder boot order in spec * update spec * fault.c * Convert relocs on completed actors, fixbaserom uses current rom name * more boot files * Add VT macros and script * finish already existing boot files * most of libultra * fix 64bits libultra files * Use C files for libultra, wrap some functions in NON_MATCHING * Remove duplicate of OS_CLOCK_RATE from fault.c * C files for fbdemos * delete dumb files * bootstrap C files, still need to add them to the spec * update fixbaserom * boot OK? * I forgot to commit the spec * C for gamestates * C for kaleido * Change all includes to "" * copy actor sizes script from oot * I forgot to delete those files * Basic C files for effects * Add effects initvars names * Remove mislabelled boot functions from header/txt * Begin porting bootstrap_fx, some sizes * Fix <> * Fix enum * Fix diff.py * fix libultra stuff * update regconvert * update setup warnings * add some missing ; * Fix some makefile stuff and other fixes on some non_matching functions * add executable flag in extract_baserom and fixbaserom * fix relative path * copy assist from oot * fix map path * another assist path fix * Delete C files for handwritten files * add code_801A51F0 to spec * add gfxbuffers to spec * Move rodata to top of each file when possible * UNK_TYPEs for func_801A51F0 * Remove kaleido rodata from spec * Update spec and undefined_syms for recent merge * GCC warnings and fix errors in nonmatchings, * round percentage numbers * progress script: format changes * progress: error on non-existing files * fix warning in z_scene_table * Match 2 nonmatchings in z_actor * Warnings in lightswitch and invadepoh * Fix warning in z_actor_dlftbls * I though I fixed this one * whoops * Comment out CC_CHECK * Removed redundant ultra64.h includes * Update asm_processor, sorted boot_O1 into other folders, completed the fbdemo bootstrap, cleaned up undefined_syms * Completed gamestates bootstrap * Split kaleido_scope * Remove section.h and segment.h, move keep object externs to a common location in variables.h * Completed effects bootstrap * Segmented address externs for effects, fbdemos, gamestates and kaleido * Move actor data externs out of the if 0 * Segmented address externs for actors * Prepare actionfunc detection * fix script, how did it even work before * Fix actionfunc script again, re-introduce some more intermediate prints to the disassembler * Automated actionFunc detection in actors * Segmented addresses from player .text * rm old segment addrs script and fix build * Move sizes folder to tools * Make build.py executable * New Jenkinsfile Prayge * Remove numpy dependencies * Add warnings_disasm_current.txt * my bad * Update spec and undefined_syms * Add z_eff_ss_hahen to pametfrog * git subrepo pull (merge) --force tools/z64compress subrepo: subdir: "tools/z64compress" merged: "163ca2af" upstream: origin: "https://github.com/z64me/z64compress.git" branch: "main" commit: "163ca2af" git-subrepo: version: "0.4.3" origin: "https://github.com/ingydotnet/git-subrepo" commit: "2f68596" * Make z64compress print to stdout * sneeky commit to update warnings tooling * test * Another test * Mark fixing overlay reloc generating as a TODO * Update warnings stuff * Communicate the return code from running z64compress back to the Makefile through the wrapper * Run formatter, remove extra commented copy of function * Re-fix some includes * Convert atan to hex to conform to decided style * Some tidying up, remove c for fp and the other two handwritten code files * BSS in z_collision_check & z_scene_proc * add static back in * Fix timerintr bss, add file to spec, some cleanup * Remove externs * Newline * Readd enums * Typo * Colours * Comments for hitmark enum values Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Improvements and suggestions * Organize and remove unused imports and use env for python3 scripts, delete unused overlay.py Co-authored-by: angie <angheloalf95@gmail.com> Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com> Co-authored-by: engineer124 <engineer124engineer124@gmail.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
116 lines
3.7 KiB
C
116 lines
3.7 KiB
C
#include "global.h"
|
|
|
|
UNK_TYPE4 D_80096C30 = 2;
|
|
|
|
#ifdef NON_MATCHING
|
|
// This needs lots of work. Mostly regalloc and getting the address of D_80096C30 placed in s5 at the beginning of the
|
|
// function
|
|
void Load2_Relocate(u32 allocatedVRamAddr, OverlayRelocationSection* overlayInfo, u32 vRamStart) {
|
|
s32 sectionLocations[4];
|
|
u32* regReferences[32];
|
|
u32 regValues[32];
|
|
u32 i;
|
|
u32 relocatedAddress;
|
|
s32 signedOffset;
|
|
u32* lastInst;
|
|
u32* inst;
|
|
u32 relocation;
|
|
u32 relocationIndex;
|
|
|
|
sectionLocations[0] = 0;
|
|
sectionLocations[1] = allocatedVRamAddr;
|
|
sectionLocations[2] = overlayInfo->textSize + allocatedVRamAddr;
|
|
sectionLocations[3] = sectionLocations[2] + overlayInfo->dataSize;
|
|
for (i = 0, relocationIndex = 0; i < overlayInfo->nRelocations; relocationIndex++) {
|
|
relocation = overlayInfo->relocations[relocationIndex];
|
|
i++;
|
|
inst = (u32*)(sectionLocations[relocation >> 0x1e] + (relocation & 0xffffff));
|
|
|
|
switch (relocation & 0x3f000000) {
|
|
case 0x2000000:
|
|
if ((*inst & 0xf000000) == 0) {
|
|
*inst = (*inst - vRamStart) + allocatedVRamAddr;
|
|
} else {
|
|
if (D_80096C30 > 2)
|
|
;
|
|
}
|
|
break;
|
|
case 0x4000000:
|
|
*inst = (*inst & 0xfc000000) |
|
|
(((((*inst & 0x3ffffff) << 2 | 0x80000000) - vRamStart) + allocatedVRamAddr & 0xfffffff) >> 2);
|
|
break;
|
|
case 0x5000000:
|
|
regReferences[*inst >> 0x10 & 0x1f] = inst;
|
|
regValues[*inst >> 0x10 & 0x1f] = *inst;
|
|
break;
|
|
case 0x6000000:
|
|
lastInst = regReferences[*inst >> 0x15 & 0x1f];
|
|
signedOffset = (s16)*inst;
|
|
if ((signedOffset + *lastInst * 0x10000 & 0xf000000) == 0) {
|
|
relocatedAddress =
|
|
((signedOffset + regValues[*inst >> 0x15 & 0x1f] * 0x10000) - vRamStart) + allocatedVRamAddr;
|
|
*lastInst = (((relocatedAddress >> 0x10) & 0xFFFF) + ((relocatedAddress & 0x8000) ? 1 : 0)) |
|
|
(*lastInst & 0xffff0000);
|
|
*inst = *inst & 0xffff0000 | relocatedAddress & 0xffff;
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
#else
|
|
#pragma GLOBAL_ASM("asm/non_matchings/boot/loadfragment2/Load2_Relocate.s")
|
|
#endif
|
|
|
|
#ifdef NON_MATCHING
|
|
// Very minor stack stuff with a saved value
|
|
s32 Load2_LoadOverlay(u32 vRomStart, u32 vRomEnd, u32 vRamStart, u32 vRamEnd, u32 allocatedVRamAddr) {
|
|
int nbytes;
|
|
u32 pad;
|
|
u32 size;
|
|
void* end;
|
|
OverlayRelocationSection* overlayInfo;
|
|
|
|
size = vRomEnd - vRomStart;
|
|
|
|
if (1) {
|
|
;
|
|
}
|
|
|
|
DmaMgr_SendRequest0(allocatedVRamAddr, vRomStart, size);
|
|
|
|
end = (void*)(allocatedVRamAddr + size);
|
|
overlayInfo = (OverlayRelocationSection*)((int)end - *(int*)((int)end + -4));
|
|
|
|
if (1) {
|
|
;
|
|
}
|
|
|
|
Load2_Relocate(allocatedVRamAddr, overlayInfo, vRamStart);
|
|
|
|
if (overlayInfo->bssSize != 0) {
|
|
bzero(end, overlayInfo->bssSize);
|
|
}
|
|
|
|
nbytes = vRamEnd - vRamStart;
|
|
|
|
osWritebackDCache((void*)allocatedVRamAddr, nbytes);
|
|
osInvalICache((void*)allocatedVRamAddr, nbytes);
|
|
return nbytes;
|
|
}
|
|
#else
|
|
#pragma GLOBAL_ASM("asm/non_matchings/boot/loadfragment2/Load2_LoadOverlay.s")
|
|
#endif
|
|
|
|
void* Load2_AllocateAndLoad(u32 vRomStart, u32 vRomEnd, u32 vRamStart, u32 vRamEnd) {
|
|
void* allocatedVRamAddr;
|
|
u32 size;
|
|
|
|
size = vRamEnd - vRamStart;
|
|
allocatedVRamAddr = StartHeap_AllocR(size);
|
|
if (allocatedVRamAddr != NULL) {
|
|
Load2_LoadOverlay(vRomStart, vRomEnd, vRamStart, vRamEnd, (u32)allocatedVRamAddr);
|
|
}
|
|
|
|
return allocatedVRamAddr;
|
|
}
|