mirror of
https://github.com/zeldaret/mm.git
synced 2026-05-30 17:05:25 -04:00
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 <Dragorn421@users.noreply.github.com> * 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 <Dragorn421@users.noreply.github.com>
This commit is contained in:
+3
-6
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user