mirror of
https://github.com/zeldaret/mm.git
synced 2026-05-23 23:05:08 -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>
249 lines
6.1 KiB
C
249 lines
6.1 KiB
C
#include "global.h"
|
|
|
|
#define FILL_ALLOCBLOCK (1 << 0)
|
|
#define FILL_FREEBLOCK (1 << 1)
|
|
#define CHECK_FREE_BLOCK (1 << 2)
|
|
|
|
#define NODE_MAGIC (0x7373)
|
|
|
|
#define BLOCK_UNINIT_MAGIC (0xAB)
|
|
#define BLOCK_UNINIT_MAGIC_32 (0xABABABAB)
|
|
#define BLOCK_ALLOC_MAGIC (0xCD)
|
|
#define BLOCK_ALLOC_MAGIC_32 (0xCDCDCDCD)
|
|
#define BLOCK_FREE_MAGIC (0xEF)
|
|
#define BLOCK_FREE_MAGIC_32 (0xEFEFEFEF)
|
|
|
|
extern OSMesg sArenaLockMsg[1];
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/boot/__osMalloc/D_80099110.s")
|
|
|
|
void ArenaImpl_LockInit(Arena* arena) {
|
|
osCreateMesgQueue(&arena->lock, sArenaLockMsg, ARRAY_COUNT(sArenaLockMsg));
|
|
}
|
|
|
|
void ArenaImpl_Lock(Arena* arena) {
|
|
osSendMesg(&arena->lock, NULL, OS_MESG_BLOCK);
|
|
}
|
|
|
|
void ArenaImpl_Unlock(Arena* arena) {
|
|
osRecvMesg(&arena->lock, NULL, OS_MESG_BLOCK);
|
|
}
|
|
|
|
ArenaNode* ArenaImpl_GetLastBlock(Arena* arena) {
|
|
ArenaNode* last;
|
|
ArenaNode* iter;
|
|
|
|
last = arena->head;
|
|
|
|
if (last != NULL) {
|
|
iter = last->next;
|
|
while (iter != NULL) {
|
|
last = iter;
|
|
iter = iter->next;
|
|
}
|
|
}
|
|
return last;
|
|
}
|
|
|
|
void __osMallocInit(Arena* arena, void* start, u32 size) {
|
|
bzero(arena, sizeof(*arena));
|
|
ArenaImpl_LockInit(arena);
|
|
__osMallocAddBlock(arena, start, size);
|
|
arena->isInit = 1;
|
|
}
|
|
|
|
void __osMallocAddBlock(Arena* arena, void* start, s32 size) {
|
|
s32 diff;
|
|
s32 size2;
|
|
ArenaNode* firstNode;
|
|
ArenaNode* lastNode;
|
|
|
|
if (start != NULL) {
|
|
firstNode = (ArenaNode*)ALIGN16((u32)start);
|
|
diff = (s32)firstNode - (s32)start;
|
|
size2 = (size - diff) & ~0xF;
|
|
|
|
if (size2 > (s32)sizeof(ArenaNode)) {
|
|
firstNode->next = NULL;
|
|
firstNode->prev = NULL;
|
|
firstNode->size = size2 - sizeof(ArenaNode);
|
|
firstNode->isFree = 1;
|
|
firstNode->magic = NODE_MAGIC;
|
|
ArenaImpl_Lock(arena);
|
|
lastNode = ArenaImpl_GetLastBlock(arena);
|
|
if (lastNode == NULL) {
|
|
arena->head = firstNode;
|
|
arena->start = start;
|
|
} else {
|
|
firstNode->prev = lastNode;
|
|
lastNode->next = firstNode;
|
|
}
|
|
ArenaImpl_Unlock(arena);
|
|
}
|
|
}
|
|
}
|
|
|
|
void __osMallocCleanup(Arena* arena) {
|
|
bzero(arena, sizeof(*arena));
|
|
}
|
|
|
|
u8 __osMallocIsInitalized(Arena* arena) {
|
|
return arena->isInit;
|
|
}
|
|
|
|
void* __osMalloc(Arena* arena, u32 size) {
|
|
ArenaNode* iter;
|
|
ArenaNode* newNode;
|
|
void* alloc;
|
|
u32 blockSize;
|
|
alloc = NULL;
|
|
|
|
size = ALIGN16(size);
|
|
ArenaImpl_Lock(arena);
|
|
iter = arena->head;
|
|
|
|
while (iter != NULL) {
|
|
if (iter->isFree && iter->size >= size) {
|
|
ArenaNode* next;
|
|
blockSize = ALIGN16(size) + sizeof(ArenaNode);
|
|
if (blockSize < iter->size) {
|
|
newNode = (ArenaNode*)((u32)iter + blockSize);
|
|
newNode->next = iter->next;
|
|
newNode->prev = iter;
|
|
newNode->size = iter->size - blockSize;
|
|
newNode->isFree = 1;
|
|
newNode->magic = NODE_MAGIC;
|
|
|
|
iter->next = newNode;
|
|
iter->size = size;
|
|
next = newNode->next;
|
|
if (next) {
|
|
next->prev = newNode;
|
|
}
|
|
}
|
|
|
|
iter->isFree = 0;
|
|
alloc = (void*)((u32)iter + sizeof(ArenaNode));
|
|
break;
|
|
}
|
|
|
|
iter = iter->next;
|
|
}
|
|
ArenaImpl_Unlock(arena);
|
|
|
|
return alloc;
|
|
}
|
|
|
|
void* __osMallocR(Arena* arena, u32 size) {
|
|
ArenaNode* iter;
|
|
ArenaNode* newNode;
|
|
u32 blockSize;
|
|
void* alloc = NULL;
|
|
|
|
size = ALIGN16(size);
|
|
ArenaImpl_Lock(arena);
|
|
iter = ArenaImpl_GetLastBlock(arena);
|
|
|
|
while (iter != NULL) {
|
|
if (iter->isFree && iter->size >= size) {
|
|
ArenaNode* next;
|
|
blockSize = ALIGN16(size) + sizeof(ArenaNode);
|
|
if (blockSize < iter->size) {
|
|
newNode = (ArenaNode*)((u32)iter + (iter->size - size));
|
|
newNode->next = iter->next;
|
|
newNode->prev = iter;
|
|
newNode->size = size;
|
|
newNode->magic = NODE_MAGIC;
|
|
|
|
iter->next = newNode;
|
|
iter->size -= blockSize;
|
|
next = newNode->next;
|
|
if (next) {
|
|
next->prev = newNode;
|
|
}
|
|
iter = newNode;
|
|
}
|
|
|
|
iter->isFree = 0;
|
|
alloc = (void*)((u32)iter + sizeof(ArenaNode));
|
|
break;
|
|
}
|
|
iter = iter->prev;
|
|
}
|
|
ArenaImpl_Unlock(arena);
|
|
|
|
return alloc;
|
|
}
|
|
|
|
void __osFree(Arena* arena, void* ptr) {
|
|
ArenaNode* node;
|
|
ArenaNode* next;
|
|
ArenaNode* prev;
|
|
ArenaNode* newNext;
|
|
|
|
ArenaImpl_Lock(arena);
|
|
node = (ArenaNode*)((u32)ptr - sizeof(ArenaNode));
|
|
|
|
if (ptr == NULL || (node->magic != NODE_MAGIC) || node->isFree) {
|
|
goto end;
|
|
}
|
|
|
|
next = node->next;
|
|
prev = node->prev;
|
|
node->isFree = 1;
|
|
|
|
newNext = next;
|
|
if ((u32)next == (u32)node + sizeof(ArenaNode) + node->size && next->isFree) {
|
|
newNext = next->next;
|
|
if (newNext != NULL) {
|
|
newNext->prev = node;
|
|
}
|
|
|
|
node->size += next->size + sizeof(ArenaNode);
|
|
|
|
node->next = newNext;
|
|
next = newNext;
|
|
}
|
|
|
|
if (prev != NULL && prev->isFree && (u32)node == (u32)prev + sizeof(ArenaNode) + prev->size) {
|
|
if (next) {
|
|
next->prev = prev;
|
|
}
|
|
prev->next = next;
|
|
prev->size += node->size + sizeof(ArenaNode);
|
|
}
|
|
|
|
end:
|
|
ArenaImpl_Unlock(arena);
|
|
}
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/boot/__osMalloc/__osRealloc.s")
|
|
|
|
void __osAnalyzeArena(Arena* arena, u32* outMaxFree, u32* outFree, u32* outAlloc) {
|
|
ArenaNode* iter;
|
|
|
|
ArenaImpl_Lock(arena);
|
|
|
|
*outMaxFree = 0;
|
|
*outFree = 0;
|
|
*outAlloc = 0;
|
|
|
|
iter = arena->head;
|
|
while (iter != NULL) {
|
|
if (iter->isFree) {
|
|
*outFree += iter->size;
|
|
if (*outMaxFree < iter->size) {
|
|
*outMaxFree = iter->size;
|
|
}
|
|
} else {
|
|
*outAlloc += iter->size;
|
|
}
|
|
|
|
iter = iter->next;
|
|
}
|
|
|
|
ArenaImpl_Unlock(arena);
|
|
}
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/boot/__osMalloc/__osCheckArena.s")
|