From 34492a4386446fc82220fe0684ff521d760e84bd Mon Sep 17 00:00:00 2001 From: Anghelo Carvajal Date: Sun, 26 Nov 2023 09:47:21 -0300 Subject: Move the system heap and the framebuffers to their own segments (#1488) * make segments for the systemheap and the framebuffers * define in the makefile * undefined syms * Make segments for the pre boot buffers too * Update spec Co-authored-by: Parker <20159000+jpburnett@users.noreply.github.com> * review * Update spec Co-authored-by: Parker <20159000+jpburnett@users.noreply.github.com> * Update Makefile Co-authored-by: Dragorn421 * comments * comment * move comment about the hardcoded address to buffers.h * rewrite SYSTEM_HEAP_END_ADDR in terms of other symbols * Use `ALIGNED` on all the buffers * Rename SYSTEM_HEAP_END_ADDR to FRAMEBUFFERS_START_ADDR * Put ALIGNED at the right like the rest of the codebase * merge * gLoBuffer * gHiBuffer * Add a static assert to ensure the address of gHiBuffer haven't shifted without the user noticing * smol include cleanup --------- Co-authored-by: Parker <20159000+jpburnett@users.noreply.github.com> Co-authored-by: Dragorn421 --- src/code/main.c | 4 ++-- src/code/sys_cfb.c | 9 +++------ src/code/z_play.c | 10 +++++----- src/code/z_vr_box.c | 3 ++- 4 files changed, 12 insertions(+), 14 deletions(-) (limited to 'src/code') diff --git a/src/code/main.c b/src/code/main.c index 14ee841ce..83df66396 100644 --- a/src/code/main.c +++ b/src/code/main.c @@ -53,8 +53,8 @@ void Main(void* arg) { Check_RegionIsSupported(); Check_ExpansionPak(); - sysHeap = (intptr_t)gSystemHeap; - fb = 0x80780000; + sysHeap = (intptr_t)SEGMENT_START(system_heap); + fb = FRAMEBUFFERS_START_ADDR; gSystemHeapSize = fb - sysHeap; SystemHeap_Init((void*)sysHeap, gSystemHeapSize); diff --git a/src/code/sys_cfb.c b/src/code/sys_cfb.c index 32600643a..b559a44ee 100644 --- a/src/code/sys_cfb.c +++ b/src/code/sys_cfb.c @@ -1,5 +1,5 @@ -#include "prevent_bss_reordering.h" #include "z64.h" +#include "buffers.h" #include "regs.h" #include "functions.h" #include "macros.h" @@ -41,9 +41,6 @@ u8 gSysCfbHiResEnabled; #include "system_malloc.h" #include "z64vimode.h" -extern u16 gFramebufferHiRes0[HIRES_BUFFER_WIDTH][HIRES_BUFFER_HEIGHT]; -extern u16 gFramebufferHiRes1[HIRES_BUFFER_WIDTH][HIRES_BUFFER_HEIGHT]; - void SysCfb_SetLoResMode(void) { gFramebuffers[1] = sCfbLoRes1; gFramebuffers[0] = sCfbLoRes0; @@ -93,8 +90,8 @@ void SysCfb_SetHiResMode(void) { } void SysCfb_Init(void) { - sCfbLoRes1 = gFramebuffer1; - sCfbLoRes0 = gFramebuffer0; + sCfbLoRes1 = gLoBuffer.framebuffer; + sCfbLoRes0 = gHiBuffer.framebuffer; sCfbHiRes1 = gFramebufferHiRes1; sCfbHiRes0 = gFramebufferHiRes0; SysCfb_SetLoResMode(); diff --git a/src/code/z_play.c b/src/code/z_play.c index 226980b4d..ca4fb500d 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -248,7 +248,7 @@ void Play_TriggerPictoPhoto(void) { void Play_TakePictoPhoto(PreRender* prerender) { PreRender_ApplyFilters(prerender); - Play_ConvertRgba16ToIntensityImage(gPictoPhotoI8, prerender->fbufSave, SCREEN_WIDTH, PICTO_PHOTO_TOPLEFT_X, + Play_ConvertRgba16ToIntensityImage(gHiBuffer.pictoPhotoI8, prerender->fbufSave, SCREEN_WIDTH, PICTO_PHOTO_TOPLEFT_X, PICTO_PHOTO_TOPLEFT_Y, (PICTO_PHOTO_TOPLEFT_X + PICTO_PHOTO_WIDTH) - 1, (PICTO_PHOTO_TOPLEFT_Y + PICTO_PHOTO_HEIGHT) - 1, 8); } @@ -2262,10 +2262,10 @@ void Play_Init(GameState* thisx) { PreRender_SetValues(&this->pauseBgPreRender, gCfbWidth, gCfbHeight, NULL, NULL); this->unk_18E64 = gWorkBuffer; - this->pictoPhotoI8 = gPictoPhotoI8; - this->unk_18E68 = D_80784600; - this->unk_18E58 = D_80784600; - this->unk_18E60 = D_80784600; + this->pictoPhotoI8 = gHiBuffer.pictoPhotoI8; + this->unk_18E68 = gHiBuffer.D_80784600; + this->unk_18E58 = gHiBuffer.D_80784600; + this->unk_18E60 = gHiBuffer.D_80784600; gTransitionTileState = TRANS_TILE_OFF; this->transitionMode = TRANS_MODE_OFF; D_801D0D54 = false; diff --git a/src/code/z_vr_box.c b/src/code/z_vr_box.c index 605dff84c..23f00d246 100644 --- a/src/code/z_vr_box.c +++ b/src/code/z_vr_box.c @@ -1,4 +1,5 @@ #include "global.h" +#include "buffers.h" u32 D_801C5E30[] = { 0, 0x2000, 0x4000, 0x6000, 0x8000, 0xC000 }; @@ -193,7 +194,7 @@ void Skybox_Setup(GameState* gameState, SkyboxContext* skyboxCtx, s16 skyboxId) switch (skyboxId) { case SKYBOX_NORMAL_SKY: // Send a DMA request for the cloudy sky texture - skyboxCtx->staticSegments[0] = &D_80025D00; + skyboxCtx->staticSegments[0] = gLoBuffer.skyboxBuffer; size = SEGMENT_ROM_SIZE(d2_cloud_static); segment = (void*)ALIGN8((uintptr_t)skyboxCtx->staticSegments[0] + size); DmaMgr_SendRequest0(skyboxCtx->staticSegments[0], SEGMENT_ROM_START(d2_cloud_static), size); -- cgit v1.2.3