Add a few files in boot that have matching .rodata

This commit is contained in:
rozlette 2020-01-16 16:02:37 -06:00
parent 11c9e03655
commit 60a7168cea
5 changed files with 20 additions and 26 deletions

View File

@ -198,12 +198,12 @@ SECTIONS
build/asm/boot_data.o(.text) build/asm/boot_data.o(.text)
build/asm/boot_rodata_0x80080060.o(.text) build/src/boot_O2_g3/boot_0x80080060.o(.rodata)
build/asm/boot_rodata_idle.o(.text) build/asm/boot_rodata_idle.o(.text)
build/asm/boot_rodata_z_std_dma.o(.text) build/asm/boot_rodata_z_std_dma.o(.text)
build/asm/boot_rodata_0x80080E30.o(.text) build/asm/boot_rodata_0x80080E30.o(.text)
build/asm/boot_rodata_0x80081250.o(.text) build/asm/boot_rodata_0x80081250.o(.text)
build/asm/boot_rodata_CIC6105.o(.text) build/src/boot_O2_g3/CIC6105.o(.rodata)
build/asm/boot_rodata_fault.o(.text) build/asm/boot_rodata_fault.o(.text)
build/asm/boot_rodata_fault_drawer.o(.text) build/asm/boot_rodata_fault_drawer.o(.text)
build/asm/boot_rodata_0x80085570.o(.text) build/asm/boot_rodata_0x80085570.o(.text)
@ -211,7 +211,7 @@ SECTIONS
build/asm/boot_rodata_0x80086760.o(.text) build/asm/boot_rodata_0x80086760.o(.text)
build/asm/boot_rodata___osMalloc.o(.text) build/asm/boot_rodata___osMalloc.o(.text)
build/asm/boot_rodata_setintmask.o(.text) build/asm/boot_rodata_setintmask.o(.text)
build/asm/boot_rodata_sinf.o(.text) build/src/libultra/gu/sinf.o(.rodata)
build/asm/boot_rodata_exceptasm.o(.text) build/asm/boot_rodata_exceptasm.o(.text)
build/asm/boot_rodata_perspective.o(.text) build/asm/boot_rodata_perspective.o(.text)
build/asm/boot_rodata_0x8008C260.o(.text) build/asm/boot_rodata_0x8008C260.o(.text)

View File

@ -6,9 +6,9 @@ void CIC6105_Nop80081820(void) {}
void CIC6105_Nop80081828(void) {} void CIC6105_Nop80081828(void) {}
void CIC6105_PrintRomInfo(void) { void CIC6105_PrintRomInfo(void) {
FaultDrawer_DrawText(80, 200, D_80098280, (UNK_PTR)(*(u32*)0xA4040010)); FaultDrawer_DrawText(80, 200, "SP_STATUS %08x", (UNK_PTR)(*(u32*)0xA4040010));
FaultDrawer_DrawText(40, 184, D_80098290, &D_800994D0); FaultDrawer_DrawText(40, 184, "ROM_F [Creator:%s]", &D_800994D0);
FaultDrawer_DrawText(56, 192, D_800982A4, &D_800994DC); FaultDrawer_DrawText(56, 192, "[Date:%s]", &D_800994DC);
} }
void CIC6105_AddRomInfoFaultPage(void) { void CIC6105_AddRomInfoFaultPage(void) {

View File

@ -2,13 +2,13 @@
#include <global.h> #include <global.h>
void start(void) { void start(void) {
StackCheck_Init(&bootStackEntry, (u32)bootStack, (u32)&bootStack[1024], 0, -1, bootThreadName); StackCheck_Init(&bootStackEntry, (u32)bootStack, (u32)&bootStack[1024], 0, -1, "boot");
osMemSize = func_8008D350(); osMemSize = func_8008D350();
func_800818F4(); func_800818F4();
osInitialize(); osInitialize();
osUnmapTLBAll(); osUnmapTLBAll();
D_80096B40 = func_80092920(); D_80096B40 = func_80092920();
StackCheck_Init(&idleStackEntry, (u32)idleStack, (u32)&idleStack[1024], 0, 256, idleThreadName); StackCheck_Init(&idleStackEntry, (u32)idleStack, (u32)&idleStack[1024], 0, 256, "idle");
osCreateThread(&idleOSThread, 1, (osCreateThread_func)Idle_ThreadEntry, 0, &idleStack[1024], 12); osCreateThread(&idleOSThread, 1, (osCreateThread_func)Idle_ThreadEntry, 0, &idleStack[1024], 12);
osStartThread(&idleOSThread); osStartThread(&idleOSThread);
} }

View File

@ -1,26 +1,20 @@
#include <guint.h> #include <guint.h>
// TODO find these values wherever they are in .rodata static const du P[] = {
// TODO these can't be defined in here yet because we strip out the .rodata for each object {0x3FF00000, 0x00000000},
//static const du P[5]; {0xBFC55554, 0xBC83656D},
{0x3F8110ED, 0x3804C2A0},
{0xBF29F6FF, 0xEEA56814},
{0x3EC5DBDF, 0x0E314BFE},
};
//static const du rpi; static const du rpi = {0x3FD45F30, 0x6DC9C883};
//static const du pihi; static const du pihi = {0x400921FB, 0x50000000};
//static const du pilo; static const du pilo = {0x3E6110B4, 0x611A6263};
//static const fu zero; static const fu zero = {0x00000000};
extern du P[5];
extern du rpi;
extern du pihi;
extern du pilo;
extern fu zero;
extern float __libm_qnan_f; extern float __libm_qnan_f;

View File

@ -211,7 +211,7 @@
0x800992F0:"boot_rodata_lookathil", 0x800992F0:"boot_rodata_lookathil",
0x80099300:"boot_rodata_xprintf", 0x80099300:"boot_rodata_xprintf",
0x80099400:"boot_rodata_cosf", 0x80099400:"boot_rodata_cosf",
0x80099450:"boot_rodata___libm_qnan_f", # XXX this not be from a file with any functions 0x80099450:"boot_rodata___libm_qnan_f", # XXX this might not be from a file with any functions
0x80099460:"boot_rodata_xldtob", 0x80099460:"boot_rodata_xldtob",
0x800994C0:"boot_rodata_llcvt", 0x800994C0:"boot_rodata_llcvt",
0x800994D0:"boot_rodata_build_date", 0x800994D0:"boot_rodata_build_date",