PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor cleanups

This commit is contained in:
Phillip Stephens 2022-07-30 02:12:25 -07:00
parent 7107b307e2
commit 5bfa43d591
22 changed files with 206 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -123,6 +123,7 @@ $(BUILD_DIR)/src/Dolphin/os/OSReset.o: MWCC_VERSION := 1.2.5
$(BUILD_DIR)/src/Dolphin/os/OSReset.o: CFLAGS := $(CFLAGS_1.2)
$(BUILD_DIR)/src/Dolphin/dsp/dsp.o: MWCC_VERSION := 1.2.5
$(BUILD_DIR)/src/Dolphin/dsp/dsp.o: CFLAGS := $(CFLAGS_1.2)
$(BUILD_DIR)/src/Dolphin/dsp/dsp_debug.o: CFLAGS := $(CFLAGS_1.2)
$(BUILD_DIR)/src/musyx/seq_api.o: CFLAGS := $(CFLAGS_MUSYX)
$(BUILD_DIR)/src/musyx/synth_dbtab.o: CFLAGS := $(CFLAGS_MUSYX)
$(BUILD_DIR)/src/musyx/snd_service.o: CFLAGS := $(CFLAGS_MUSYX)

72
asm/Dolphin/card/CARDBios.s
View File

@ -1,8 +1,8 @@
.include "macros.inc"
.section .bss
.global lbl_80569A58
lbl_80569A58:
.global __CARDBlock
__CARDBlock:
.skip 0x220
.section .data, "wa"
@ -26,8 +26,8 @@ lbl_805A8BF0:
.section .sbss, "wa"
.balign 4
.global lbl_805A9BC8
lbl_805A9BC8:
.global __CARDEncode
__CARDEncode:
.skip 0x8
.section .text, "ax"
@ -46,8 +46,8 @@ __CARDExtHandler:
/* 803B7E8C 003B4DEC 93 A1 00 14 */ stw r29, 0x14(r1)
/* 803B7E90 003B4DF0 3B A3 00 00 */ addi r29, r3, 0
/* 803B7E94 003B4DF4 1C 9D 01 10 */ mulli r4, r29, 0x110
/* 803B7E98 003B4DF8 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803B7E9C 003B4DFC 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l
/* 803B7E98 003B4DF8 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803B7E9C 003B4DFC 38 03 9A 58 */ addi r0, r3, __CARDBlock@l
/* 803B7EA0 003B4E00 7F C0 22 14 */ add r30, r0, r4
/* 803B7EA4 003B4E04 80 1E 00 00 */ lwz r0, 0(r30)
/* 803B7EA8 003B4E08 2C 00 00 00 */ cmpwi r0, 0
@ -105,9 +105,9 @@ __CARDExiHandler:
/* 803B7F60 003B4EC0 3B E3 00 00 */ addi r31, r3, 0
/* 803B7F64 003B4EC4 1C 9F 01 10 */ mulli r4, r31, 0x110
/* 803B7F68 003B4EC8 93 C1 00 20 */ stw r30, 0x20(r1)
/* 803B7F6C 003B4ECC 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803B7F6C 003B4ECC 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803B7F70 003B4ED0 93 A1 00 1C */ stw r29, 0x1c(r1)
/* 803B7F74 003B4ED4 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l
/* 803B7F74 003B4ED4 38 03 9A 58 */ addi r0, r3, __CARDBlock@l
/* 803B7F78 003B4ED8 7F C0 22 14 */ add r30, r0, r4
/* 803B7F7C 003B4EDC 38 7E 00 E0 */ addi r3, r30, 0xe0
/* 803B7F80 003B4EE0 4B FC 64 75 */ bl OSCancelAlarm
@ -182,8 +182,8 @@ __CARDTxHandler:
/* 803B8070 003B4FD0 94 21 FF D8 */ stwu r1, -0x28(r1)
/* 803B8074 003B4FD4 BF 61 00 14 */ stmw r27, 0x14(r1)
/* 803B8078 003B4FD8 3B 63 00 00 */ addi r27, r3, 0
/* 803B807C 003B4FDC 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803B8080 003B4FE0 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l
/* 803B807C 003B4FDC 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803B8080 003B4FE0 38 03 9A 58 */ addi r0, r3, __CARDBlock@l
/* 803B8084 003B4FE4 1C 9B 01 10 */ mulli r4, r27, 0x110
/* 803B8088 003B4FE8 38 7B 00 00 */ addi r3, r27, 0
/* 803B808C 003B4FEC 7F A0 22 14 */ add r29, r0, r4
@ -233,8 +233,8 @@ __CARDUnlockedHandler:
/* 803B8120 003B5080 93 C1 00 10 */ stw r30, 0x10(r1)
/* 803B8124 003B5084 3B C3 00 00 */ addi r30, r3, 0
/* 803B8128 003B5088 1C 9E 01 10 */ mulli r4, r30, 0x110
/* 803B812C 003B508C 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803B8130 003B5090 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l
/* 803B812C 003B508C 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803B8130 003B5090 38 03 9A 58 */ addi r0, r3, __CARDBlock@l
/* 803B8134 003B5094 7C 60 22 14 */ add r3, r0, r4
/* 803B8138 003B5098 80 03 00 DC */ lwz r0, 0xdc(r3)
/* 803B813C 003B509C 28 00 00 00 */ cmplwi r0, 0
@ -437,9 +437,9 @@ lbl_803B83D8:
.global TimeoutHandler
TimeoutHandler:
/* 803B83F0 003B5350 7C 08 02 A6 */ mflr r0
/* 803B83F4 003B5354 3C 80 80 57 */ lis r4, lbl_80569A58@ha
/* 803B83F4 003B5354 3C 80 80 57 */ lis r4, __CARDBlock@ha
/* 803B83F8 003B5358 90 01 00 04 */ stw r0, 4(r1)
/* 803B83FC 003B535C 38 84 9A 58 */ addi r4, r4, lbl_80569A58@l
/* 803B83FC 003B535C 38 84 9A 58 */ addi r4, r4, __CARDBlock@l
/* 803B8400 003B5360 38 04 00 E0 */ addi r0, r4, 0xe0
/* 803B8404 003B5364 94 21 FF E8 */ stwu r1, -0x18(r1)
/* 803B8408 003B5368 7C 03 00 40 */ cmplw r3, r0
@ -490,8 +490,8 @@ Retry:
/* 803B84A8 003B5408 93 C1 00 10 */ stw r30, 0x10(r1)
/* 803B84AC 003B540C 3B C3 00 00 */ addi r30, r3, 0
/* 803B84B0 003B5410 1C 9E 01 10 */ mulli r4, r30, 0x110
/* 803B84B4 003B5414 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803B84B8 003B5418 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l
/* 803B84B4 003B5414 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803B84B8 003B5418 38 03 9A 58 */ addi r0, r3, __CARDBlock@l
/* 803B84BC 003B541C 7F E0 22 14 */ add r31, r0, r4
/* 803B84C0 003B5420 38 7E 00 00 */ addi r3, r30, 0
/* 803B84C4 003B5424 38 80 00 00 */ li r4, 0
@ -644,8 +644,8 @@ UnlockedCallback:
/* 803B86D4 003B5634 3B E3 00 00 */ addi r31, r3, 0
/* 803B86D8 003B5638 1C BF 01 10 */ mulli r5, r31, 0x110
/* 803B86DC 003B563C 93 C1 00 10 */ stw r30, 0x10(r1)
/* 803B86E0 003B5640 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803B86E4 003B5644 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l
/* 803B86E0 003B5640 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803B86E4 003B5644 38 03 9A 58 */ addi r0, r3, __CARDBlock@l
/* 803B86E8 003B5648 7F C0 2A 14 */ add r30, r0, r5
/* 803B86EC 003B564C 41 80 00 48 */ blt lbl_803B8734
/* 803B86F0 003B5650 3C 60 80 3C */ lis r3, UnlockedCallback@ha
@ -722,8 +722,8 @@ __CARDStart:
/* 803B87E8 003B5748 3B A5 00 00 */ addi r29, r5, 0
/* 803B87EC 003B574C 4B FC 8E 75 */ bl OSDisableInterrupts
/* 803B87F0 003B5750 1C BB 01 10 */ mulli r5, r27, 0x110
/* 803B87F4 003B5754 3C 80 80 57 */ lis r4, lbl_80569A58@ha
/* 803B87F8 003B5758 38 04 9A 58 */ addi r0, r4, lbl_80569A58@l
/* 803B87F4 003B5754 3C 80 80 57 */ lis r4, __CARDBlock@ha
/* 803B87F8 003B5758 38 04 9A 58 */ addi r0, r4, __CARDBlock@l
/* 803B87FC 003B575C 7F E0 2A 14 */ add r31, r0, r5
/* 803B8800 003B5760 80 1F 00 00 */ lwz r0, 0(r31)
/* 803B8804 003B5764 3B C3 00 00 */ addi r30, r3, 0
@ -843,8 +843,8 @@ __CARDReadSegment:
/* 803B8998 003B58F8 93 C1 00 10 */ stw r30, 0x10(r1)
/* 803B899C 003B58FC 3B C3 00 00 */ addi r30, r3, 0
/* 803B89A0 003B5900 1C BE 01 10 */ mulli r5, r30, 0x110
/* 803B89A4 003B5904 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803B89A8 003B5908 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l
/* 803B89A4 003B5904 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803B89A8 003B5908 38 03 9A 58 */ addi r0, r3, __CARDBlock@l
/* 803B89AC 003B590C 7F E0 2A 14 */ add r31, r0, r5
/* 803B89B0 003B5910 38 00 00 52 */ li r0, 0x52
/* 803B89B4 003B5914 98 1F 00 94 */ stb r0, 0x94(r31)
@ -928,8 +928,8 @@ __CARDWritePage:
/* 803B8AD0 003B5A30 93 C1 00 10 */ stw r30, 0x10(r1)
/* 803B8AD4 003B5A34 3B C3 00 00 */ addi r30, r3, 0
/* 803B8AD8 003B5A38 1C BE 01 10 */ mulli r5, r30, 0x110
/* 803B8ADC 003B5A3C 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803B8AE0 003B5A40 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l
/* 803B8ADC 003B5A3C 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803B8AE0 003B5A40 38 03 9A 58 */ addi r0, r3, __CARDBlock@l
/* 803B8AE4 003B5A44 7F E0 2A 14 */ add r31, r0, r5
/* 803B8AE8 003B5A48 38 00 00 F2 */ li r0, 0xf2
/* 803B8AEC 003B5A4C 98 1F 00 94 */ stb r0, 0x94(r31)
@ -1005,8 +1005,8 @@ __CARDEraseSector:
/* 803B8BE8 003B5B48 93 A1 00 1C */ stw r29, 0x1c(r1)
/* 803B8BEC 003B5B4C 3B A3 00 00 */ addi r29, r3, 0
/* 803B8BF0 003B5B50 1C DD 01 10 */ mulli r6, r29, 0x110
/* 803B8BF4 003B5B54 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803B8BF8 003B5B58 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l
/* 803B8BF4 003B5B54 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803B8BF8 003B5B58 38 03 9A 58 */ addi r0, r3, __CARDBlock@l
/* 803B8BFC 003B5B5C 7F E0 32 14 */ add r31, r0, r6
/* 803B8C00 003B5B60 38 00 00 F1 */ li r0, 0xf1
/* 803B8C04 003B5B64 98 1F 00 94 */ stb r0, 0x94(r31)
@ -1061,12 +1061,12 @@ lbl_803B8C94:
.global CARDInit
CARDInit:
/* 803B8CB4 003B5C14 7C 08 02 A6 */ mflr r0
/* 803B8CB8 003B5C18 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803B8CB8 003B5C18 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803B8CBC 003B5C1C 90 01 00 04 */ stw r0, 4(r1)
/* 803B8CC0 003B5C20 94 21 FF E8 */ stwu r1, -0x18(r1)
/* 803B8CC4 003B5C24 93 E1 00 14 */ stw r31, 0x14(r1)
/* 803B8CC8 003B5C28 93 C1 00 10 */ stw r30, 0x10(r1)
/* 803B8CCC 003B5C2C 3B C3 9A 58 */ addi r30, r3, lbl_80569A58@l
/* 803B8CCC 003B5C2C 3B C3 9A 58 */ addi r30, r3, __CARDBlock@l
/* 803B8CD0 003B5C30 93 A1 00 0C */ stw r29, 0xc(r1)
/* 803B8CD4 003B5C34 80 1E 01 0C */ lwz r0, 0x10c(r30)
/* 803B8CD8 003B5C38 28 00 00 00 */ cmplwi r0, 0
@ -1076,7 +1076,7 @@ CARDInit:
/* 803B8CE8 003B5C48 40 82 00 5C */ bne lbl_803B8D44
lbl_803B8CEC:
/* 803B8CEC 003B5C4C 4B FC 82 59 */ bl OSGetFontEncode
/* 803B8CF0 003B5C50 B0 6D B0 08 */ sth r3, lbl_805A9BC8@sda21(r13)
/* 803B8CF0 003B5C50 B0 6D B0 08 */ sth r3, __CARDEncode@sda21(r13)
/* 803B8CF4 003B5C54 80 6D A0 30 */ lwz r3, lbl_805A8BF0@sda21(r13)
/* 803B8CF8 003B5C58 4B FC 53 41 */ bl OSRegisterVersion
/* 803B8CFC 003B5C5C 4B FB 6D 09 */ bl DSPInit
@ -1109,14 +1109,14 @@ lbl_803B8D44:
.global __CARDGetFontEncode
__CARDGetFontEncode:
/* 803B8D60 003B5CC0 A0 6D B0 08 */ lhz r3, lbl_805A9BC8@sda21(r13)
/* 803B8D60 003B5CC0 A0 6D B0 08 */ lhz r3, __CARDEncode@sda21(r13)
/* 803B8D64 003B5CC4 4E 80 00 20 */ blr
.global __CARDSetDiskID
__CARDSetDiskID:
/* 803B8D68 003B5CC8 28 03 00 00 */ cmplwi r3, 0
/* 803B8D6C 003B5CCC 3C 80 80 57 */ lis r4, lbl_80569A58@ha
/* 803B8D70 003B5CD0 38 84 9A 58 */ addi r4, r4, lbl_80569A58@l
/* 803B8D6C 003B5CCC 3C 80 80 57 */ lis r4, __CARDBlock@ha
/* 803B8D70 003B5CD0 38 84 9A 58 */ addi r4, r4, __CARDBlock@l
/* 803B8D74 003B5CD4 41 82 00 0C */ beq lbl_803B8D80
/* 803B8D78 003B5CD8 7C 60 1B 78 */ mr r0, r3
/* 803B8D7C 003B5CDC 48 00 00 08 */ b lbl_803B8D84
@ -1139,10 +1139,10 @@ __CARDGetControlBlock:
/* 803B8DA4 003B5D04 1C C3 01 10 */ mulli r6, r3, 0x110
/* 803B8DA8 003B5D08 90 01 00 04 */ stw r0, 4(r1)
/* 803B8DAC 003B5D0C 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 803B8DB0 003B5D10 3C A0 80 57 */ lis r5, lbl_80569A58@ha
/* 803B8DB0 003B5D10 3C A0 80 57 */ lis r5, __CARDBlock@ha
/* 803B8DB4 003B5D14 2C 03 00 00 */ cmpwi r3, 0
/* 803B8DB8 003B5D18 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 803B8DBC 003B5D1C 38 05 9A 58 */ addi r0, r5, lbl_80569A58@l
/* 803B8DBC 003B5D1C 38 05 9A 58 */ addi r0, r5, __CARDBlock@l
/* 803B8DC0 003B5D20 93 C1 00 18 */ stw r30, 0x18(r1)
/* 803B8DC4 003B5D24 7F C0 32 14 */ add r30, r0, r6
/* 803B8DC8 003B5D28 93 A1 00 14 */ stw r29, 0x14(r1)
@ -1229,8 +1229,8 @@ lbl_803B8ECC:
/* 803B8ED0 003B5E30 4E 80 00 20 */ blr
lbl_803B8ED4:
/* 803B8ED4 003B5E34 1C 83 01 10 */ mulli r4, r3, 0x110
/* 803B8ED8 003B5E38 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803B8EDC 003B5E3C 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l
/* 803B8ED8 003B5E38 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803B8EDC 003B5E3C 38 03 9A 58 */ addi r0, r3, __CARDBlock@l
/* 803B8EE0 003B5E40 7C 60 22 14 */ add r3, r0, r4
/* 803B8EE4 003B5E44 80 63 00 04 */ lwz r3, 4(r3)
/* 803B8EE8 003B5E48 4E 80 00 20 */ blr

20
asm/Dolphin/card/CARDBlock.s
View File

@ -17,8 +17,8 @@ WriteCallback:
/* 803BA58C 003B74EC 93 A1 00 14 */ stw r29, 0x14(r1)
/* 803BA590 003B74F0 3B A3 00 00 */ addi r29, r3, 0
/* 803BA594 003B74F4 1C BD 01 10 */ mulli r5, r29, 0x110
/* 803BA598 003B74F8 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803BA59C 003B74FC 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l
/* 803BA598 003B74F8 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803BA59C 003B74FC 38 03 9A 58 */ addi r0, r3, __CARDBlock@l
/* 803BA5A0 003B7500 7F E0 2A 14 */ add r31, r0, r5
/* 803BA5A4 003B7504 41 80 00 48 */ blt lbl_803BA5EC
/* 803BA5A8 003B7508 80 7F 00 80 */ lwz r3, 0x80(r31)
@ -72,11 +72,11 @@ EraseCallback:
/* 803BA650 003B75B0 94 21 FF D8 */ stwu r1, -0x28(r1)
/* 803BA654 003B75B4 93 E1 00 24 */ stw r31, 0x24(r1)
/* 803BA658 003B75B8 3B E3 00 00 */ addi r31, r3, 0
/* 803BA65C 003B75BC 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803BA65C 003B75BC 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803BA660 003B75C0 93 C1 00 20 */ stw r30, 0x20(r1)
/* 803BA664 003B75C4 1C BF 01 10 */ mulli r5, r31, 0x110
/* 803BA668 003B75C8 93 A1 00 1C */ stw r29, 0x1c(r1)
/* 803BA66C 003B75CC 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l
/* 803BA66C 003B75CC 38 03 9A 58 */ addi r0, r3, __CARDBlock@l
/* 803BA670 003B75D0 7C 9D 23 79 */ or. r29, r4, r4
/* 803BA674 003B75D4 7F C0 2A 14 */ add r30, r0, r5
/* 803BA678 003B75D8 41 80 00 3C */ blt lbl_803BA6B4
@ -127,8 +127,8 @@ __CARDAllocBlock:
/* 803BA714 003B7674 1C E3 01 10 */ mulli r7, r3, 0x110
/* 803BA718 003B7678 90 01 00 04 */ stw r0, 4(r1)
/* 803BA71C 003B767C 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 803BA720 003B7680 3C C0 80 57 */ lis r6, lbl_80569A58@ha
/* 803BA724 003B7684 38 06 9A 58 */ addi r0, r6, lbl_80569A58@l
/* 803BA720 003B7680 3C C0 80 57 */ lis r6, __CARDBlock@ha
/* 803BA724 003B7684 38 06 9A 58 */ addi r0, r6, __CARDBlock@l
/* 803BA728 003B7688 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 803BA72C 003B768C 7D 20 3A 14 */ add r9, r0, r7
/* 803BA730 003B7690 93 C1 00 18 */ stw r30, 0x18(r1)
@ -209,9 +209,9 @@ __CARDFreeBlock:
/* 803BA828 003B7788 7C 08 02 A6 */ mflr r0
/* 803BA82C 003B778C 1C E3 01 10 */ mulli r7, r3, 0x110
/* 803BA830 003B7790 90 01 00 04 */ stw r0, 4(r1)
/* 803BA834 003B7794 3C C0 80 57 */ lis r6, lbl_80569A58@ha
/* 803BA834 003B7794 3C C0 80 57 */ lis r6, __CARDBlock@ha
/* 803BA838 003B7798 94 21 FF F8 */ stwu r1, -8(r1)
/* 803BA83C 003B779C 38 06 9A 58 */ addi r0, r6, lbl_80569A58@l
/* 803BA83C 003B779C 38 06 9A 58 */ addi r0, r6, __CARDBlock@l
/* 803BA840 003B77A0 7D 20 3A 14 */ add r9, r0, r7
/* 803BA844 003B77A4 80 09 00 00 */ lwz r0, 0(r9)
/* 803BA848 003B77A8 2C 00 00 00 */ cmpwi r0, 0
@ -269,9 +269,9 @@ __CARDUpdateFatBlock:
/* 803BA8F4 003B7854 A0 64 00 04 */ lhz r3, 4(r4)
/* 803BA8F8 003B7858 1C 9C 01 10 */ mulli r4, r28, 0x110
/* 803BA8FC 003B785C 38 03 00 01 */ addi r0, r3, 1
/* 803BA900 003B7860 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803BA900 003B7860 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803BA904 003B7864 B0 1D 00 04 */ sth r0, 4(r29)
/* 803BA908 003B7868 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l
/* 803BA908 003B7868 38 03 9A 58 */ addi r0, r3, __CARDBlock@l
/* 803BA90C 003B786C 7F E0 22 14 */ add r31, r0, r4
/* 803BA910 003B7870 38 7D 00 04 */ addi r3, r29, 4
/* 803BA914 003B7874 38 80 1F FC */ li r4, 0x1ffc

4
asm/Dolphin/card/CARDCheck.s
View File

@ -221,8 +221,8 @@ lbl_803BAEE4:
/* 803BAEE4 003B7E44 83 FB 00 0C */ lwz r31, 0xc(r27)
/* 803BAEE8 003B7E48 83 9B 00 10 */ lwz r28, 0x10(r27)
/* 803BAEEC 003B7E4C 4B FC 8C 45 */ bl __OSLockSramEx
/* 803BAEF0 003B7E50 3C 80 80 57 */ lis r4, lbl_80569A58@ha
/* 803BAEF4 003B7E54 38 04 9A 58 */ addi r0, r4, lbl_80569A58@l
/* 803BAEF0 003B7E50 3C 80 80 57 */ lis r4, __CARDBlock@ha
/* 803BAEF4 003B7E54 38 04 9A 58 */ addi r0, r4, __CARDBlock@l
/* 803BAEF8 003B7E58 3C 80 78 78 */ lis r4, 0x78787879@ha
/* 803BAEFC 003B7E5C 7C 00 D0 50 */ subf r0, r0, r26
/* 803BAF00 003B7E60 38 84 78 79 */ addi r4, r4, 0x78787879@l

4
asm/Dolphin/card/CARDCreate.s
View File

@ -8,9 +8,9 @@ CreateCallbackFat:
/* 803BD1C8 003BA128 94 21 FF D8 */ stwu r1, -0x28(r1)
/* 803BD1CC 003BA12C BF 61 00 14 */ stmw r27, 0x14(r1)
/* 803BD1D0 003BA130 3B 83 00 00 */ addi r28, r3, 0
/* 803BD1D4 003BA134 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803BD1D4 003BA134 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803BD1D8 003BA138 1C BC 01 10 */ mulli r5, r28, 0x110
/* 803BD1DC 003BA13C 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l
/* 803BD1DC 003BA13C 38 03 9A 58 */ addi r0, r3, __CARDBlock@l
/* 803BD1E0 003BA140 7F E0 2A 14 */ add r31, r0, r5
/* 803BD1E4 003BA144 83 BF 00 D0 */ lwz r29, 0xd0(r31)
/* 803BD1E8 003BA148 3B 60 00 00 */ li r27, 0

4
asm/Dolphin/card/CARDDelete.s
View File

@ -14,8 +14,8 @@ DeleteCallback:
/* 803BDC90 003BABF0 93 81 00 10 */ stw r28, 0x10(r1)
/* 803BDC94 003BABF4 3B 83 00 00 */ addi r28, r3, 0
/* 803BDC98 003BABF8 1C BC 01 10 */ mulli r5, r28, 0x110
/* 803BDC9C 003BABFC 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803BDCA0 003BAC00 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l
/* 803BDC9C 003BABFC 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803BDCA0 003BAC00 38 03 9A 58 */ addi r0, r3, __CARDBlock@l
/* 803BDCA4 003BAC04 7F E0 2A 14 */ add r31, r0, r5
/* 803BDCA8 003BAC08 83 DF 00 D0 */ lwz r30, 0xd0(r31)
/* 803BDCAC 003BAC0C 38 00 00 00 */ li r0, 0

12
asm/Dolphin/card/CARDDir.s
View File

@ -17,8 +17,8 @@ WriteCallback:
/* 803BA990 003B78F0 93 A1 00 14 */ stw r29, 0x14(r1)
/* 803BA994 003B78F4 3B A3 00 00 */ addi r29, r3, 0
/* 803BA998 003B78F8 1C BD 01 10 */ mulli r5, r29, 0x110
/* 803BA99C 003B78FC 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803BA9A0 003B7900 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l
/* 803BA99C 003B78FC 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803BA9A0 003B7900 38 03 9A 58 */ addi r0, r3, __CARDBlock@l
/* 803BA9A4 003B7904 7F E0 2A 14 */ add r31, r0, r5
/* 803BA9A8 003B7908 41 80 00 44 */ blt lbl_803BA9EC
/* 803BA9AC 003B790C 80 7F 00 80 */ lwz r3, 0x80(r31)
@ -72,11 +72,11 @@ EraseCallback:
/* 803BAA50 003B79B0 94 21 FF D8 */ stwu r1, -0x28(r1)
/* 803BAA54 003B79B4 93 E1 00 24 */ stw r31, 0x24(r1)
/* 803BAA58 003B79B8 3B E3 00 00 */ addi r31, r3, 0
/* 803BAA5C 003B79BC 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803BAA5C 003B79BC 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803BAA60 003B79C0 93 C1 00 20 */ stw r30, 0x20(r1)
/* 803BAA64 003B79C4 1C BF 01 10 */ mulli r5, r31, 0x110
/* 803BAA68 003B79C8 93 A1 00 1C */ stw r29, 0x1c(r1)
/* 803BAA6C 003B79CC 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l
/* 803BAA6C 003B79CC 38 03 9A 58 */ addi r0, r3, __CARDBlock@l
/* 803BAA70 003B79D0 7C 9D 23 79 */ or. r29, r4, r4
/* 803BAA74 003B79D4 7F C0 2A 14 */ add r30, r0, r5
/* 803BAA78 003B79D8 41 80 00 3C */ blt lbl_803BAAB4
@ -133,8 +133,8 @@ __CARDUpdateDir:
/* 803BAB2C 003B7A8C 93 81 00 18 */ stw r28, 0x18(r1)
/* 803BAB30 003B7A90 3B 83 00 00 */ addi r28, r3, 0
/* 803BAB34 003B7A94 1C BC 01 10 */ mulli r5, r28, 0x110
/* 803BAB38 003B7A98 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803BAB3C 003B7A9C 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l
/* 803BAB38 003B7A98 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803BAB3C 003B7A9C 38 03 9A 58 */ addi r0, r3, __CARDBlock@l
/* 803BAB40 003B7AA0 7F C0 2A 14 */ add r30, r0, r5
/* 803BAB44 003B7AA4 80 1E 00 00 */ lwz r0, 0(r30)
/* 803BAB48 003B7AA8 2C 00 00 00 */ cmpwi r0, 0

4
asm/Dolphin/card/CARDFormat.s
View File

@ -9,11 +9,11 @@ FormatCallback:
/* 803BC594 003B94F4 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 803BC598 003B94F8 93 C1 00 18 */ stw r30, 0x18(r1)
/* 803BC59C 003B94FC 3B C3 00 00 */ addi r30, r3, 0
/* 803BC5A0 003B9500 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803BC5A0 003B9500 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803BC5A4 003B9504 93 A1 00 14 */ stw r29, 0x14(r1)
/* 803BC5A8 003B9508 1C BE 01 10 */ mulli r5, r30, 0x110
/* 803BC5AC 003B950C 93 81 00 10 */ stw r28, 0x10(r1)
/* 803BC5B0 003B9510 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l
/* 803BC5B0 003B9510 38 03 9A 58 */ addi r0, r3, __CARDBlock@l
/* 803BC5B4 003B9514 7C 9C 23 79 */ or. r28, r4, r4
/* 803BC5B8 003B9518 7F E0 2A 14 */ add r31, r0, r5
/* 803BC5BC 003B951C 41 80 00 C4 */ blt lbl_803BC680

24
asm/Dolphin/card/CARDMount.s
View File

@ -119,8 +119,8 @@ lbl_803BBC0C:
/* 803BBC20 003B8B80 48 00 01 24 */ b lbl_803BBD44
lbl_803BBC24:
/* 803BBC24 003B8B84 1C 9B 01 10 */ mulli r4, r27, 0x110
/* 803BBC28 003B8B88 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803BBC2C 003B8B8C 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l
/* 803BBC28 003B8B88 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803BBC2C 003B8B8C 38 03 9A 58 */ addi r0, r3, __CARDBlock@l
/* 803BBC30 003B8B90 7F C0 22 14 */ add r30, r0, r4
/* 803BBC34 003B8B94 4B FC 5A 2D */ bl OSDisableInterrupts
/* 803BBC38 003B8B98 3B A3 00 00 */ addi r29, r3, 0
@ -220,8 +220,8 @@ DoMount:
/* 803BBD70 003B8CD0 3B A3 00 00 */ addi r29, r3, 0
/* 803BBD74 003B8CD4 1C 9D 01 10 */ mulli r4, r29, 0x110
/* 803BBD78 003B8CD8 93 81 00 20 */ stw r28, 0x20(r1)
/* 803BBD7C 003B8CDC 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803BBD80 003B8CE0 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l
/* 803BBD7C 003B8CDC 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803BBD80 003B8CE0 38 03 9A 58 */ addi r0, r3, __CARDBlock@l
/* 803BBD84 003B8CE4 7C 60 22 14 */ add r3, r0, r4
/* 803BBD88 003B8CE8 80 03 00 24 */ lwz r0, 0x24(r3)
/* 803BBD8C 003B8CEC 3B E3 00 00 */ addi r31, r3, 0
@ -505,8 +505,8 @@ __CARDMountCallback:
/* 803BC188 003B90E8 93 81 00 10 */ stw r28, 0x10(r1)
/* 803BC18C 003B90EC 3B 83 00 00 */ addi r28, r3, 0
/* 803BC190 003B90F0 1C BC 01 10 */ mulli r5, r28, 0x110
/* 803BC194 003B90F4 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803BC198 003B90F8 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l
/* 803BC194 003B90F4 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803BC198 003B90F8 38 03 9A 58 */ addi r0, r3, __CARDBlock@l
/* 803BC19C 003B90FC 7F E0 2A 14 */ add r31, r0, r5
/* 803BC1A0 003B9100 41 82 00 A8 */ beq lbl_803BC248
/* 803BC1A4 003B9104 40 80 00 10 */ bge lbl_803BC1B4
@ -605,8 +605,8 @@ lbl_803BC2D4:
/* 803BC2E8 003B9248 48 00 01 44 */ b lbl_803BC42C
lbl_803BC2EC:
/* 803BC2EC 003B924C 1C 9E 01 10 */ mulli r4, r30, 0x110
/* 803BC2F0 003B9250 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803BC2F4 003B9254 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l
/* 803BC2F0 003B9250 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803BC2F4 003B9254 38 03 9A 58 */ addi r0, r3, __CARDBlock@l
/* 803BC2F8 003B9258 7F E0 22 14 */ add r31, r0, r4
/* 803BC2FC 003B925C 4B FC 53 65 */ bl OSDisableInterrupts
/* 803BC300 003B9260 80 1F 00 04 */ lwz r0, 4(r31)
@ -709,8 +709,8 @@ DoUnmount:
/* 803BC45C 003B93BC 93 81 00 10 */ stw r28, 0x10(r1)
/* 803BC460 003B93C0 3B 83 00 00 */ addi r28, r3, 0
/* 803BC464 003B93C4 1C BC 01 10 */ mulli r5, r28, 0x110
/* 803BC468 003B93C8 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803BC46C 003B93CC 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l
/* 803BC468 003B93C8 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803BC46C 003B93CC 38 03 9A 58 */ addi r0, r3, __CARDBlock@l
/* 803BC470 003B93D0 7F E0 2A 14 */ add r31, r0, r5
/* 803BC474 003B93D4 4B FC 51 ED */ bl OSDisableInterrupts
/* 803BC478 003B93D8 80 1F 00 00 */ lwz r0, 0(r31)
@ -756,8 +756,8 @@ CARDUnmount:
/* 803BC508 003B9468 48 00 00 64 */ b lbl_803BC56C
lbl_803BC50C:
/* 803BC50C 003B946C 1C 9D 01 10 */ mulli r4, r29, 0x110
/* 803BC510 003B9470 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803BC514 003B9474 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l
/* 803BC510 003B9470 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803BC514 003B9474 38 03 9A 58 */ addi r0, r3, __CARDBlock@l
/* 803BC518 003B9478 7F C0 22 14 */ add r30, r0, r4
/* 803BC51C 003B947C 4B FC 51 45 */ bl OSDisableInterrupts
/* 803BC520 003B9480 80 1E 00 00 */ lwz r0, 0(r30)

16
asm/Dolphin/card/CARDRdwr.s
View File

@ -9,11 +9,11 @@ BlockReadCallback:
/* 803BA2F4 003B7254 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 803BA2F8 003B7258 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 803BA2FC 003B725C 3B E3 00 00 */ addi r31, r3, 0
/* 803BA300 003B7260 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803BA300 003B7260 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803BA304 003B7264 93 C1 00 18 */ stw r30, 0x18(r1)
/* 803BA308 003B7268 1C BF 01 10 */ mulli r5, r31, 0x110
/* 803BA30C 003B726C 93 A1 00 14 */ stw r29, 0x14(r1)
/* 803BA310 003B7270 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l
/* 803BA310 003B7270 38 03 9A 58 */ addi r0, r3, __CARDBlock@l
/* 803BA314 003B7274 7C 9D 23 79 */ or. r29, r4, r4
/* 803BA318 003B7278 7F C0 2A 14 */ add r30, r0, r5
/* 803BA31C 003B727C 41 80 00 50 */ blt lbl_803BA36C
@ -68,9 +68,9 @@ __CARDRead:
/* 803BA3C8 003B7328 7C 08 02 A6 */ mflr r0
/* 803BA3CC 003B732C 1D 23 01 10 */ mulli r9, r3, 0x110
/* 803BA3D0 003B7330 90 01 00 04 */ stw r0, 4(r1)
/* 803BA3D4 003B7334 3D 00 80 57 */ lis r8, lbl_80569A58@ha
/* 803BA3D4 003B7334 3D 00 80 57 */ lis r8, __CARDBlock@ha
/* 803BA3D8 003B7338 94 21 FF F8 */ stwu r1, -8(r1)
/* 803BA3DC 003B733C 38 08 9A 58 */ addi r0, r8, lbl_80569A58@l
/* 803BA3DC 003B733C 38 08 9A 58 */ addi r0, r8, __CARDBlock@l
/* 803BA3E0 003B7340 7D 00 4A 14 */ add r8, r0, r9
/* 803BA3E4 003B7344 80 08 00 00 */ lwz r0, 0(r8)
/* 803BA3E8 003B7348 2C 00 00 00 */ cmpwi r0, 0
@ -100,11 +100,11 @@ BlockWriteCallback:
/* 803BA434 003B7394 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 803BA438 003B7398 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 803BA43C 003B739C 3B E3 00 00 */ addi r31, r3, 0
/* 803BA440 003B73A0 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803BA440 003B73A0 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803BA444 003B73A4 93 C1 00 18 */ stw r30, 0x18(r1)
/* 803BA448 003B73A8 1C BF 01 10 */ mulli r5, r31, 0x110
/* 803BA44C 003B73AC 93 A1 00 14 */ stw r29, 0x14(r1)
/* 803BA450 003B73B0 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l
/* 803BA450 003B73B0 38 03 9A 58 */ addi r0, r3, __CARDBlock@l
/* 803BA454 003B73B4 7C 9D 23 79 */ or. r29, r4, r4
/* 803BA458 003B73B8 7F C0 2A 14 */ add r30, r0, r5
/* 803BA45C 003B73BC 41 80 00 50 */ blt lbl_803BA4AC
@ -159,9 +159,9 @@ __CARDWrite:
/* 803BA508 003B7468 7C 08 02 A6 */ mflr r0
/* 803BA50C 003B746C 1D 23 01 10 */ mulli r9, r3, 0x110
/* 803BA510 003B7470 90 01 00 04 */ stw r0, 4(r1)
/* 803BA514 003B7474 3D 00 80 57 */ lis r8, lbl_80569A58@ha
/* 803BA514 003B7474 3D 00 80 57 */ lis r8, __CARDBlock@ha
/* 803BA518 003B7478 94 21 FF F8 */ stwu r1, -8(r1)
/* 803BA51C 003B747C 38 08 9A 58 */ addi r0, r8, lbl_80569A58@l
/* 803BA51C 003B747C 38 08 9A 58 */ addi r0, r8, __CARDBlock@l
/* 803BA520 003B7480 7D 00 4A 14 */ add r8, r0, r9
/* 803BA524 003B7484 80 08 00 00 */ lwz r0, 0(r8)
/* 803BA528 003B7488 2C 00 00 00 */ cmpwi r0, 0

4
asm/Dolphin/card/CARDRead.s
View File

@ -132,9 +132,9 @@ ReadCallback:
/* 803BD6D0 003BA630 94 21 FF D8 */ stwu r1, -0x28(r1)
/* 803BD6D4 003BA634 BF 61 00 14 */ stmw r27, 0x14(r1)
/* 803BD6D8 003BA638 3B A3 00 00 */ addi r29, r3, 0
/* 803BD6DC 003BA63C 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803BD6DC 003BA63C 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803BD6E0 003BA640 1C BD 01 10 */ mulli r5, r29, 0x110
/* 803BD6E4 003BA644 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l
/* 803BD6E4 003BA644 38 03 9A 58 */ addi r0, r3, __CARDBlock@l
/* 803BD6E8 003BA648 7C 9E 23 79 */ or. r30, r4, r4
/* 803BD6EC 003BA64C 7F E0 2A 14 */ add r31, r0, r5
/* 803BD6F0 003BA650 41 80 00 C8 */ blt lbl_803BD7B8

16
asm/Dolphin/card/CARDUnlock.s
View File

@ -216,8 +216,8 @@ ReadArrayUnlock:
/* 803B9200 003B6160 94 21 FF C0 */ stwu r1, -0x40(r1)
/* 803B9204 003B6164 BF 41 00 28 */ stmw r26, 0x28(r1)
/* 803B9208 003B6168 3B A3 00 00 */ addi r29, r3, 0
/* 803B920C 003B616C 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803B9210 003B6170 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l
/* 803B920C 003B616C 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803B9210 003B6170 38 03 9A 58 */ addi r0, r3, __CARDBlock@l
/* 803B9214 003B6174 1D 1D 01 10 */ mulli r8, r29, 0x110
/* 803B9218 003B6178 3B 44 00 00 */ addi r26, r4, 0
/* 803B921C 003B617C 3B C5 00 00 */ addi r30, r5, 0
@ -362,9 +362,9 @@ __CARDUnlock:
/* 803B9408 003B6368 94 21 FE E0 */ stwu r1, -0x120(r1)
/* 803B940C 003B636C BE C1 00 F8 */ stmw r22, 0xf8(r1)
/* 803B9410 003B6370 3B 03 00 00 */ addi r24, r3, 0
/* 803B9414 003B6374 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803B9414 003B6374 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803B9418 003B6378 1C B8 01 10 */ mulli r5, r24, 0x110
/* 803B941C 003B637C 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l
/* 803B941C 003B637C 38 03 9A 58 */ addi r0, r3, __CARDBlock@l
/* 803B9420 003B6380 7F E0 2A 14 */ add r31, r0, r5
/* 803B9424 003B6384 3A E4 00 00 */ addi r23, r4, 0
/* 803B9428 003B6388 3B DF 00 30 */ addi r30, r31, 0x30
@ -1105,9 +1105,9 @@ lbl_803B9F44:
.global InitCallback
InitCallback:
/* 803B9F58 003B6EB8 7C 08 02 A6 */ mflr r0
/* 803B9F5C 003B6EBC 3C 80 80 57 */ lis r4, lbl_80569A58@ha
/* 803B9F5C 003B6EBC 3C 80 80 57 */ lis r4, __CARDBlock@ha
/* 803B9F60 003B6EC0 90 01 00 04 */ stw r0, 4(r1)
/* 803B9F64 003B6EC4 38 84 9A 58 */ addi r4, r4, lbl_80569A58@l
/* 803B9F64 003B6EC4 38 84 9A 58 */ addi r4, r4, __CARDBlock@l
/* 803B9F68 003B6EC8 38 04 00 30 */ addi r0, r4, 0x30
/* 803B9F6C 003B6ECC 94 21 FF E8 */ stwu r1, -0x18(r1)
/* 803B9F70 003B6ED0 7C 00 18 40 */ cmplw r0, r3
@ -1139,9 +1139,9 @@ lbl_803B9FA8:
.global DoneCallback
DoneCallback:
/* 803B9FC8 003B6F28 7C 08 02 A6 */ mflr r0
/* 803B9FCC 003B6F2C 3C 80 80 57 */ lis r4, lbl_80569A58@ha
/* 803B9FCC 003B6F2C 3C 80 80 57 */ lis r4, __CARDBlock@ha
/* 803B9FD0 003B6F30 90 01 00 04 */ stw r0, 4(r1)
/* 803B9FD4 003B6F34 38 84 9A 58 */ addi r4, r4, lbl_80569A58@l
/* 803B9FD4 003B6F34 38 84 9A 58 */ addi r4, r4, __CARDBlock@l
/* 803B9FD8 003B6F38 38 04 00 30 */ addi r0, r4, 0x30
/* 803B9FDC 003B6F3C 94 21 FF 78 */ stwu r1, -0x88(r1)
/* 803B9FE0 003B6F40 7C 00 18 40 */ cmplw r0, r3

8
asm/Dolphin/card/CARDWrite.s
View File

@ -9,11 +9,11 @@ WriteCallback:
/* 803BD94C 003BA8AC 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 803BD950 003BA8B0 93 C1 00 18 */ stw r30, 0x18(r1)
/* 803BD954 003BA8B4 3B C3 00 00 */ addi r30, r3, 0
/* 803BD958 003BA8B8 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803BD958 003BA8B8 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803BD95C 003BA8BC 93 A1 00 14 */ stw r29, 0x14(r1)
/* 803BD960 003BA8C0 1C BE 01 10 */ mulli r5, r30, 0x110
/* 803BD964 003BA8C4 93 81 00 10 */ stw r28, 0x10(r1)
/* 803BD968 003BA8C8 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l
/* 803BD968 003BA8C8 38 03 9A 58 */ addi r0, r3, __CARDBlock@l
/* 803BD96C 003BA8CC 7C 9C 23 79 */ or. r28, r4, r4
/* 803BD970 003BA8D0 7F E0 2A 14 */ add r31, r0, r5
/* 803BD974 003BA8D4 41 80 00 F0 */ blt lbl_803BDA64
@ -114,8 +114,8 @@ EraseCallback:
/* 803BDACC 003BAA2C 93 81 00 10 */ stw r28, 0x10(r1)
/* 803BDAD0 003BAA30 3B 83 00 00 */ addi r28, r3, 0
/* 803BDAD4 003BAA34 1C BC 01 10 */ mulli r5, r28, 0x110
/* 803BDAD8 003BAA38 3C 60 80 57 */ lis r3, lbl_80569A58@ha
/* 803BDADC 003BAA3C 38 03 9A 58 */ addi r0, r3, lbl_80569A58@l
/* 803BDAD8 003BAA38 3C 60 80 57 */ lis r3, __CARDBlock@ha
/* 803BDADC 003BAA3C 38 03 9A 58 */ addi r0, r3, __CARDBlock@l
/* 803BDAE0 003BAA40 7F E0 2A 14 */ add r31, r0, r5
/* 803BDAE4 003BAA44 41 80 00 30 */ blt lbl_803BDB14
/* 803BDAE8 003BAA48 80 9F 00 C0 */ lwz r4, 0xc0(r31)

10
asm/Dolphin/db.s
View File

@ -1,9 +1,9 @@
.include "macros.inc"
.section .sbss
lbl_805A9740:
__DBInterface:
.skip 0x4
lbl_805A9744:
DBVerbose:
.skip 0x4
@ -19,12 +19,12 @@ DBInit:
/* 8036F8CC 0036C82C 3C 80 80 00 */ lis r4, 0x80000040@ha
/* 8036F8D0 0036C830 38 04 00 40 */ addi r0, r4, 0x80000040@l
/* 8036F8D4 0036C834 3C 60 80 37 */ lis r3, __DBExceptionDestination@ha
/* 8036F8D8 0036C838 90 0D AB 80 */ stw r0, lbl_805A9740@sda21(r13)
/* 8036F8D8 0036C838 90 0D AB 80 */ stw r0, __DBInterface@sda21(r13)
/* 8036F8DC 0036C83C 38 63 F9 3C */ addi r3, r3, __DBExceptionDestination@l
/* 8036F8E0 0036C840 3C 03 80 00 */ addis r0, r3, 0x8000
/* 8036F8E4 0036C844 90 04 00 48 */ stw r0, 0x48(r4)
/* 8036F8E8 0036C848 38 00 00 01 */ li r0, 1
/* 8036F8EC 0036C84C 90 0D AB 84 */ stw r0, lbl_805A9744@sda21(r13)
/* 8036F8EC 0036C84C 90 0D AB 84 */ stw r0, DBVerbose@sda21(r13)
/* 8036F8F0 0036C850 4E 80 00 20 */ blr
.global __DBExceptionDestinationAux
@ -57,7 +57,7 @@ __DBExceptionDestination:
.global __DBIsExceptionMarked
__DBIsExceptionMarked:
/* 8036F94C 0036C8AC 80 8D AB 80 */ lwz r4, lbl_805A9740@sda21(r13)
/* 8036F94C 0036C8AC 80 8D AB 80 */ lwz r4, __DBInterface@sda21(r13)
/* 8036F950 0036C8B0 54 60 06 3E */ clrlwi r0, r3, 0x18
/* 8036F954 0036C8B4 38 60 00 01 */ li r3, 1
/* 8036F958 0036C8B8 80 84 00 04 */ lwz r4, 4(r4)

8
asm/musyx/synth_ac.s
View File

@ -2,8 +2,8 @@
.section .data
.global toneup_map
toneup_map:
.global toneup_tab
toneup_tab:
# ROM: 0x3F0420
.float 1.0
.4byte 0x3F879C80
@ -332,9 +332,9 @@ lbl_803A914C:
/* 803A917C 003A60DC EC 20 08 28 */ fsubs f1, f0, f1
/* 803A9180 003A60E0 40 80 00 1C */ bge lbl_803A919C
/* 803A9184 003A60E4 7C 06 28 50 */ subf r0, r6, r5
/* 803A9188 003A60E8 3C 60 80 3F */ lis r3, toneup_map@ha
/* 803A9188 003A60E8 3C 60 80 3F */ lis r3, toneup_tab@ha
/* 803A918C 003A60EC 54 00 10 3A */ slwi r0, r0, 2
/* 803A9190 003A60F0 38 63 34 20 */ addi r3, r3, toneup_map@l
/* 803A9190 003A60F0 38 63 34 20 */ addi r3, r3, toneup_tab@l
/* 803A9194 003A60F4 7C 03 04 2E */ lfsx f0, r3, r0
/* 803A9198 003A60F8 48 00 00 18 */ b lbl_803A91B0
lbl_803A919C:

22
include/math_ppc.h Normal file
View File

@ -0,0 +1,22 @@
#ifndef _MATH_PPC_H_
#define _MATH_PPC_H_
inline float sqrtf(float x)
{
static const double _half=.5;
static const double _three=3.0;
volatile float y;
if(x > 0.0f)
{
double guess = __frsqrte((double)x); /* returns an approximation to */
guess = _half*guess*(_three - guess*guess*x); /* now have 12 sig bits */
guess = _half*guess*(_three - guess*guess*x); /* now have 24 sig bits */
guess = _half*guess*(_three - guess*guess*x); /* now have 32 sig bits */
y=(float)(x*guess);
return y ;
}
return x ;
}
#endif

12
include/musyx/musyx.h
View File

@ -137,6 +137,18 @@ void sndAuxCallbackReverbSTD(u8 reason,SND_AUX_INFO *info,void *user);
s32 sndAuxCallbackPrepareReverbSTD(SND_AUX_REVERBSTD* rev);
s32 sndAuxCallbackShutdownReverbSTD(SND_AUX_REVERBSTD* rev);
s32 sndAuxCallbackUpdateSettingsReverbSTD(SND_AUX_REVERBSTD* rev);
typedef struct SND_FVECTOR {
f32 x;
f32 y;
f32 z;
} SND_FVECTOR;
typedef struct SND_FMATRIX {
f32 m[3][3];
f32 t[3];
} SND_FMATRIX;
#ifdef __cplusplus
}
#endif

7
include/musyx/musyx_priv.h
View File

@ -29,6 +29,13 @@ void sndConvertTicks(u32* out, u32 seconds);
u32 sndConvert2Ms(u32 time);
extern SND_HOOKS salHooks;
/* Math */
void salApplyMatrix(const SND_FMATRIX* a, const SND_FVECTOR* b, SND_FVECTOR* out);
float salNormalizeVector(SND_FVECTOR* vec);
void salCrossProduct(SND_FVECTOR* out, const SND_FVECTOR* a, const SND_FVECTOR* b);
void salInvertMatrix(SND_FMATRIX* out, const SND_FMATRIX* in);
#ifdef __cplusplus
}
#endif

2
obj_files.mk
View File

@ -649,7 +649,7 @@ DB_FILES :=\
DSP_FILES :=\
$(BUILD_DIR)/asm/Dolphin/dsp/dsp.o\
$(BUILD_DIR)/asm/Dolphin/dsp/dsp_debug.o\
$(BUILD_DIR)/src/Dolphin/dsp/dsp_debug.o\
$(BUILD_DIR)/asm/Dolphin/dsp/dsp_task.o
DVD_FILES :=\

6
src/Dolphin/dsp/dsp_debug.c Normal file
View File

@ -0,0 +1,6 @@
#include "types.h"
void __DSP_debug_printf(const char* fmt, ...) {
//UNUSED(fmt);
}

27
src/musyx/snd_math.c Normal file
View File

@ -0,0 +1,27 @@
#include "musyx/musyx_priv.h"
#include "math_ppc.h"
void salApplyMatrix(const SND_FMATRIX* a, const SND_FVECTOR* b, SND_FVECTOR* out) {
out->x = a->t[0] + ((a->m[0][2] * b->z) + ((a->m[0][0] * b->x) + (a->m[0][1] * b->y)));
out->y = a->t[1] + ((a->m[1][2] * b->z) + ((a->m[1][0] * b->x) + (a->m[1][1] * b->y)));
out->z = a->t[2] + ((a->m[2][2] * b->z) + ((a->m[2][0] * b->x) + (a->m[2][1] * b->y)));
}
float salNormalizeVector(SND_FVECTOR* vec) {
float mag = sqrtf(vec->x * vec->x + vec->y * vec->y + vec->z * vec->z);
vec->x /= mag;
vec->y /= mag;
vec->z /= mag;
return mag;
}
void salCrossProduct(SND_FVECTOR* out, const SND_FVECTOR* a, const SND_FVECTOR* b) {
out->x = (a->y * b->z) - (a->z * b->y);
out->y = (a->z * b->x) - (a->x * b->z);
out->z = (a->x * b->y) - (a->y * b->x);
}
void salInvertMatrix(SND_FMATRIX* out, const SND_FMATRIX* in) {
}

22
src/musyx/synth_ac.c Normal file
View File

@ -0,0 +1,22 @@
#include "musyx/musyx_priv.h"
s32 sndPitchUpOne(u16 note) {
return note * 1.059463f;
}
/* non-matching https://decomp.me/scratch/6pRdi */
u32 sndGetPitch(u8 a, u32 b) {
f32 var_f0;
u32 temp_r6;
if (arg1 == 0xFFFFFFFF) {
arg1 = 0x40005622;
}
temp_r6 = arg1 >> 0x18U;
if (arg0 == temp_r6) {
var_f0 = (f32) ((arg1 & 0xFFFFFF) * (temp_r6 < arg0 ? toneup_map[(arg0 - temp_r6)] : tonedown_tab[temp_r6 - arg0]));
} else {
var_f0 = (f32) (arg1 & 0xFFFFFF);
}
return (u32) ((4096.f * var_f0) / synthInfo.freq);
}