[headers] Move padmgr, scheduler, irqmgr symbols to respective headers; add segmented_address.h (#1681)

* [headers] Move padmgr, scheduler symbols to respective headers

* fix revealed header problems

* Fix bss

* review

* bss

* segmented_address.h

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

src/code/main.c

@@ -1,19 +1,13 @@
-#include "audiomgr.h"
-#include "fault.h"
-#include "idle.h"
-#include "irqmgr.h"
-#include "padmgr.h"
-#include "scheduler.h"
-#include "CIC6105.h"
+#include "prevent_bss_reordering.h"
+#include "ultra64.h"
 #include "stack.h"
-#include "stackcheck.h"
 
 // Variables are put before most headers as a hacky way to bypass bss reordering
 OSMesgQueue sSerialEventQueue;
 OSMesg sSerialMsgBuf[1];
 u32 gSegments[NUM_SEGMENTS];
-Scheduler gScheduler;
-IrqMgrClient sIrqClient;
+struct Scheduler gScheduler;
+struct IrqMgrClient sIrqClient;
 OSMesgQueue sIrqMgrMsgQueue;
 OSMesg sIrqMgrMsgBuf[60];
 OSThread gGraphThread;
@@ -21,17 +15,28 @@ STACK(sGraphStack, 0x1800);
 STACK(sSchedStack, 0x600);
 STACK(sAudioStack, 0x800);
 STACK(sPadMgrStack, 0x500);
-StackEntry sGraphStackInfo;
-StackEntry sSchedStackInfo;
-StackEntry sAudioStackInfo;
-StackEntry sPadMgrStackInfo;
-AudioMgr sAudioMgr;
+struct StackEntry sGraphStackInfo;
+struct StackEntry sSchedStackInfo;
+struct StackEntry sAudioStackInfo;
+struct StackEntry sPadMgrStackInfo;
+struct AudioMgr sAudioMgr;
 static s32 sBssPad;
-PadMgr gPadMgr;
+struct PadMgr gPadMgr;
 
 #include "main.h"
+
+#include "audiomgr.h"
 #include "buffers.h"
-#include "global.h"
+#include "CIC6105.h"
+#include "fault.h"
+#include "idle.h"
+#include "irqmgr.h"
+#include "padmgr.h"
+#include "regs.h"
+#include "segment_symbols.h"
+#include "stack.h"
+#include "stackcheck.h"
+#include "scheduler.h"
 #include "sys_initial_check.h"
 #include "system_heap.h"
 #include "z64nmi_buff.h"

src/code/padmgr.c

@@ -38,7 +38,7 @@
 
 #include "fault.h"
 #include "macros.h"
-#include "main.h"
+#include "scheduler.h"
 #include "z64math.h"
 #include "z64voice.h"
 

src/code/speed_meter.c

@@ -3,7 +3,6 @@
 #include "libc64/malloc.h"
 
 #include "gfx.h"
-#include "main.h"
 #include "regs.h"
 #include "sys_cfb.h"
 #include "z64game.h"

src/code/z_jpeg.c

@@ -1,7 +1,7 @@
 #include "z64jpeg.h"
 
 #include "stdbool.h"
-#include "main.h"
+#include "scheduler.h"
 #include "sys_ucode.h"
 #include "macros.h"
 

src/code/z_lib.c

@@ -3,7 +3,7 @@
 
 #include "libc64/qrand.h"
 
-#include "main.h"
+#include "segmented_address.h"
 #include "sfx.h"
 #include "z64game.h"
 

src/code/z_nulltask.c

@@ -1,7 +1,6 @@
 #include "scheduler.h"
 
 #include "macros.h"
-#include "main.h"
 
 /**
  * Blocks the current thread until all queued scheduler tasks have completed.