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

Minor cleanup

This commit is contained in:
Ryan Dwyer 2021-01-31 16:23:31 +10:00
parent feb8b5431e
commit 5cad1198a5
11 changed files with 33 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/boot/entry.c
View File

@ -22,8 +22,12 @@
#include "lib/lib_48150.h"
#include "types.h"
/**
* This function is generated automatically by makerom. It clears the BSS
* segment, sets the stack pointer to 0x80000f10 and then calls boot.
*/
GLOBAL_ASM(
glabel func00001000
glabel preamble
/* 1000: 3c088009 */ lui $t0,%hi(var8008ae20)
/* 1004: 3c090002 */ lui $t1,0x2
/* 1008: 2508ae20 */ addiu $t0,$t0,%lo(var8008ae20)
@ -47,8 +51,11 @@ glabel func00001000
/* 104c: 00000000 */ nop
);
/**
* Sets up TLB index 0 (0x70000000), then calls init.
*/
GLOBAL_ASM(
glabel func00001050
glabel boot
/* 1050: 3c08007f */ lui $t0,0x7f
/* 1054: 3508e000 */ ori $t0,$t0,0xe000
/* 1058: 40882800 */ mtc0 $t0,$5
@ -73,7 +80,7 @@ glabel func00001050
);
GLOBAL_ASM(
glabel func000010a4
glabel boot000010a4
/* 10a4: 27bdfff8 */ addiu $sp,$sp,-8
/* 10a8: afbf0000 */ sw $ra,0x0($sp)
/* 10ac: 40802000 */ mtc0 $zero,$4
@ -115,7 +122,7 @@ glabel func000010a4
);
GLOBAL_ASM(
glabel func0000113c
glabel boot0000113c
/* 113c: 240800ff */ addiu $t0,$zero,0xff
/* 1140: 3c028009 */ lui $v0,%hi(var8008d25c)
/* 1144: 8c42d25c */ lw $v0,%lo(var8008d25c)($v0)
@ -139,7 +146,7 @@ glabel func0000113c
#if VERSION >= VERSION_NTSC_1_0
GLOBAL_ASM(
glabel func00001180
glabel boot00001180
/* 1180: 40082000 */ mfc0 $t0,$4
/* 1184: 0008aa40 */ sll $s5,$t0,0x9
/* 1188: 3c097f00 */ lui $t1,0x7f00
@ -470,7 +477,7 @@ glabel func00001180
);
#else
GLOBAL_ASM(
glabel func00001180
glabel boot00001180
/* 1180: 40082000 */ mfc0 $t0,$4
/* 1184: 0008aa40 */ sll $s5,$t0,0x9
/* 1188: 3c097f00 */ lui $t1,0x7f00
@ -816,7 +823,7 @@ glabel func00001180
#endif
GLOBAL_ASM(
glabel func00001634
glabel bootUnmapTLBRange
/* 1634: 40085000 */ mfc0 $t0,$10
/* 1638: 3c0a8000 */ lui $t2,0x8000
/* 163c: 408a5000 */ mtc0 $t2,$10

8
src/boot/init.c
View File

@ -82,7 +82,7 @@ glabel init
/* 1744: 010e1821 */ addu $v1,$t0,$t6
/* 1748: 2462ffff */ addiu $v0,$v1,-1
/* 174c: 0440000b */ bltz $v0,.L0000177c
/* 1750: 3c057000 */ lui $a1,%hi(func00001050)
/* 1750: 3c057000 */ lui $a1,%hi(boot)
/* 1754: 3c017000 */ lui $at,0x7000
/* 1758: 3c0f7020 */ lui $t7,0x7020
/* 175c: 01e88023 */ subu $s0,$t7,$t0
@ -95,7 +95,7 @@ glabel init
/* 1774: 0441fffb */ bgez $v0,.L00001764
/* 1778: a1390000 */ sb $t9,0x0($t1)
.L0000177c:
/* 177c: 24a51050 */ addiu $a1,$a1,%lo(func00001050)
/* 177c: 24a51050 */ addiu $a1,$a1,%lo(boot)
/* 1780: 3c07702c */ lui $a3,0x702c
/* 1784: 3c0a7020 */ lui $t2,0x7020
/* 1788: 01488023 */ subu $s0,$t2,$t0
@ -129,7 +129,7 @@ glabel init
/* 17f0: 1000ffff */ b .L000017f0
/* 17f4: 00000000 */ nop
.L000017f8:
/* 17f8: 0c00058d */ jal func00001634
/* 17f8: 0c00058d */ jal bootUnmapTLBRange
/* 17fc: 2405001f */ addiu $a1,$zero,0x1f
/* 1800: 3c048006 */ lui $a0,%hi(g_StackStartAddrs)
/* 1804: 3c038006 */ lui $v1,%hi(g_StackEndAddrs)
@ -360,7 +360,7 @@ glabel init
//#endif
//#endif
//
// func00001634(1, 0x1f);
// bootUnmapTLBRange(1, 31);
//
// // Clear the stack allocation pointers
// for (i = 0; i < ARRAYCOUNT(g_StackStartAddrs); i++) {

2
src/boot/sched.c
View File

@ -232,7 +232,7 @@ void func00002078(OSSched *sc)
if (var8005ced0 == 0 && ((sc->frameCount & 1) != 0 || IS4MB())) {
osStopTimer(&var8008de18);
osSetTimer(&var8008de18, 280000, 0, amgr0009118(), &var8005cea8);
osSetTimer(&var8008de18, 280000, 0, amgr00009118(), &var8005cea8);
}
if (var8005ced0 == 0) {

2
src/game/credits.c
View File

@ -402,7 +402,7 @@ struct credit g_Credits[] = {
{ 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(41), L_TITLE(1) }, // "simon farmer", "\n"
{ 1, 1, 0, 0, CREDITSTYLE_C_BIG, L_TITLE(35), L_TITLE(0) }, // "dd snipers", ""
{ 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(42), L_TITLE(43) }, // "leigh loverday", "rob harrison"
{ 1, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(42), L_TITLE(43) }, // "leigh loveday", "rob harrison"
{ 0, 0, 0, 0, CREDITSTYLE_C_MED, L_TITLE(44), L_TITLE(1) }, // "steven hurst", "\n"
{ 1, 0, 0, 0, CREDITSTYLE_C_BIG, L_TITLE(45), L_TITLE(0) }, // "fearsome foursome", ""

8
src/include/boot/entry.h
View File

@ -2,9 +2,9 @@
#define _IN_BOOT_ENTRY_H
#include <ultra64.h>
s32 func000010a4(void);
s32 func0000113c(void);
s32 func00001180(void);
void func00001634(u32 arg0, u32 arg1);
s32 boot000010a4(void);
s32 boot0000113c(void);
s32 boot00001180(void);
void bootUnmapTLBRange(s32 first, s32 last);
#endif

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

@ -6,7 +6,7 @@
void amgrAllocateStack(void);
u32 amgrCreate(void);
void amgrStartThread(void);
OSMesgQueue *amgr0009118(void);
OSMesgQueue *amgr00009118(void);
void amgrStopThread(void);
#endif

2
src/lib/audiomgr.c
View File

@ -843,7 +843,7 @@ void amgrStartThread(void)
}
GLOBAL_ASM(
glabel amgr0009118
glabel amgr00009118
/* 9118: 3c028009 */ lui $v0,%hi(g_AudioManager+0x248)
/* 911c: 03e00008 */ jr $ra
/* 9120: 24421810 */ addiu $v0,$v0,%lo(g_AudioManager+0x248)

4
src/lib/lib_070d0.c
View File

@ -141,7 +141,7 @@ glabel func000070d0
/* 729c: 3c018009 */ lui $at,%hi(var8008ae20)
/* 72a0: ac33ae20 */ sw $s3,%lo(var8008ae20)($at)
/* 72a4: 3c018009 */ lui $at,%hi(var80090b00)
/* 72a8: 0c000429 */ jal func000010a4
/* 72a8: 0c000429 */ jal boot000010a4
/* 72ac: ac330b00 */ sw $s3,%lo(var80090b00)($at)
/* 72b0: 8ee30000 */ lw $v1,0x0($s7)
/* 72b4: 3c048009 */ lui $a0,%hi(var8008ae24)
@ -157,7 +157,7 @@ glabel func000070d0
/* 72d8: 1623fffd */ bne $s1,$v1,.L000072d0
/* 72dc: ac40fffc */ sw $zero,-0x4($v0)
.L000072e0:
/* 72e0: 0c00044f */ jal func0000113c
/* 72e0: 0c00044f */ jal boot0000113c
/* 72e4: 00000000 */ nop
/* 72e8: 1000006a */ b .L00007494
/* 72ec: 00000000 */ nop

8
src/lib/lib_0c000.c
View File

@ -569,8 +569,8 @@ GLOBAL_ASM(
glabel func0000c240
/* c240: 308e0003 */ andi $t6,$a0,0x3
/* c244: 15c00019 */ bnez $t6,.L0000c2ac
/* c248: 3c0f7000 */ lui $t7,%hi(func00001050)
/* c24c: 25ef1050 */ addiu $t7,$t7,%lo(func00001050)
/* c248: 3c0f7000 */ lui $t7,%hi(boot)
/* c24c: 25ef1050 */ addiu $t7,$t7,%lo(boot)
/* c250: 008f082b */ sltu $at,$a0,$t7
/* c254: 14200015 */ bnez $at,.L0000c2ac
/* c258: 3c187006 */ lui $t8,0x7006
@ -1107,8 +1107,8 @@ glabel rmonDrawCrashScreen
/* c9e8: 0c00bea9 */ jal func0002faa4
/* c9ec: 24842c60 */ addiu $a0,$a0,%lo(var70052c60)
.L0000c9f0:
/* c9f0: 3c057000 */ lui $a1,%hi(func00001050)
/* c9f4: 24a51050 */ addiu $a1,$a1,%lo(func00001050)
/* c9f0: 3c057000 */ lui $a1,%hi(boot)
/* c9f4: 24a51050 */ addiu $a1,$a1,%lo(boot)
/* c9f8: 02002025 */ or $a0,$s0,$zero
/* c9fc: 02203025 */ or $a2,$s1,$zero
/* ca00: 0c003046 */ jal func0000c118

35
src/lib/lib_490b0.c
View File

@ -1,35 +0,0 @@
#include <ultra64.h>
#include "constants.h"
#include "game/data/data_000000.h"
#include "game/data/data_0083d0.h"
#include "game/data/data_00e460.h"
#include "game/data/data_0160b0.h"
#include "game/data/data_01a3a0.h"
#include "game/data/data_020df0.h"
#include "game/data/data_02da90.h"
#include "gvars/gvars.h"
#include "types.h"
GLOBAL_ASM(
glabel osViSwapBuffer
/* 490b0: 27bdffe0 */ addiu $sp,$sp,-32
/* 490b4: afbf0014 */ sw $ra,0x14($sp)
/* 490b8: 0c01256c */ jal __osDisableInt
/* 490bc: afa40020 */ sw $a0,0x20($sp)
/* 490c0: 3c0f8006 */ lui $t7,%hi(__osViNext)
/* 490c4: 8def0914 */ lw $t7,%lo(__osViNext)($t7)
/* 490c8: 8fae0020 */ lw $t6,0x20($sp)
/* 490cc: afa2001c */ sw $v0,0x1c($sp)
/* 490d0: 3c188006 */ lui $t8,%hi(__osViNext)
/* 490d4: adee0004 */ sw $t6,0x4($t7)
/* 490d8: 8f180914 */ lw $t8,%lo(__osViNext)($t8)
/* 490dc: 97190000 */ lhu $t9,0x0($t8)
/* 490e0: 37280010 */ ori $t0,$t9,0x10
/* 490e4: a7080000 */ sh $t0,0x0($t8)
/* 490e8: 0c012588 */ jal __osRestoreInt
/* 490ec: 8fa4001c */ lw $a0,0x1c($sp)
/* 490f0: 8fbf0014 */ lw $ra,0x14($sp)
/* 490f4: 27bd0020 */ addiu $sp,$sp,0x20
/* 490f8: 03e00008 */ jr $ra
/* 490fc: 00000000 */ nop
);

2
src/lib/ultra/os/exceptasm.c
View File

@ -361,7 +361,7 @@ glabel __osException
/* 39e0: 1000ff5d */ b .L00003758
/* 39e4: 02018024 */ and $s0,$s0,$at
.L000039e8:
/* 39e8: 0c000460 */ jal func00001180
/* 39e8: 0c000460 */ jal boot00001180
/* 39ec: 00000000 */ nop
/* 39f0: 10000012 */ b .L00003a3c
/* 39f4: 00000000 */ nop