diff --git a/Makefile b/Makefile index ffb202c..e0745e8 100644 --- a/Makefile +++ b/Makefile @@ -94,7 +94,7 @@ endif MAKE = make CPPFLAGS += -fno-dollars-in-identifiers -P -LDFLAGS := --no-check-sections --accept-unknown-input-arch --emit-relocs +LDFLAGS := --no-check-sections --accept-unknown-input-arch --emit-relocs --whole-archive ifeq ($(DETECTED_OS), macos) CPPFLAGS += -xc++ diff --git a/lib/ultralib/base/I_P/libultra_rom.txt b/lib/ultralib/base/I_P/libultra_rom.txt index 87f664e..dbe2510 100644 --- a/lib/ultralib/base/I_P/libultra_rom.txt +++ b/lib/ultralib/base/I_P/libultra_rom.txt @@ -96,7 +96,7 @@ getnextfaultthread.o initrdb.o rdbsend.o getmemsize.o -drvrNew.o +drvrnew.o load.o auxbus.o bnkf.o @@ -366,6 +366,14 @@ xlitob.o xldtob.o xprintf.o sprintf.o +gbpakcheckconnector.o +gbpakgetbank.o gbpakgetstatus.o +gbpakinit.o +gbpakpower.o +gbpakreadid.o +gbpakreadwrite.o +gbpaksetbank.o +afterprenmi.o syncprintf.o sched.o diff --git a/lib/ultralib/src/audio/synthInternals.h b/lib/ultralib/src/audio/synthInternals.h index c6c476c..871d71c 100644 --- a/lib/ultralib/src/audio/synthInternals.h +++ b/lib/ultralib/src/audio/synthInternals.h @@ -334,7 +334,7 @@ s32 _timeToSamples(ALSynth *ALSynth, s32 micros); ALMicroTime _samplesToTime(ALSynth *synth, s32 samples); // This was renamed to have a leading underscore in 2.0J -#if BUILD_VERSION < VERSION_J +#if BUILD_VERSION < VERSION_I_P #define _init_lpfilter init_lpfilter #endif diff --git a/lib/ultralib/src/io/cartrominit.c b/lib/ultralib/src/io/cartrominit.c index 87aa8bb..90ef68d 100644 --- a/lib/ultralib/src/io/cartrominit.c +++ b/lib/ultralib/src/io/cartrominit.c @@ -5,7 +5,7 @@ #include "PR/rcp.h" #include "piint.h" -#if BUILD_VERSION >= VERSION_J +#if BUILD_VERSION >= VERSION_I_P OSPiHandle __CartRomHandle ALIGNED(8); OSPiHandle* osCartRomInit(void) { u32 value = 0; diff --git a/lib/ultralib/src/io/driverominit.c b/lib/ultralib/src/io/driverominit.c index d73d349..aba3f38 100644 --- a/lib/ultralib/src/io/driverominit.c +++ b/lib/ultralib/src/io/driverominit.c @@ -2,6 +2,7 @@ #include "PR/rcp.h" #include "macros.h" +#if BUILD_VERSION != VERSION_I_P OSPiHandle DriveRomHandle ALIGNED(8); OSPiHandle *osDriveRomInit() { @@ -29,3 +30,4 @@ OSPiHandle *osDriveRomInit() { return &DriveRomHandle; } +#endif diff --git a/lib/ultralib/src/io/leodiskinit.c b/lib/ultralib/src/io/leodiskinit.c index e9f140b..72629d9 100644 --- a/lib/ultralib/src/io/leodiskinit.c +++ b/lib/ultralib/src/io/leodiskinit.c @@ -4,10 +4,11 @@ #include "PR/rcp.h" #include "macros.h" +#if BUILD_VERSION >= VERSION_J OSPiHandle LeoDiskHandle ALIGNED(8); OSPiHandle *__osDiskHandle; -OSPiHandle *osLeoDiskInit() { +OSPiHandle *osLeoDiskInit(void) { u32 saveMask; LeoDiskHandle.type = DEVICE_TYPE_64DD; @@ -34,3 +35,4 @@ OSPiHandle *osLeoDiskInit() { return &LeoDiskHandle; } +#endif diff --git a/lib/ultralib/src/io/leointerrupt.c b/lib/ultralib/src/io/leointerrupt.c index ad34e45..7b3f2ed 100644 --- a/lib/ultralib/src/io/leointerrupt.c +++ b/lib/ultralib/src/io/leointerrupt.c @@ -11,6 +11,8 @@ u8 leoDiskStack[OS_PIM_STACKSIZE] ALIGNED(16); static void __osLeoAbnormalResume(void); static void __osLeoResume(void); +#if BUILD_VERSION >= VERSION_J + s32 __osLeoInterrupt() { u32 stat = 0; volatile u32 pi_stat; @@ -192,3 +194,5 @@ static void __osLeoResume(void) { __osEnqueueThread(&__osRunQueue, __osPopThread(&mq->mtqueue)); } } + +#endif diff --git a/linker_scripts/common_undef_syms.ld b/linker_scripts/common_undef_syms.ld index e69de29..3b48ae5 100644 --- a/linker_scripts/common_undef_syms.ld +++ b/linker_scripts/common_undef_syms.ld @@ -0,0 +1,13 @@ +EXTERN(__osSetCause); +EXTERN(_bzero); +EXTERN(alBnkfNew); +EXTERN(__osSetCause); +EXTERN(fsin); +EXTERN(alUnlink); +EXTERN(alLink); +EXTERN(alClose); +EXTERN(alInit); +EXTERN(_VirtualToPhysicalTask); +EXTERN(osSpTaskLoad); +EXTERN(osSpTaskStartGo); +EXTERN(osViModeMpalLpn1); diff --git a/linker_scripts/us/symbol_addrs.txt b/linker_scripts/us/symbol_addrs.txt index 44ec110..07868bd 100644 --- a/linker_scripts/us/symbol_addrs.txt +++ b/linker_scripts/us/symbol_addrs.txt @@ -124,7 +124,7 @@ osGbpakGetStatus = 0x8005DEA0; // defined:true osGbpakInit = 0x80059500; // defined:true osGbpakPower = 0x80058750; // defined:true osGbpakReadId = 0x80063350; // defined:true -osGbpakReadWrite = 0x80065910; // defined:true +osGbpakReadWrite = 0x80065910; osGetThreadPri = 0x8005E870; // defined:true osGetTime = 0x8005F150; // defined:true osJamMesg = 0x8005E640; // defined:true diff --git a/linker_scripts/us/unused_syms.ld b/linker_scripts/us/unused_syms.ld index e69de29..c226f65 100644 --- a/linker_scripts/us/unused_syms.ld +++ b/linker_scripts/us/unused_syms.ld @@ -0,0 +1,6 @@ +// Force the inclusion of unused archive files +EXTERN(osGetMemSize); +ASSERT(DEFINED(osGetMemSize), "Error: osGetMemSize was not linked"); + +EXTERN(guPositionF); +ASSERT(DEFINED(guPositionF), "Error: guPositionF was not linked"); diff --git a/src/libleo/driverominit.c b/src/libleo/driverominit.c index 565532f..c1609ee 100644 --- a/src/libleo/driverominit.c +++ b/src/libleo/driverominit.c @@ -4,7 +4,7 @@ void __osPiRelAccess(void); void __osPiGetAccess(void); -OSPiHandle __DriveRomHandle; +OSPiHandle DriveRomHandle; OSPiHandle* osDriveRomInit(void) { register s32 status; @@ -16,15 +16,15 @@ OSPiHandle* osDriveRomInit(void) { __osPiGetAccess(); if (!first) { __osPiRelAccess(); - return &__DriveRomHandle; + return &DriveRomHandle; } first = 0; - __DriveRomHandle.type = DEVICE_TYPE_BULK; - __DriveRomHandle.baseAddress = PHYS_TO_K1(PI_DOM1_ADDR1); - __DriveRomHandle.domain = PI_DOMAIN1; - __DriveRomHandle.speed = 0; - bzero(&__DriveRomHandle.transferInfo, sizeof(__OSTranxInfo)); + DriveRomHandle.type = DEVICE_TYPE_BULK; + DriveRomHandle.baseAddress = PHYS_TO_K1(PI_DOM1_ADDR1); + DriveRomHandle.domain = PI_DOMAIN1; + DriveRomHandle.speed = 0; + bzero(&DriveRomHandle.transferInfo, sizeof(__OSTranxInfo)); while (status = HW_REG(PI_STATUS_REG, u32), status & (PI_STATUS_IO_BUSY | PI_STATUS_DMA_BUSY)) {} @@ -40,12 +40,12 @@ OSPiHandle* osDriveRomInit(void) { HW_REG(PI_BSD_DOM1_RLS_REG, u32) = 3; HW_REG(PI_BSD_DOM1_PWD_REG, u32) = 0xff; - // Read the PI settings from DDROM and put it in __DriveRomHandle - value = HW_REG(__DriveRomHandle.baseAddress, u32); - __DriveRomHandle.latency = value & 0xFF; - __DriveRomHandle.pageSize = (value >> 0x10) & 0xF; - __DriveRomHandle.relDuration = (value >> 0x14) & 0xF; - __DriveRomHandle.pulse = (value >> 8) & 0xFF; + // Read the PI settings from DDROM and put it in DriveRomHandle + value = HW_REG(DriveRomHandle.baseAddress, u32); + DriveRomHandle.latency = value & 0xFF; + DriveRomHandle.pageSize = (value >> 0x10) & 0xF; + DriveRomHandle.relDuration = (value >> 0x14) & 0xF; + DriveRomHandle.pulse = (value >> 8) & 0xFF; // Put back the previous PI settings HW_REG(PI_BSD_DOM1_LAT_REG, u32) = latency; @@ -54,10 +54,10 @@ OSPiHandle* osDriveRomInit(void) { HW_REG(PI_BSD_DOM1_PWD_REG, u32) = pulse; saveMask = __osDisableInt(); - __DriveRomHandle.next = __osPiTable; - __osPiTable = &__DriveRomHandle; + DriveRomHandle.next = __osPiTable; + __osPiTable = &DriveRomHandle; __osRestoreInt(saveMask); __osPiRelAccess(); - return &__DriveRomHandle; + return &DriveRomHandle; } diff --git a/src/libleo/leodiskinit.c b/src/libleo/leodiskinit.c index eb77d93..7351c96 100644 --- a/src/libleo/leodiskinit.c +++ b/src/libleo/leodiskinit.c @@ -2,30 +2,29 @@ #include "PR/R4300.h" #include "libleo/internal.h" -extern OSPiHandle __LeoDiskHandle; +extern OSPiHandle LeoDiskHandle; extern OSPiHandle* __osDiskHandle; extern OSPiHandle* __osPiTable; OSPiHandle* osLeoDiskInit(void) { - u32 prevInt; + u32 saveMask; - __LeoDiskHandle.type = DEVICE_TYPE_64DD; - __LeoDiskHandle.baseAddress = PHYS_TO_K1(PI_DOM2_ADDR1); - __LeoDiskHandle.latency = 3; - __LeoDiskHandle.pulse = 6; - __LeoDiskHandle.pageSize = 6; - __LeoDiskHandle.relDuration = 2; - __LeoDiskHandle.domain = PI_DOMAIN2; - __LeoDiskHandle.speed = 0; + LeoDiskHandle.type = DEVICE_TYPE_64DD; + LeoDiskHandle.baseAddress = PHYS_TO_K1(PI_DOM2_ADDR1); + LeoDiskHandle.latency = 3; + LeoDiskHandle.pulse = 6; + LeoDiskHandle.pageSize = 6; + LeoDiskHandle.relDuration = 2; + LeoDiskHandle.domain = PI_DOMAIN2; + LeoDiskHandle.speed = 0; - bzero(&__LeoDiskHandle.transferInfo, sizeof(__OSTranxInfo)); - prevInt = __osDisableInt(); + bzero(&LeoDiskHandle.transferInfo, sizeof(__OSTranxInfo)); + + saveMask = __osDisableInt(); + LeoDiskHandle.next = __osPiTable; + __osPiTable = &LeoDiskHandle; + __osDiskHandle = &LeoDiskHandle; + __osRestoreInt(saveMask); - __LeoDiskHandle.next = __osPiTable; - __osPiTable = &__LeoDiskHandle; - __osDiskHandle = &__LeoDiskHandle; - - __osRestoreInt(prevInt); - - return &__LeoDiskHandle; + return &LeoDiskHandle; } diff --git a/src/unk_49190.s b/src/unk_49190.s new file mode 100644 index 0000000..b72cc2a --- /dev/null +++ b/src/unk_49190.s @@ -0,0 +1,426 @@ +.include "macro.inc" + +/* assembler directives */ +.set noat /* allow manual use of $at */ +.set noreorder /* don't insert nops after branches */ +.set gp=64 /* allow use of 64-bit general purpose registers */ + +.section .text, "ax" + +/* Generated by spimdisasm 1.28.0 */ + +/* Handwritten function */ +glabel func_80048590 +/* 049190 80048590 2481FFF9 */ addiu $at, $a0, -0x7 +/* 049194 80048594 1C20000D */ bgtz $at, .L800485CC +/* 049198 80048598 00000000 */ nop +/* 04919C 8004859C 03E00821 */ addu $at, $ra, $zero +/* 0491A0 800485A0 04100036 */ bltzal $zero, .L8004867C +/* 0491A4 800485A4 00000000 */ nop +/* 0491A8 800485A8 27EF00D4 */ addiu $t7, $ra, 0xD4 +/* 0491AC 800485AC 0020F821 */ addu $ra, $at, $zero +/* 0491B0 800485B0 01E47821 */ addu $t7, $t7, $a0 +/* 0491B4 800485B4 81E10000 */ lb $at, 0x0($t7) +/* 0491B8 800485B8 00000000 */ nop +/* 0491BC 800485BC 00014103 */ sra $t0, $at, 4 +/* 0491C0 800485C0 30290007 */ andi $t1, $at, 0x7 +/* 0491C4 800485C4 10000004 */ b .L800485D8 +/* 0491C8 800485C8 00000000 */ nop +.L800485CC: +/* 0491CC 800485CC 2488FFF8 */ addiu $t0, $a0, -0x8 +/* 0491D0 800485D0 000840C3 */ sra $t0, $t0, 3 +/* 0491D4 800485D4 30890007 */ andi $t1, $a0, 0x7 +.L800485D8: +/* 0491D8 800485D8 000962C0 */ sll $t4, $t1, 11 +/* 0491DC 800485DC 258C47FF */ addiu $t4, $t4, 0x47FF +/* 0491E0 800485E0 340A0006 */ ori $t2, $zero, 0x6 +/* 0491E4 800485E4 01485023 */ subu $t2, $t2, $t0 +/* 0491E8 800485E8 340B0001 */ ori $t3, $zero, 0x1 +/* 0491EC 800485EC 2541FFFF */ addiu $at, $t2, -0x1 +/* 0491F0 800485F0 002B5804 */ sllv $t3, $t3, $at +/* 0491F4 800485F4 340E000D */ ori $t6, $zero, 0xD +/* 0491F8 800485F8 00C0C021 */ addu $t8, $a2, $zero +.L800485FC: +/* 0491FC 800485FC 870D0000 */ lh $t5, 0x0($t8) +/* 049200 80048600 00000000 */ nop +/* 049204 80048604 000D6B40 */ sll $t5, $t5, 13 +/* 049208 80048608 25AD9000 */ addiu $t5, $t5, -0x7000 +/* 04920C 8004860C 01AC0018 */ mult $t5, $t4 +/* 049210 80048610 00006812 */ mflo $t5 +/* 049214 80048614 25AD4000 */ addiu $t5, $t5, 0x4000 +/* 049218 80048618 000D6BC3 */ sra $t5, $t5, 15 +/* 04921C 8004861C 01AB6821 */ addu $t5, $t5, $t3 +/* 049220 80048620 014D6807 */ srav $t5, $t5, $t2 +/* 049224 80048624 A70D0000 */ sh $t5, 0x0($t8) +/* 049228 80048628 25CEFFFF */ addiu $t6, $t6, -0x1 +/* 04922C 8004862C 1DC0FFF3 */ bgtz $t6, .L800485FC +/* 049230 80048630 27180002 */ addiu $t8, $t8, 0x2 +/* 049234 80048634 00E0C821 */ addu $t9, $a3, $zero +/* 049238 80048638 340E0028 */ ori $t6, $zero, 0x28 +.L8004863C: +/* 04923C 8004863C A7200000 */ sh $zero, 0x0($t9) +/* 049240 80048640 25CEFFFF */ addiu $t6, $t6, -0x1 +/* 049244 80048644 1DC0FFFD */ bgtz $t6, .L8004863C +/* 049248 80048648 27390002 */ addiu $t9, $t9, 0x2 +/* 04924C 8004864C 00E5C821 */ addu $t9, $a3, $a1 +/* 049250 80048650 0325C821 */ addu $t9, $t9, $a1 +/* 049254 80048654 00C0C021 */ addu $t8, $a2, $zero +/* 049258 80048658 340E000D */ ori $t6, $zero, 0xD +.L8004865C: +/* 04925C 8004865C 87010000 */ lh $at, 0x0($t8) +/* 049260 80048660 27180002 */ addiu $t8, $t8, 0x2 +/* 049264 80048664 A7210000 */ sh $at, 0x0($t9) +/* 049268 80048668 25CEFFFF */ addiu $t6, $t6, -0x1 +/* 04926C 8004866C 1DC0FFFB */ bgtz $t6, .L8004865C +/* 049270 80048670 27390006 */ addiu $t9, $t9, 0x6 +/* 049274 80048674 03E00008 */ jr $ra +/* 049278 80048678 00000000 */ nop +.L8004867C: +/* 04927C 8004867C C7D7E3E7 */ lwc1 $fs1f, -0x1C19($fp) +/* 049280 80048680 F1F3F5F7 */ scd $s3, -0xA09($t7) /* handwritten instruction */ + +glabel func_80048684 +/* 049284 80048684 848B0166 */ lh $t3, 0x166($a0) +/* 049288 80048688 24A1FFD8 */ addiu $at, $a1, -0x28 +/* 04928C 8004868C 04200005 */ bltz $at, .L800486A4 +/* 049290 80048690 00000000 */ nop +/* 049294 80048694 2421FFB0 */ addiu $at, $at, -0x50 +/* 049298 80048698 1C200002 */ bgtz $at, .L800486A4 +/* 04929C 8004869C 00000000 */ nop +/* 0492A0 800486A0 00A05821 */ addu $t3, $a1, $zero +.L800486A4: +/* 0492A4 800486A4 A48B0166 */ sh $t3, 0x166($a0) +/* 0492A8 800486A8 03E00821 */ addu $at, $ra, $zero +/* 0492AC 800486AC 04100022 */ bltzal $zero, .L80048738 +/* 0492B0 800486B0 00000000 */ nop +/* 0492B4 800486B4 27E80084 */ addiu $t0, $ra, 0x84 +/* 0492B8 800486B8 0020F821 */ addu $ra, $at, $zero +/* 0492BC 800486BC 01064021 */ addu $t0, $t0, $a2 +/* 0492C0 800486C0 01064021 */ addu $t0, $t0, $a2 +/* 0492C4 800486C4 95080000 */ lhu $t0, 0x0($t0) +/* 0492C8 800486C8 340A0077 */ ori $t2, $zero, 0x77 +/* 0492CC 800486CC 248D0000 */ addiu $t5, $a0, 0x0 +.L800486D0: +/* 0492D0 800486D0 95AC0050 */ lhu $t4, 0x50($t5) +/* 0492D4 800486D4 254AFFFF */ addiu $t2, $t2, -0x1 +/* 0492D8 800486D8 A5AC0000 */ sh $t4, 0x0($t5) +/* 0492DC 800486DC 0541FFFC */ bgez $t2, .L800486D0 +/* 0492E0 800486E0 25AD0002 */ addiu $t5, $t5, 0x2 +/* 0492E4 800486E4 340A0027 */ ori $t2, $zero, 0x27 +/* 0492E8 800486E8 248E0000 */ addiu $t6, $a0, 0x0 +/* 0492EC 800486EC 248D0000 */ addiu $t5, $a0, 0x0 +/* 0492F0 800486F0 01AB6823 */ subu $t5, $t5, $t3 +/* 0492F4 800486F4 01AB6823 */ subu $t5, $t5, $t3 +/* 0492F8 800486F8 00E07821 */ addu $t7, $a3, $zero +.L800486FC: +/* 0492FC 800486FC 85A900F0 */ lh $t1, 0xF0($t5) +/* 049300 80048700 25AD0002 */ addiu $t5, $t5, 0x2 +/* 049304 80048704 01280018 */ mult $t1, $t0 +/* 049308 80048708 00004812 */ mflo $t1 +/* 04930C 8004870C 25294000 */ addiu $t1, $t1, 0x4000 +/* 049310 80048710 00094BC3 */ sra $t1, $t1, 15 +/* 049314 80048714 85E10000 */ lh $at, 0x0($t7) +/* 049318 80048718 25EF0002 */ addiu $t7, $t7, 0x2 +/* 04931C 8004871C 01214821 */ addu $t1, $t1, $at +/* 049320 80048720 A5C900F0 */ sh $t1, 0xF0($t6) +/* 049324 80048724 25CE0002 */ addiu $t6, $t6, 0x2 +/* 049328 80048728 1D40FFF4 */ bgtz $t2, .L800486FC +/* 04932C 8004872C 254AFFFF */ addiu $t2, $t2, -0x1 +/* 049330 80048730 03E00008 */ jr $ra +/* 049334 80048734 00000000 */ nop +.L80048738: # these feel like deliberately invalid instructions. + # they decode to a branch from a delay slot, which + # cant possibly be valid. +/* 049338 80048738 0CCD2CCD */ .4byte 0x0CCD2CCD +/* 04933C 8004873C 53337FFF */ .4byte 0x53337FFF +.L80048740: +/* 049340 80048740 852A0000 */ lh $t2, 0x0($t1) +/* 049344 80048744 25290002 */ addiu $t1, $t1, 0x2 +/* 049348 80048748 00196C00 */ sll $t5, $t9, 16 +/* 04934C 8004874C 000D6C03 */ sra $t5, $t5, 16 +/* 049350 80048750 02ED0018 */ mult $s7, $t5 +/* 049354 80048754 00000812 */ mflo $at +/* 049358 80048758 24214000 */ addiu $at, $at, 0x4000 +/* 04935C 8004875C 00010BC3 */ sra $at, $at, 15 +/* 049360 80048760 01415023 */ subu $t2, $t2, $at +/* 049364 80048764 00196C03 */ sra $t5, $t9, 16 +/* 049368 80048768 02CD0018 */ mult $s6, $t5 +/* 04936C 8004876C 00000812 */ mflo $at +/* 049370 80048770 24214000 */ addiu $at, $at, 0x4000 +/* 049374 80048774 00010BC3 */ sra $at, $at, 15 +/* 049378 80048778 01415023 */ subu $t2, $t2, $at +/* 04937C 8004877C 01AA0018 */ mult $t5, $t2 +/* 049380 80048780 00000812 */ mflo $at +/* 049384 80048784 24214000 */ addiu $at, $at, 0x4000 +/* 049388 80048788 00010BC3 */ sra $at, $at, 15 +/* 04938C 8004878C 0036B821 */ addu $s7, $at, $s6 +/* 049390 80048790 00186C00 */ sll $t5, $t8, 16 +/* 049394 80048794 000D6C03 */ sra $t5, $t5, 16 +/* 049398 80048798 02AD0018 */ mult $s5, $t5 +/* 04939C 8004879C 00000812 */ mflo $at +/* 0493A0 800487A0 24214000 */ addiu $at, $at, 0x4000 +/* 0493A4 800487A4 00010BC3 */ sra $at, $at, 15 +/* 0493A8 800487A8 01415023 */ subu $t2, $t2, $at +/* 0493AC 800487AC 01AA0018 */ mult $t5, $t2 +/* 0493B0 800487B0 00000812 */ mflo $at +/* 0493B4 800487B4 24214000 */ addiu $at, $at, 0x4000 +/* 0493B8 800487B8 00010BC3 */ sra $at, $at, 15 +/* 0493BC 800487BC 0035B021 */ addu $s6, $at, $s5 +/* 0493C0 800487C0 00186C03 */ sra $t5, $t8, 16 +/* 0493C4 800487C4 028D0018 */ mult $s4, $t5 +/* 0493C8 800487C8 00000812 */ mflo $at +/* 0493CC 800487CC 24214000 */ addiu $at, $at, 0x4000 +/* 0493D0 800487D0 00010BC3 */ sra $at, $at, 15 +/* 0493D4 800487D4 01415023 */ subu $t2, $t2, $at +/* 0493D8 800487D8 01AA0018 */ mult $t5, $t2 +/* 0493DC 800487DC 00000812 */ mflo $at +/* 0493E0 800487E0 24214000 */ addiu $at, $at, 0x4000 +/* 0493E4 800487E4 00010BC3 */ sra $at, $at, 15 +/* 0493E8 800487E8 0034A821 */ addu $s5, $at, $s4 +/* 0493EC 800487EC 000F6C00 */ sll $t5, $t7, 16 +/* 0493F0 800487F0 000D6C03 */ sra $t5, $t5, 16 +/* 0493F4 800487F4 026D0018 */ mult $s3, $t5 +/* 0493F8 800487F8 00000812 */ mflo $at +/* 0493FC 800487FC 24214000 */ addiu $at, $at, 0x4000 +/* 049400 80048800 00010BC3 */ sra $at, $at, 15 +/* 049404 80048804 01415023 */ subu $t2, $t2, $at +/* 049408 80048808 01AA0018 */ mult $t5, $t2 +/* 04940C 8004880C 00000812 */ mflo $at +/* 049410 80048810 24214000 */ addiu $at, $at, 0x4000 +/* 049414 80048814 00010BC3 */ sra $at, $at, 15 +/* 049418 80048818 0033A021 */ addu $s4, $at, $s3 +/* 04941C 8004881C 000F6C03 */ sra $t5, $t7, 16 +/* 049420 80048820 024D0018 */ mult $s2, $t5 +/* 049424 80048824 00000812 */ mflo $at +/* 049428 80048828 24214000 */ addiu $at, $at, 0x4000 +/* 04942C 8004882C 00010BC3 */ sra $at, $at, 15 +/* 049430 80048830 01415023 */ subu $t2, $t2, $at +/* 049434 80048834 01AA0018 */ mult $t5, $t2 +/* 049438 80048838 00000812 */ mflo $at +/* 04943C 8004883C 24214000 */ addiu $at, $at, 0x4000 +/* 049440 80048840 00010BC3 */ sra $at, $at, 15 +/* 049444 80048844 00329821 */ addu $s3, $at, $s2 +/* 049448 80048848 000E6C00 */ sll $t5, $t6, 16 +/* 04944C 8004884C 000D6C03 */ sra $t5, $t5, 16 +/* 049450 80048850 022D0018 */ mult $s1, $t5 +/* 049454 80048854 00000812 */ mflo $at +/* 049458 80048858 24214000 */ addiu $at, $at, 0x4000 +/* 04945C 8004885C 00010BC3 */ sra $at, $at, 15 +/* 049460 80048860 01415023 */ subu $t2, $t2, $at +/* 049464 80048864 01AA0018 */ mult $t5, $t2 +/* 049468 80048868 00000812 */ mflo $at +/* 04946C 8004886C 24214000 */ addiu $at, $at, 0x4000 +/* 049470 80048870 00010BC3 */ sra $at, $at, 15 +/* 049474 80048874 00319021 */ addu $s2, $at, $s1 +/* 049478 80048878 000E6C03 */ sra $t5, $t6, 16 +/* 04947C 8004887C 020D0018 */ mult $s0, $t5 +/* 049480 80048880 00000812 */ mflo $at +/* 049484 80048884 24214000 */ addiu $at, $at, 0x4000 +/* 049488 80048888 00010BC3 */ sra $at, $at, 15 +/* 04948C 8004888C 01415023 */ subu $t2, $t2, $at +/* 049490 80048890 01AA0018 */ mult $t5, $t2 +/* 049494 80048894 00000812 */ mflo $at +/* 049498 80048898 24214000 */ addiu $at, $at, 0x4000 +/* 04949C 8004889C 00010BC3 */ sra $at, $at, 15 +/* 0494A0 800488A0 00308821 */ addu $s1, $at, $s0 +/* 0494A4 800488A4 01408021 */ addu $s0, $t2, $zero +/* 0494A8 800488A8 34016E14 */ ori $at, $zero, 0x6E14 +/* 0494AC 800488AC 00270018 */ mult $at, $a3 +/* 0494B0 800488B0 00000812 */ mflo $at +/* 0494B4 800488B4 24214000 */ addiu $at, $at, 0x4000 +/* 0494B8 800488B8 00010BC3 */ sra $at, $at, 15 +/* 0494BC 800488BC 01415021 */ addu $t2, $t2, $at +/* 0494C0 800488C0 01403821 */ addu $a3, $t2, $zero +/* 0494C4 800488C4 000A5040 */ sll $t2, $t2, 1 +/* 0494C8 800488C8 000A0BC3 */ sra $at, $t2, 15 +/* 0494CC 800488CC 24210001 */ addiu $at, $at, 0x1 +/* 0494D0 800488D0 00010843 */ sra $at, $at, 1 +/* 0494D4 800488D4 10200004 */ beqz $at, .L800488E8 +/* 0494D8 800488D8 00000000 */ nop +/* 0494DC 800488DC 04200002 */ bltz $at, .L800488E8 +/* 0494E0 800488E0 240A8000 */ addiu $t2, $zero, -0x8000 +/* 0494E4 800488E4 240A7FFF */ addiu $t2, $zero, 0x7FFF +.L800488E8: +/* 0494E8 800488E8 314AFFF8 */ andi $t2, $t2, 0xFFF8 +/* 0494EC 800488EC A50A0000 */ sh $t2, 0x0($t0) +/* 0494F0 800488F0 25080002 */ addiu $t0, $t0, 0x2 +/* 0494F4 800488F4 1D60FF92 */ bgtz $t3, .L80048740 +/* 0494F8 800488F8 256BFFFF */ addiu $t3, $t3, -0x1 +/* 0494FC 800488FC 03E00008 */ jr $ra +/* 049500 80048900 00000000 */ nop + +/* Handwritten function */ +glabel func_80048904 +/* 049504 80048904 27BDFFBC */ addiu $sp, $sp, -0x44 +/* 049508 80048908 AFBF0000 */ sw $ra, 0x0($sp) +/* 04950C 8004890C AFA40004 */ sw $a0, 0x4($sp) +/* 049510 80048910 AFA50008 */ sw $a1, 0x8($sp) +/* 049514 80048914 AFA6000C */ sw $a2, 0xC($sp) +/* 049518 80048918 AFA70010 */ sw $a3, 0x10($sp) +/* 04951C 8004891C AFB00014 */ sw $s0, 0x14($sp) +/* 049520 80048920 AFB10018 */ sw $s1, 0x18($sp) +/* 049524 80048924 AFB2001C */ sw $s2, 0x1C($sp) +/* 049528 80048928 AFB30020 */ sw $s3, 0x20($sp) +/* 04952C 8004892C AFB40024 */ sw $s4, 0x24($sp) +/* 049530 80048930 AFB50028 */ sw $s5, 0x28($sp) +/* 049534 80048934 AFB6002C */ sw $s6, 0x2C($sp) +/* 049538 80048938 AFB70030 */ sw $s7, 0x30($sp) +/* 04953C 8004893C 24810140 */ addiu $at, $a0, 0x140 +/* 049540 80048940 8C300000 */ lw $s0, 0x0($at) +/* 049544 80048944 8C310004 */ lw $s1, 0x4($at) +/* 049548 80048948 8C320008 */ lw $s2, 0x8($at) +/* 04954C 8004894C 8C33000C */ lw $s3, 0xC($at) +/* 049550 80048950 8C340010 */ lw $s4, 0x10($at) +/* 049554 80048954 8C350014 */ lw $s5, 0x14($at) +/* 049558 80048958 8C360018 */ lw $s6, 0x18($at) +/* 04955C 8004895C 8C37001C */ lw $s7, 0x1C($at) +/* 049560 80048960 84870164 */ lh $a3, 0x164($a0) +/* 049564 80048964 04100065 */ bltzal $zero, .L80048AFC +/* 049568 80048968 00000000 */ nop +/* 04956C 8004896C 27EB0190 */ addiu $t3, $ra, 0x190 +/* 049570 80048970 04110039 */ bal .L80048A58 /* handwritten instruction */ +/* 049574 80048974 00000000 */ nop +/* 049578 80048978 24A90000 */ addiu $t1, $a1, 0x0 +/* 04957C 8004897C 24C80000 */ addiu $t0, $a2, 0x0 +/* 049580 80048980 0411FF6F */ bal .L80048740 /* handwritten instruction */ +/* 049584 80048984 340B000C */ ori $t3, $zero, 0xC +/* 049588 80048988 04100062 */ bltzal $zero, .L80048B14 +/* 04958C 8004898C 00000000 */ nop +/* 049590 80048990 27EB0184 */ addiu $t3, $ra, 0x184 +/* 049594 80048994 04110030 */ bal .L80048A58 /* handwritten instruction */ +/* 049598 80048998 00000000 */ nop +/* 04959C 8004899C 24A9001A */ addiu $t1, $a1, 0x1A +/* 0495A0 800489A0 24C8001A */ addiu $t0, $a2, 0x1A +/* 0495A4 800489A4 0411FF66 */ bal .L80048740 /* handwritten instruction */ +/* 0495A8 800489A8 340B000D */ ori $t3, $zero, 0xD +/* 0495AC 800489AC 0410005D */ bltzal $zero, .L80048B24 +/* 0495B0 800489B0 00000000 */ nop +/* 0495B4 800489B4 27EB0170 */ addiu $t3, $ra, 0x170 +/* 0495B8 800489B8 04110027 */ bal .L80048A58 /* handwritten instruction */ +/* 0495BC 800489BC 00000000 */ nop +/* 0495C0 800489C0 24A90036 */ addiu $t1, $a1, 0x36 +/* 0495C4 800489C4 24C80036 */ addiu $t0, $a2, 0x36 +/* 0495C8 800489C8 0411FF5D */ bal .L80048740 /* handwritten instruction */ +/* 0495CC 800489CC 340B000C */ ori $t3, $zero, 0xC +/* 0495D0 800489D0 0410005A */ bltzal $zero, .L80048B3C +/* 0495D4 800489D4 00000000 */ nop +/* 0495D8 800489D8 27EB0164 */ addiu $t3, $ra, 0x164 +/* 0495DC 800489DC 0411001E */ bal .L80048A58 /* handwritten instruction */ +/* 0495E0 800489E0 00000000 */ nop +/* 0495E4 800489E4 24A90050 */ addiu $t1, $a1, 0x50 +/* 0495E8 800489E8 24C80050 */ addiu $t0, $a2, 0x50 +/* 0495EC 800489EC 0411FF54 */ bal .L80048740 /* handwritten instruction */ +/* 0495F0 800489F0 340B0077 */ ori $t3, $zero, 0x77 +/* 0495F4 800489F4 24810140 */ addiu $at, $a0, 0x140 +/* 0495F8 800489F8 AC300000 */ sw $s0, 0x0($at) +/* 0495FC 800489FC AC310004 */ sw $s1, 0x4($at) +/* 049600 80048A00 AC320008 */ sw $s2, 0x8($at) +/* 049604 80048A04 AC33000C */ sw $s3, 0xC($at) +/* 049608 80048A08 AC340010 */ sw $s4, 0x10($at) +/* 04960C 80048A0C AC350014 */ sw $s5, 0x14($at) +/* 049610 80048A10 AC360018 */ sw $s6, 0x18($at) +/* 049614 80048A14 AC37001C */ sw $s7, 0x1C($at) +/* 049618 80048A18 A4870164 */ sh $a3, 0x164($a0) +/* 04961C 80048A1C 8FBF0000 */ lw $ra, 0x0($sp) +/* 049620 80048A20 8FA40004 */ lw $a0, 0x4($sp) +/* 049624 80048A24 8FA50008 */ lw $a1, 0x8($sp) +/* 049628 80048A28 8FA6000C */ lw $a2, 0xC($sp) +/* 04962C 80048A2C 8FA70010 */ lw $a3, 0x10($sp) +/* 049630 80048A30 8FB00014 */ lw $s0, 0x14($sp) +/* 049634 80048A34 8FB10018 */ lw $s1, 0x18($sp) +/* 049638 80048A38 8FB2001C */ lw $s2, 0x1C($sp) +/* 04963C 80048A3C 8FB30020 */ lw $s3, 0x20($sp) +/* 049640 80048A40 8FB40024 */ lw $s4, 0x24($sp) +/* 049644 80048A44 8FB50028 */ lw $s5, 0x28($sp) +/* 049648 80048A48 8FB6002C */ lw $s6, 0x2C($sp) +/* 04964C 80048A4C 8FB70030 */ lw $s7, 0x30($sp) +/* 049650 80048A50 03E00008 */ jr $ra +/* 049654 80048A54 27BD0044 */ addiu $sp, $sp, 0x44 +.L80048A58: +/* 049658 80048A58 84810188 */ lh $at, 0x188($a0) +/* 04965C 80048A5C 24880168 */ addiu $t0, $a0, 0x168 +/* 049660 80048A60 10200003 */ beqz $at, .L80048A70 +/* 049664 80048A64 25090010 */ addiu $t1, $t0, 0x10 +/* 049668 80048A68 01204021 */ addu $t0, $t1, $zero +/* 04966C 80048A6C 24890168 */ addiu $t1, $a0, 0x168 +.L80048A70: +/* 049670 80048A70 03E06821 */ addu $t5, $ra, $zero +/* 049674 80048A74 850A0000 */ lh $t2, 0x0($t0) +/* 049678 80048A78 0160F809 */ jalr $t3 +/* 04967C 80048A7C 852C0000 */ lh $t4, 0x0($t1) +/* 049680 80048A80 000A7400 */ sll $t6, $t2, 16 +/* 049684 80048A84 850A0002 */ lh $t2, 0x2($t0) +/* 049688 80048A88 0160F809 */ jalr $t3 +/* 04968C 80048A8C 852C0002 */ lh $t4, 0x2($t1) +/* 049690 80048A90 01CA7025 */ or $t6, $t6, $t2 +/* 049694 80048A94 850A0004 */ lh $t2, 0x4($t0) +/* 049698 80048A98 0160F809 */ jalr $t3 +/* 04969C 80048A9C 852C0004 */ lh $t4, 0x4($t1) +/* 0496A0 80048AA0 000A7C00 */ sll $t7, $t2, 16 +/* 0496A4 80048AA4 850A0006 */ lh $t2, 0x6($t0) +/* 0496A8 80048AA8 0160F809 */ jalr $t3 +/* 0496AC 80048AAC 852C0006 */ lh $t4, 0x6($t1) +/* 0496B0 80048AB0 01EA7825 */ or $t7, $t7, $t2 +/* 0496B4 80048AB4 850A0008 */ lh $t2, 0x8($t0) +/* 0496B8 80048AB8 0160F809 */ jalr $t3 +/* 0496BC 80048ABC 852C0008 */ lh $t4, 0x8($t1) +/* 0496C0 80048AC0 000AC400 */ sll $t8, $t2, 16 +/* 0496C4 80048AC4 850A000A */ lh $t2, 0xA($t0) +/* 0496C8 80048AC8 0160F809 */ jalr $t3 +/* 0496CC 80048ACC 852C000A */ lh $t4, 0xA($t1) +/* 0496D0 80048AD0 030AC025 */ or $t8, $t8, $t2 +/* 0496D4 80048AD4 850A000C */ lh $t2, 0xC($t0) +/* 0496D8 80048AD8 0160F809 */ jalr $t3 +/* 0496DC 80048ADC 852C000C */ lh $t4, 0xC($t1) +/* 0496E0 80048AE0 000ACC00 */ sll $t9, $t2, 16 +/* 0496E4 80048AE4 850A000E */ lh $t2, 0xE($t0) +/* 0496E8 80048AE8 0160F809 */ jalr $t3 +/* 0496EC 80048AEC 852C000E */ lh $t4, 0xE($t1) +/* 0496F0 80048AF0 01A0F821 */ addu $ra, $t5, $zero +/* 0496F4 80048AF4 03E00008 */ jr $ra +/* 0496F8 80048AF8 032AC825 */ or $t9, $t9, $t2 +.L80048AFC: +/* 0496FC 80048AFC 000A5083 */ sra $t2, $t2, 2 +/* 049700 80048B00 000C6043 */ sra $t4, $t4, 1 +/* 049704 80048B04 014C5021 */ addu $t2, $t2, $t4 +/* 049708 80048B08 000C6043 */ sra $t4, $t4, 1 +/* 04970C 80048B0C 1000000B */ b .L80048B3C +/* 049710 80048B10 014C5021 */ addu $t2, $t2, $t4 +.L80048B14: +/* 049714 80048B14 000A5043 */ sra $t2, $t2, 1 +/* 049718 80048B18 000C6043 */ sra $t4, $t4, 1 +/* 04971C 80048B1C 10000007 */ b .L80048B3C +/* 049720 80048B20 014C5021 */ addu $t2, $t2, $t4 +.L80048B24: +/* 049724 80048B24 000A5043 */ sra $t2, $t2, 1 +/* 049728 80048B28 000C6083 */ sra $t4, $t4, 2 +/* 04972C 80048B2C 018A6021 */ addu $t4, $t4, $t2 +/* 049730 80048B30 000A5043 */ sra $t2, $t2, 1 +/* 049734 80048B34 10000001 */ b .L80048B3C +/* 049738 80048B38 014C5021 */ addu $t2, $t2, $t4 +.L80048B3C: +/* 04973C 80048B3C 05410003 */ bgez $t2, .L80048B4C +/* 049740 80048B40 00006021 */ addu $t4, $zero, $zero +/* 049744 80048B44 000A5023 */ negu $t2, $t2 +/* 049748 80048B48 340C0001 */ ori $t4, $zero, 0x1 +.L80048B4C: +/* 04974C 80048B4C 2541D4CD */ addiu $at, $t2, -0x2B33 +/* 049750 80048B50 04200006 */ bltz $at, .L80048B6C +/* 049754 80048B54 000A0840 */ sll $at, $t2, 1 +/* 049758 80048B58 2541B19A */ addiu $at, $t2, -0x4E66 +/* 04975C 80048B5C 04200003 */ bltz $at, .L80048B6C +/* 049760 80048B60 25412B33 */ addiu $at, $t2, 0x2B33 +/* 049764 80048B64 000A0883 */ sra $at, $t2, 2 +/* 049768 80048B68 24216600 */ addiu $at, $at, 0x6600 +.L80048B6C: +/* 04976C 80048B6C 242A8001 */ addiu $t2, $at, -0x7FFF +/* 049770 80048B70 19400002 */ blez $t2, .L80048B7C +/* 049774 80048B74 00205021 */ addu $t2, $at, $zero +/* 049778 80048B78 340A7FFF */ ori $t2, $zero, 0x7FFF +.L80048B7C: +/* 04977C 80048B7C 15800002 */ bnez $t4, .L80048B88 +/* 049780 80048B80 000A5023 */ negu $t2, $t2 +/* 049784 80048B84 000A5023 */ negu $t2, $t2 +.L80048B88: +/* 049788 80048B88 03E00008 */ jr $ra +/* 04978C 80048B8C 314AFFFF */ andi $t2, $t2, 0xFFFF diff --git a/yamls/us/rom.yaml b/yamls/us/rom.yaml index 1ee024a..452f6e3 100644 --- a/yamls/us/rom.yaml +++ b/yamls/us/rom.yaml @@ -19,10 +19,10 @@ subsegments: - [0x1000, hasm, entry] # bootloader - [0x1060, c, main] # rsp graphics - - [0x11B0, pad] # There's an extra nop align here, but cant reproduce it with just splat functionality alone. need a . += 0x10 in the linker script at this spot. + - [0x11B0, pad] - [0x11C0, c, rsp] # rsp audio - [0x1A80, c, dma] # DMA transfer - - [0x1F70, pad] # Extra nop align like earlier. Weird + - [0x1F70, pad] - [0x1F80, c, dp_intro] # dp intro code - [0x28E0, c, memmap] - [0x2EC0, c, memory_main] # handles the main global pool @@ -92,7 +92,7 @@ - [0x485C0, c] # moves code - [0x48C60, c] # move effects code - [0x490A0, c] # audio functions to 0x50C00 - - [0x49190, hasm, code_49190] + - [0x49190, hasm, ../../src/unk_49190] - [0x49790, c] - [0x49BA0, c] - [0x49DC0, c] @@ -123,7 +123,7 @@ - [0x51BC0, c, libleo/readwrite] - [0x51C50, c, libleo/leofunc] - [0x520C0, c, libleo/leoint] - - [0x52AB0, pad] # again with the weird nop padding. + - [0x52AB0, pad] - [0x52AC0, c, libleo/leocmdex] - [0x53150, c, libleo/leoread] - [0x53310, c, libleo/lbatobyte] @@ -163,7 +163,7 @@ - [0x57610, lib, libultra, stopthread] - [0x576D0, lib, libultra, recvmesg] - [0x57810, lib, libultra, setintmask] - - [0x578B0, lib, libultra, dequeuethread] + - [0x578B0, lib, libultra, thread] - [0x578F0, lib, libultra, scale] - [0x57990, lib, libultra, sinf] - [0x57B50, lib, libultra, sl] @@ -226,7 +226,7 @@ - [0x5EDD0, lib, libultra, heapinit] - [0x5EE10, lib, libultra, syncprintf] - [0x5EE50, lib, libultra, string] - - [0x5EEF0, lib, libultra, invalidcache] + - [0x5EEF0, lib, libultra, invaldcache] - [0x5EFA0, lib, libultra, createmesgqueue] - [0x5EFD0, lib, libultra, invalicache] - [0x5F050, lib, libultra, conteeplongwrite] @@ -307,7 +307,7 @@ - [0x66460, lib, libultra, synallocfx] - [0x66500, lib, libultra, syndelete] - [0x66510, lib, libultra, gbpakreadwrite] - - [0x666D0, lib, libultra, gbpakselectbank] + - [0x666D0, lib, libultra, gbpaksetbank] - [0x667A0, lib, libultra, aisetnextbuf] - [0x66850, lib, libultra, ai] - [0x66880, lib, libultra, conteepread] @@ -346,6 +346,7 @@ - [0x7A2C0, lib, libultra, reverb, .data] - [0x7B460, lib, libultra, pimgr, .data] - [0x7B490, lib, libultra, vimodentsclpn1, .data] + - [0x7B4E0, lib, libultra, vimodempallpn1, .data] - [0x7B530, lib, libultra, contpfs, .data] - [0x7B540, lib, libultra, seteventmesg, .data] - [0x7B550, lib, libultra, random, .data] @@ -417,7 +418,7 @@ - [0x7EF60, lib, libultra, perspective, .rodata] - [0x7EF70, lib, libultra, devmgr, .rodata] - [0x7EF90, lib, libultra, xprintf, .rodata] - - [0x7F090, lib, libultra, rotateRPY, .rodata] + - [0x7F090, lib, libultra, rotaterpy, .rodata] - [0x7F0A0, lib, libultra, rotate, .rodata] - [0x7F0B0, lib, libultra, synthesizer, .rodata] - [0x7F0C0, lib, libultra, drvrnew, .rodata] @@ -465,7 +466,7 @@ - {type: lib, vram: 0x80102520, name: libultra, object: pimgr, section: .bss} - {type: lib, vram: 0x801036F0, name: libultra, object: contpfs, section: .bss} - {type: lib, vram: 0x801037F0, name: libultra, object: seteventmesg, section: .bss} - - {vram: 0x80103830, type: bss, name: unk_bss_9} + - {type: lib, vram: 0x80103830, name: libultra, object: rotaterpy, section: .bss} - {type: lib, vram: 0x80103880, name: libultra, object: rotate, section: .bss} - {type: lib, vram: 0x80103890, name: libultra, object: timerintr, section: .bss} - {type: lib, vram: 0x801038E4, name: libultra, object: cartrominit, section: .bss}