falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename rmon to fault and make thread entry function names consistent

This commit is contained in:
Ryan Dwyer 2020-09-30 23:51:23 +10:00
parent dbdddf696f
commit b6c03f09ff
12 changed files with 38 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/boot/boot.c
View File

@ -735,21 +735,21 @@ glabel func000018ac
/* 1930: 2442fff8 */ addiu $v0,$v0,-8
);
void idle(void *data)
void idleproc(void *data)
{
while (true);
}
void idleCreateThread(void)
{
osCreateThread(&g_IdleThread, THREAD_IDLE, &idle, NULL, func000018ac(1, 64), 0);
osCreateThread(&g_IdleThread, THREAD_IDLE, idleproc, NULL, func000018ac(1, 64), 0);
osStartThread(&g_IdleThread);
}
void thread0CreateThread(void)
void rmonCreateThread(void)
{
osCreateThread(&g_Thread0Thread, THREAD_0, thread0Init, NULL, func000018ac(0, 0x300), 250);
osStartThread(&g_Thread0Thread);
osCreateThread(&g_RmonThread, 0, rmonproc, NULL, func000018ac(0, 0x300), 250);
osStartThread(&g_RmonThread);
}
GLOBAL_ASM(
@ -807,7 +807,7 @@ void mainproc(u32 value)
idleCreateThread();
func00013750();
func00013710();
thread0CreateThread();
rmonCreateThread();
if (func00012f30()) {
osStopThread(0);
@ -2108,7 +2108,7 @@ glabel func00002d90
);
GLOBAL_ASM(
glabel resetThreadInit
glabel resetproc
/* 2e00: 27bdffd0 */ addiu $sp,$sp,-48
/* 2e04: afa40030 */ sw $a0,0x30($sp)
/* 2e08: afbf0014 */ sw $ra,0x14($sp)
@ -2212,7 +2212,7 @@ void resetThreadCreate(void)
{
osCreateMesgQueue(&g_ResetMesgQueue, &g_ResetMesg, 10);
osSetEventMesg(OS_EVENT_PRENMI, &g_ResetMesgQueue, (OSMesg) 669);
osCreateThread(&g_ResetThread, THREAD_RESET, resetThreadInit, 0, &var8008fdf0, 11);
osCreateThread(&g_ResetThread, THREAD_RESET, resetproc, 0, &var8008fdf0, 11);
osStartThread(&g_ResetThread);
}

10
src/gvars/gvars.c
View File

@ -2326,7 +2326,7 @@ u32 var8008d260 = 0;
u32 var8008d264 = 0;
u32 var8008d268 = 0;
u32 var8008d26c = 0;
OSThread g_Thread0Thread = {0};
OSThread g_RmonThread = {0};
u32 var8008d420 = 0;
u32 var8008d424 = 0;
u32 var8008d428 = 0;
@ -5281,7 +5281,7 @@ u32 var80092870 = 0;
u32 var80092874 = 0;
u32 var80092878 = 0;
u32 var8009287c = 0;
OSThread g_RmonThread = {0};
OSThread g_FaultThread = {0};
u32 var80092a30 = 0;
u32 var80092a34 = 0;
u32 var80092a38 = 0;
@ -5570,7 +5570,7 @@ u32 var80092ea0 = 0;
u32 var80092ea4 = 0;
u32 var80092ea8 = 0;
u32 var80092eac = 0;
u32 g_RmonSp = 0;
u32 g_FaultSp = 0;
u32 var80092eb4 = 0;
u32 var80092eb8 = 0;
u32 var80092ebc = 0;
@ -7362,8 +7362,8 @@ u32 var80094aa0 = 0;
u32 var80094aa4 = 0;
u32 var80094aa8 = 0;
u32 var80094aac = 0;
OSMesgQueue g_RmonMesgQueue = {0};
OSMesg var80094ac8 = {0};
OSMesgQueue g_FaultMesgQueue = {0};
OSMesg g_FaultMesg = {0};
u32 var80094acc = 0;
u32 var80094ad0 = 0;
u32 var80094ad4 = 0;

2
src/include/boot/boot.h
View File

@ -14,7 +14,7 @@ s32 func00002078(void);
s32 func00002148(void);
s32 func00002148(void);
s32 func000022e0(void);
void resetThreadInit(void *data);
void resetproc(void *data);
void osMapTLBRdb(void);
#endif

3
src/include/constants.h
View File

@ -2840,9 +2840,8 @@
#define TELEPORTSTATE_3 3
#define TELEPORTSTATE_4 4
#define THREAD_0 0
#define THREAD_IDLE 1
#define THREAD_RMON 5
#define THREAD_FAULT 5
#define THREAD_RESET 6
#define TICKMODE_0 0

10
src/include/gvars/gvars.h
View File

@ -356,7 +356,7 @@ extern u32 var8008ae30;
extern u32 var8008ae38;
extern u32 var8008be38;
extern u32 var8008d238;
extern OSThread g_Thread0Thread;
extern OSThread g_RmonThread;
extern OSThread g_IdleThread;
extern OSThread var8008d6d0;
extern u32 var8008d900;
@ -424,10 +424,10 @@ extern u32 var80092828;
extern u32 var80092830;
extern u32 var80092870;
extern u32 var80092874;
extern OSThread g_RmonThread;
extern u32 g_RmonSp;
extern OSMesgQueue g_RmonMesgQueue;
extern OSMesg var80094ac8;
extern OSThread g_FaultThread;
extern u32 g_FaultSp;
extern OSMesgQueue g_FaultMesgQueue;
extern OSMesg g_FaultMesg;
extern u32 var80094ae0;
extern u32 var80094ae8;
extern u32 var80094de8;

2
src/include/lib/lib_0bfb0.h
View File

@ -3,7 +3,7 @@
#include <ultra64.h>
#include "types.h"
void func0000bfb0(void);
void faultCreateThread(void);
void func0000bfd0(char *arg0, char *arg1, s32 arg2);
#endif

2
src/include/lib/lib_0c000.h
View File

@ -86,7 +86,7 @@ extern const char var700529a4[];
extern const char var700529a8[];
extern const char var700529ac[];
void rmonCreateThread(void);
void faultCreateThread2(void);
u32 func0000c118(void);
u32 func0000c240(void);
u32 func0000c2b8(void);

2
src/include/lib/lib_2fa00.h
View File

@ -3,7 +3,7 @@
#include <ultra64.h>
#include "types.h"
void thread0Init();
void rmonproc();
u32 func0002fa08(void);
void func0002faa4(char *format, ...);

4
src/lib/lib_0bfb0.c
View File

@ -12,9 +12,9 @@
#include "lib/lib_2fa00.h"
#include "types.h"
void func0000bfb0(void)
void faultCreateThread(void)
{
rmonCreateThread();
faultCreateThread2();
}
void func0000bfd0(char *arg0, char *arg1, s32 arg2)

22
src/lib/lib_0c000.c
View File

@ -145,21 +145,21 @@ const char var70052c94[] = ">";
const char var70052c98[] = "";
const char var70052c9c[] = "";
void rmonLoop(void *arg0);
void faultproc(void *arg0);
void rmonCreateThread(void)
void faultCreateThread2(void)
{
osCreateMesgQueue(&g_RmonMesgQueue, &var80094ac8, 1);
osCreateThread(&g_RmonThread, THREAD_RMON, rmonLoop, NULL, &g_RmonSp, 40);
osStartThread(&g_RmonThread);
osCreateMesgQueue(&g_FaultMesgQueue, &g_FaultMesg, 1);
osCreateThread(&g_FaultThread, THREAD_FAULT, faultproc, NULL, &g_FaultSp, 40);
osStartThread(&g_FaultThread);
}
GLOBAL_ASM(
glabel rmonLoop
glabel faultproc
/* c06c: 27bdffa0 */ addiu $sp,$sp,-96
/* c070: afb1001c */ sw $s1,0x1c($sp)
/* c074: 3c118009 */ lui $s1,%hi(g_RmonMesgQueue)
/* c078: 26314ab0 */ addiu $s1,$s1,%lo(g_RmonMesgQueue)
/* c074: 3c118009 */ lui $s1,%hi(g_FaultMesgQueue)
/* c078: 26314ab0 */ addiu $s1,$s1,%lo(g_FaultMesgQueue)
/* c07c: afbf0024 */ sw $ra,0x24($sp)
/* c080: afa40060 */ sw $a0,0x60($sp)
/* c084: afb20020 */ sw $s2,0x20($sp)
@ -204,7 +204,7 @@ glabel rmonLoop
);
// Mismatch because bss needs to be sprinkled around various files first
//void rmonLoop(void *arg0)
//void faultproc(void *arg0)
//{
// OSMesg msg = 0;
// OSIntMask mask;
@ -212,12 +212,12 @@ glabel rmonLoop
// u8 stack1[44];
// static u32 result; // var80094acc
//
// osSetEventMesg(OS_EVENT_FAULT, &g_RmonMesgQueue, (OSMesg) 16);
// osSetEventMesg(OS_EVENT_FAULT, &g_FaultMesgQueue, (OSMesg) 16);
// var80094ad0 = 0;
//
// while (true) {
// do {
// osRecvMesg(&g_RmonMesgQueue, &msg, 1);
// osRecvMesg(&g_FaultMesgQueue, &msg, 1);
// mask = osSetIntMask(1);
// result = func0004e640();
// } while (!result);

2
src/lib/lib_0d520.c
View File

@ -186,7 +186,7 @@ GLOBAL_ASM(
glabel mainInit
/* d520: 27bdeb28 */ addiu $sp,$sp,-5336
/* d524: afbf002c */ sw $ra,0x2c($sp)
/* d528: 0c002fec */ jal func0000bfb0
/* d528: 0c002fec */ jal faultCreateThread
/* d52c: afb00028 */ sw $s0,0x28($sp)
/* d530: 0c003428 */ jal func0000d0a0
/* d534: 00000000 */ nop

2
src/lib/lib_2fa00.c
View File

@ -12,7 +12,7 @@
#include "lib/lib_4e690.h"
#include "types.h"
void thread0Init()
void rmonproc()
{
// empty
}