falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Graph OK (#511) 

* Match Graph_FaultAddrConvFunc

* Remove undef
This commit is contained in:
Derek Hensley 2022-01-03 21:31:28 -08:00 committed by GitHub
parent 9e5382076a
commit 1d7e721cb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/code/graph.c
View File

@ -88,33 +88,27 @@ GameStateOverlay* Graph_GetNextGameState(GameState* gameState) {
return NULL; return NULL;
} }
#ifdef NON_MATCHING
// Regalloc differences
void* Graph_FaultAddrConvFunc(void* address, void* param) { void* Graph_FaultAddrConvFunc(void* address, void* param) {
u32 addr = address; uintptr_t addr = address;
GameStateOverlay* gamestateOvl; GameStateOverlay* gamestateOvl = &gGameStateOverlayTable[0];
u32 ramConv; uintptr_t ramConv;
u32 ramStart; void* ramStart;
u32 diff; uintptr_t diff;
s32 i; s32 i;
for (i = 0; i < graphNumGameStates; i++) { for (i = 0; i < graphNumGameStates; i++, gamestateOvl++) {
gamestateOvl = &gGameStateOverlayTable[i]; diff = (uintptr_t)gamestateOvl->vramEnd - (uintptr_t)gamestateOvl->vramStart;
ramStart = gamestateOvl->loadedRamAddr; ramStart = gamestateOvl->loadedRamAddr;
diff = (u32)gamestateOvl->vramEnd - (u32)gamestateOvl->vramStart; ramConv = (uintptr_t)gamestateOvl->vramStart - (uintptr_t)ramStart;
ramConv = (u32)gamestateOvl->vramStart - ramStart;
if (gamestateOvl->loadedRamAddr != NULL) { if (ramStart != NULL) {
if (addr >= ramStart && addr < ramStart + diff) { if (addr >= (uintptr_t)ramStart && addr < (uintptr_t)ramStart + diff) {
return addr + ramConv; return addr + ramConv;
} }
} }
} }
return NULL; return NULL;
} }
#else
#pragma GLOBAL_ASM("asm/non_matchings/code/graph/Graph_FaultAddrConvFunc.s")
#endif
void Graph_Init(GraphicsContext* gfxCtx) { void Graph_Init(GraphicsContext* gfxCtx) {
bzero(gfxCtx, sizeof(GraphicsContext)); bzero(gfxCtx, sizeof(GraphicsContext));