crash.c -> reset.c (docs, clean up) + osCreateThread consistency

Author: Francessco121

include/common.h

@@ -28,7 +28,6 @@
 #include "sys/gfx/animation.h"
 #include "sys/gfx/model.h"
 #include "sys/di_cpu.h"
-#include "sys/crash.h"
 #include "sys/asset.h"
 #include "sys/generic_stack.h"
 #include "sys/generic_queue.h"

include/memory_regions.h

@@ -34,4 +34,9 @@
  */
 #define DEPTH_BUFFER_ADDR 0x80200000
 
+/** Static regions to persist some memory across NMI resets (for debugging). */
+#define RESET_ASSET_THREAD_COPY ((OSThread *)0x807FF000)
+#define RESET_MAIN_THREAD_COPY ((OSThread *)0x807FF230)
+#define RESET_DLL_LIST_COPY ((void *)0x807FF460)
+
 #endif

include/sys/asset.h

@@ -7,9 +7,6 @@
 #include "sys/generic_queue.h"
 #include "game/objects/object.h"
 
-#define ASSET_THREAD_ID 99
-#define ASSET_THREAD_PRIORITY 11
-
 enum AssetLoadType {
     ASSET_TYPE_FILE = 0,
     ASSET_TYPE_ALLOCATED_FILE = 1,

include/sys/crash.h

@@ -10,11 +10,11 @@ void diCpuTraceInit(void);
  * Stops all active application threads (those with priorities between 1 and OS_PRIORITY_APPMAX).
  */
 void diCpuStopActiveAppThreads(void);
-void diCpuDrawCpuInfo(OSThread **threads, s32 count, s32 offset);
-void diCpuDrawStackTrace(OSThread**, s32, s32);
-void diCpuDrawFpuInfo(OSThread **threads, s32 count, s32 threadIdx);
+void diCpuDrawCpuInfo(OSThread** threads, s32 threadsCount, s32 threadsIdx);
+void diCpuDrawStackTrace(OSThread** threads, s32 threadsCount, s32 threadsIdx);
+void diCpuDrawFpuInfo(OSThread **threads, s32 threadsCount, s32 threadsIdx);
 void diCpuCrashScreenInit(void);
-void diCpuTraceFile(const char *cFileLabel, s32 line);
+void diCpuTraceFile(const char *filename, s32 lineno);
 
 void* diCpuTraceCurrentStack(void);
 

include/sys/di_cpu.h

@@ -0,0 +1,10 @@
+/** NMI handler
+ */
+#ifndef _SYS_RESET_H
+#define _SYS_RESET_H
+
+#include "PR/sched.h"
+
+void resetInit(OSSched *scheduler);
+
+#endif

include/sys/reset.h

@@ -3,9 +3,6 @@
 #ifndef _SYS_THREAD_H
 #define _SYS_THREAD_H
 
-#include "ultra64.h"
-#include "PR/sched.h"
-
 #define IDLE_THREAD_SIZE 0x40
 #define IDLE_THREAD_ID 1
 #define IDLE_THREAD_PRIORITY OS_PRIORITY_IDLE
@@ -15,22 +12,21 @@
 #define MAIN_THREAD_PRIORITY 10
 
 #define OS_SCHEDULER_THREAD_ID 5
+#define OS_SCHEDULER_THREAD_PRIORITY 13
+
 #define CONTROLLER_THREAD_ID 98
+#define CONTROLLER_THREAD_PRIORITY 12
 
-#define CRASH_THREAD_ID 100
-#define CRASH_THREAD_PRIORITY 0x80
+#define RESET_THREAD_ID 100
+#define RESET_THREAD_PRIORITY 0x80
 
-extern OSThread* __osRunningThread;
-extern OSThread* __osRunQueue;
-// this needs double checking. its address is within gMainThreadStack....
-extern u64 gIdleThreadStack[];
-extern u64 gMainThreadStack[];
-extern OSThread gIdleThread;
-extern OSThread gMainThread;
+#define ASSET_THREAD_ID 99
+#define ASSET_THREAD_PRIORITY 11
 
-/**
- * @returns The address of s->interruptQ.
- */
-OSMesgQueue *osScGetInterruptQ(OSSched *s);
+#define AUDIO_THREAD_ID 4
+#define AUDIO_THREAD_PRIORITY 14
+
+#define DI_CPU_THREAD_ID (-1)
+#define DI_CPU_THREAD_PRIORITY OS_PRIORITY_MAX
 
 #endif //_SYS_THREAD_H

include/sys/thread.h

@@ -22,7 +22,7 @@ extern u16 *gBackDepthBuffer;
 extern s32 gDisplayHertz;
 extern f32 gAspectRatio; //1.121212 for PAL, 1.333 for NTSC/MPAL.
 
-void viInit(s32 videoMode, OSSched* scheduler, s32 someBool);
+void viInit(s32 videoMode, OSSched* scheduler, s32 doOneTimeInit);
 /**
  * Returns gVideoMode.
  */

include/sys/vi.h

@@ -77,7 +77,7 @@ segments:
     - [0x334F0, c, objexpr]
     - [0x359E0, c, objprint]
     - [0x37C90, c, pi]
-    - [0x38020, c, crash]
+    - [0x38020, c, reset]
     - [0x38380, c, rcp]
     - [0x3A190, c, route]
     - [0x3AFB0, c, rarezip]
@@ -320,7 +320,7 @@ segments:
     - [0x92310, .data, objlib]
     - [0x92320, .data, objexpr]
     - [0x92350, .data, objprint]
-    - [0x92370, .data, crash]
+    - [0x92370, .data, reset]
     - [0x92380, .data, rcp]
     - [0x924B0, .data, rarezip]
     - [0x924D0, .data, scheduler]
@@ -475,7 +475,7 @@ segments:
     # - { type: .bss, vram: 0x800b2e00, name: objexpr }
     # - { type: .bss, vram: 0x800b2e10, name: objprint }
     # - { type: .bss, vram: 0x800b2e30, name: pi }
-    # - { type: .bss, vram: 0x800b2ed0, name: crash }
+    # - { type: .bss, vram: 0x800b2ed0, name: reset }
     # - { type: .bss, vram: 0x800b3790, name: rcp }
     # - { type: .bss, vram: 0x800b4920, name: route }
     # - { type: .bss, vram: 0x800b4930, name: rarezip }

splat.yaml

@@ -5,6 +5,7 @@
 #include "sys/interrupt_util.h"
 #include "sys/map.h"
 #include "sys/objects.h"
+#include "sys/thread.h"
 #include "sys/voxmap.h"
 #include "macros.h"