main OK (#234)

* main OK

* gSegments -> SegmentBaseAddress

* newline

* format

include/6FB340.h

@@ -24,6 +24,6 @@ void func_800D85EC_jp(void);
 void func_800D8618_jp(void);
 // void func_800D8644_jp();
 // void func_800D8670_jp();
-// void func_800D87C0_jp();
+void func_800D87C0_jp(void*, OSPri);
 
 #endif

include/6FD190.h

@@ -2,11 +2,12 @@
 #define C_6FD190_H
 
 #include "ultra64.h"
+#include "libc/stdint.h"
 
-// void func_800D94F0_jp();
+uintptr_t func_800D94F0_jp(void);
 // void func_800D9514_jp();
-// void func_800D9524_jp();
-// void func_800D955C_jp();
+void func_800D9524_jp(void);
+void func_800D955C_jp(s32);
 // void func_800D9618_jp();
 // void func_800D96A8_jp();
 // void func_800D96E8_jp();

include/audioMgr.h

@@ -32,8 +32,8 @@ typedef struct Audiomgr {
 // void func_800D25D0_jp();
 // void func_800D287C_jp();
 // void func_800D289C_jp();
-// void func_800D2AA0_jp();
-// void func_800D2AD0_jp();
+void func_800D2AA0_jp(void);
+void func_800D2AD0_jp(void* stack, OSPri pri, OSId id);
 // void func_800D2B94_jp();
 // void func_800D2BEC_jp();
 

include/code_variables.h

@@ -2,6 +2,8 @@
 #define CODE_VARIABLES_H
 
 #include "ultra64.h"
+#include "libu64/stackcheck.h"
+#include "stack.h"
 #include "unknown_structs.h"
 #include "z64math.h"
 
@@ -1930,17 +1932,17 @@ extern u8 D_80113854_jp;
 extern u8 B_80145370_jp;
 // extern UNK_TYPE B_80145390_jp;
 // extern UNK_TYPE B_80145610_jp;
-// extern UNK_TYPE graphThread;
-// extern UNK_TYPE B_801457E0_jp;
-// extern UNK_TYPE B_80145800_jp;
-// extern UNK_TYPE B_80145820_jp;
-// extern UNK_TYPE B_80145840_jp;
-// extern UNK_TYPE B_80145860_jp;
-// extern UNK_TYPE B_80145880_jp;
-// extern UNK_TYPE B_80145898_jp;
-// extern UNK_TYPE B_8014589C_jp;
+extern OSThread graphThread;
+extern StackEntry graphStackInfo;
+extern StackEntry schedStackInfo;
+extern StackEntry audioStackInfo;
+extern StackEntry padmgrStackInfo;
+extern StackEntry irqmgrStackInfo;
+extern OSMesgQueue l_serialMsgQ;
+extern OSMesg serialMsgBuf[1];
+extern size_t gSystemHeapSize;
 
-extern uintptr_t gSegments[NUM_SEGMENTS];
+extern uintptr_t SegmentBaseAddress[NUM_SEGMENTS];
 
 // extern UNK_TYPE B_80145D70_jp;
 // extern UNK_TYPE B_80145D80_jp;
@@ -2070,11 +2072,6 @@ extern UNK_TYPE B_80145FFC_jp;
 // extern UNK_TYPE B_FLT_801462A0_jp;
 // extern UNK_TYPE Matrix_stack;
 // extern UNK_TYPE Matrix_now;
-// extern UNK_TYPE B_801462C0_jp;
-// extern UNK_TYPE B_80147AC0_jp;
-// extern UNK_TYPE B_801480C0_jp;
-// extern UNK_TYPE B_801488C0_jp;
-// extern UNK_TYPE B_80148DC0_jp;
 // extern UNK_TYPE B_80149310_jp;
 // extern UNK_TYPE B_80149328_jp;
 // extern UNK_TYPE B_80149368_jp;

include/graph.h

@@ -17,6 +17,6 @@ void func_800D3E40_jp(struct GraphicsContext *gfxCtx);
 // void graph_task_set00();
 // void graph_draw_finish();
 // void graph_main();
-// void graph_proc();
+void graph_proc(void* arg);
 
 #endif

include/m_flashrom.h

@@ -10,7 +10,7 @@ struct CommonData;
 // void func_8008ECC8_jp();
 // void func_8008ECF0_jp();
 // void func_8008ED14_jp();
-// void func_8008EE24_jp();
+void func_8008EE24_jp(void);
 // void func_8008EE5C_jp();
 // void func_8008EE6C_jp();
 // void func_8008EE7C_jp();

include/m_thread.h

@@ -1,18 +1,26 @@
 #ifndef M_THREAD_H
 #define M_THREAD_H
 
-#define M_THREAD_ID_IDLE   1
-#define M_THREAD_ID_FAULT  2
-#define M_THREAD_ID_MAIN   3
-#define M_THREAD_ID_DMAMGR 8
-#define M_THREAD_ID_IRQMGR 9
+#define M_THREAD_ID_IDLE      1
+#define M_THREAD_ID_FAULT     2
+#define M_THREAD_ID_MAIN      3
+#define M_THREAD_ID_GRAPH     4
+#define M_THREAD_ID_PADMGR    7
+#define M_THREAD_ID_DMAMGR    8
+#define M_THREAD_ID_IRQMGR    9
+#define M_THREAD_ID_AUDIOMGR 10
 
+#define M_PRIORITY_GRAPH         8
 #define M_PRIORITY_DMAMGR_LOW   10  // Used when decompressing files
+#define M_PRIORITY_AUDIOMGR     11
 #define M_PRIORITY_IDLE         12
 #define M_PRIORITY_MAIN         12
+#define M_PRIORITY_MAIN_HIGH    13
+#define M_PRIORITY_PADMGR       15
 #define M_PRIORITY_DMAMGR       17
+#define M_PRIORITY_SCHED        16
+#define M_PRIORITY_IRQMGR       18
 #define M_PRIORITY_FAULT_CLIENT (OS_PRIORITY_APPMAX - 1)
 #define M_PRIORITY_FAULT        OS_PRIORITY_APPMAX
 
-
 #endif

include/macros.h

@@ -19,7 +19,7 @@
 #define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0]))
 #define ARRAY_COUNTU(arr) (u32)(sizeof(arr) / sizeof(arr[0]))
 
-#define SEGMENTED_TO_K0(addr) (void*)((gSegments[SEGMENT_NUMBER(addr)] + K0BASE) + SEGMENT_OFFSET(addr))
+#define SEGMENTED_TO_K0(addr) (void*)((SegmentBaseAddress[SEGMENT_NUMBER(addr)] + K0BASE) + SEGMENT_OFFSET(addr))
 
 #define ABS(x) (((x) >= 0) ? (x): -(x))
 #define	ABS_F(x) (((x) >= 0.0f) ? (x) : -(x))

include/main.h

@@ -6,7 +6,6 @@
 extern s32 ScreenHeight;
 extern s32 ScreenWidth;
 
-// void func_800D64E0_jp();
-void func_800D66D0_jp(void* arg0);
+void mainproc(void* arg);
 
 #endif

include/padmgr.h

@@ -49,7 +49,7 @@ void padmgr_UnlockSerialMesgQ(OSMesgQueue*);
 void padmgr_RequestPadData(Input inputs[4], s32 arg1);
 void padmgr_ClearPadData(Input inputs[4]);
 // void padmgr_MainProc();
-// void padmgr_Init();
+void padmgr_Init(OSMesgQueue*, OSId, OSPri, void*);
 // void func_800D763C_jp();
 // void func_800D765C_jp();
 s32 padmgr_isConnectedAnyPak(s32 arg0);

include/segment_symbols.h

@@ -60,10 +60,9 @@ DECLARE_SEGMENT(segment_027130);
 
 DECLARE_SEGMENT(segment_13D9A0); 
 
-// DECLARE_SEGMENT();
-
 DECLARE_SEGMENT(code);
 
+DECLARE_SEGMENT(buffers);
 
 // TODO: the rest of segments
 

include/sys_initial_check.h

@@ -3,11 +3,6 @@
 
 #include "ultra64.h"
 
-// void func_800D9890_jp();
-// void func_800D98C0_jp();
-// void func_800D9900_jp();
-// void func_800D99F0_jp();
-// void func_800D9A6C_jp();
-// void func_800D9B44_jp();
+void Check_RegionIsSupported(void);
 
 #endif

include/sys_stacks.h

@@ -0,0 +1,13 @@
+#ifndef SYS_STACKS_H
+#define SYS_STACKS_H
+
+#include "ultra64.h"
+#include "stack.h"
+
+extern STACK(graphStack, 0x1800);
+extern STACK(schedStack, 0x600);
+extern STACK(audioStack, 0x800);
+extern STACK(padmgrStack, 0x500);
+extern STACK(irqmgrStack, 0x500);
+
+#endif