gijs
/
ogrebattle64
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed main_ to obMain along with it's Thread and Stack

This commit is contained in:
gijs 2023-09-25 16:39:31 +02:00
parent 8457613831
commit bd344c296c
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/common.h
View File

@ -328,15 +328,16 @@ extern void AddHeap(void* start, u32 length);
extern void __some_logging(const char* format, ...); extern void __some_logging(const char* format, ...);
extern void main_(void*);
extern void __idle_start_4_threads(s32, s32); extern void __idle_start_4_threads(s32, s32);
extern void (*D_800E7A18)(); extern void (*D_800E7A18)();
extern void boot(void); extern void boot(void);
extern void obIdle(void* arg);
extern OSThread THREAD_FIRST_DMA_LOAD; extern void obIdle(void*);
extern u8 SP_THREAD_FIRST_DMA_LOAD[]; extern void obMain(void*);
extern OSThread obThreadMain;
extern u8 obStackMain[];
extern OSThread obThreadIdle; extern OSThread obThreadIdle;
extern u8 obStackIdle[]; extern u8 obStackIdle[];

9
linker_scripts/symbols/addr.txt
View File

@ -793,7 +793,6 @@ __start_thread_800B9C88 = 0x80089660;
magnitude = 0x8009C780; magnitude = 0x8009C780;
main_ = 0x80071EB0;
__dma_load_loop = 0x80089A30; __dma_load_loop = 0x80089A30;
@ -828,12 +827,10 @@ OSMESG_800BE048 = 0x800BE048;
OSMESG_800B9C58 = 0x800B9C58; OSMESG_800B9C58 = 0x800B9C58;
OSMESG_800B9C80 = 0x800B9C80; OSMESG_800B9C80 = 0x800B9C80;
SP_THREAD_FIRST_DMA_LOAD = 0x800C6D60;
SP_THREAD_800BE1C0 = 0x800C2370; SP_THREAD_800BE1C0 = 0x800C2370;
SP_THREAD_800B9C88 = 0x800BBE40; SP_THREAD_800B9C88 = 0x800BBE40;
THREAD_CONTROLLER = 0x800BBE80; THREAD_CONTROLLER = 0x800BBE80;
THREAD_FIRST_DMA_LOAD = 0x800AF5F0;
THREAD_800B7A90 = 0x800B7A90; THREAD_800B7A90 = 0x800B7A90;
THREAD_800BE1C0 = 0x800BE1C0; THREAD_800BE1C0 = 0x800BE1C0;
THREAD_800B9C88 = 0x800B9C88; THREAD_800B9C88 = 0x800B9C88;
@ -922,9 +919,13 @@ __controller_thread_80089D9C = 0x80089D9C;
obIdle = 0x8007F8E4;
obThreadIdle = 0x800AF440; obThreadIdle = 0x800AF440;
obStackIdle = 0x800B17A0; obStackIdle = 0x800B17A0;
obIdle = 0x8007F8E4;
obMain = 0x80071EB0;
obThreadMain = 0x800AF5F0;
obStackMain = 0x800C6D60;
obInitializePi = 0x80089F40; obInitializePi = 0x80089F40;

2
splat.yaml
View File

@ -50,7 +50,7 @@ segments:
bss_size: 0x3AE70 bss_size: 0x3AE70
find_file_boundaries: False find_file_boundaries: False
subsegments: subsegments:
- [0x1060, asm, "main"] - [0x1060, c, "main"]
- [0x4AC0, asm] - [0x4AC0, asm]
- [0x5FC0, asm, "5FC0"] - [0x5FC0, asm, "5FC0"]
- [0x68E0, asm] - [0x68E0, asm]

4
src/boot.c
View File

@ -14,8 +14,8 @@ void obIdle(void* arg) {
osViSetSpecialFeatures(OS_VI_DIVOT_ON | OS_VI_DITHER_FILTER_ON | OS_VI_GAMMA_OFF | OS_VI_GAMMA_DITHER_OFF); osViSetSpecialFeatures(OS_VI_DIVOT_ON | OS_VI_DITHER_FILTER_ON | OS_VI_GAMMA_OFF | OS_VI_GAMMA_DITHER_OFF);
osCreateThread(&THREAD_FIRST_DMA_LOAD, 3, main_, NULL, SP_THREAD_FIRST_DMA_LOAD, 0xA); osCreateThread(&obThreadMain, 3, obMain, NULL, obStackMain, 0xA);
osStartThread(&THREAD_FIRST_DMA_LOAD); osStartThread(&obThreadMain);
osSetThreadPri(&obThreadIdle, OS_PRIORITY_IDLE); osSetThreadPri(&obThreadIdle, OS_PRIORITY_IDLE);

2
src/main.c
View File

@ -39,7 +39,7 @@ INCLUDE_ASM(const s32, "main", func_80071C04);
INCLUDE_ASM(const s32, "main", func_80071E74); INCLUDE_ASM(const s32, "main", func_80071E74);
INCLUDE_ASM(const s32, "main", main_); INCLUDE_ASM(const s32, "main", obMain);
INCLUDE_ASM(const s32, "main", func_80072398); INCLUDE_ASM(const s32, "main", func_80072398);