Moved rodata from C to GLOBAL_ASM in unknown_061D30

This commit is contained in:
David Benepe
2021-06-05 14:32:58 -05:00
parent af39526564
commit 24c825cc1c
4 changed files with 50 additions and 54 deletions
@@ -1,3 +1,8 @@
.late_rodata
glabel jpt_800E6CE0
.word L80063068, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L80062C38, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800630C0, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L8006319C, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800636E0, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L80063124, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L800637CC, L80063714
.text
glabel __CSPHandleMIDIMsg
/* 063700 80062B00 27BDFF28 */ addiu $sp, $sp, -0xd8
/* 063704 80062B04 AFBF003C */ sw $ra, 0x3c($sp)
@@ -77,12 +82,13 @@ glabel __CSPHandleMIDIMsg
/* 063814 80062C14 2DC10061 */ sltiu $at, $t6, 0x61
/* 063818 80062C18 102002EC */ beqz $at, .L800637CC
/* 06381C 80062C1C 000E7080 */ sll $t6, $t6, 2
/* 063820 80062C20 3C01800E */ lui $at, %hi(D_800E6CE0) # $at, 0x800e
/* 063820 80062C20 3C01800E */ lui $at, %hi(jpt_800E6CE0) # $at, 0x800e
/* 063824 80062C24 002E0821 */ addu $at, $at, $t6
/* 063828 80062C28 8C2E6CE0 */ lw $t6, %lo(D_800E6CE0)($at)
/* 063828 80062C28 8C2E6CE0 */ lw $t6, %lo(jpt_800E6CE0)($at)
/* 06382C 80062C2C 00000000 */ nop
/* 063830 80062C30 01C00008 */ jr $t6
/* 063834 80062C34 00000000 */ nop
glabel L80062C38
/* 063838 80062C38 1260010C */ beqz $s3, .L8006306C
/* 06383C 80062C3C 93A500CA */ lbu $a1, 0xca($sp)
/* 063840 80062C40 8E4F002C */ lw $t7, 0x2c($s2)
@@ -359,6 +365,7 @@ glabel __CSPHandleMIDIMsg
/* 063C5C 8006305C 00000000 */ nop
/* 063C60 80063060 100001DB */ b .L800637D0
/* 063C64 80063064 8FBF003C */ lw $ra, 0x3c($sp)
glabel L80063068
/* 063C68 80063068 93A500CA */ lbu $a1, 0xca($sp)
.L8006306C:
/* 063C6C 8006306C 02402025 */ move $a0, $s2
@@ -383,6 +390,7 @@ glabel __CSPHandleMIDIMsg
/* 063CB4 800630B4 26050004 */ addiu $a1, $s0, 4
/* 063CB8 800630B8 100001C5 */ b .L800637D0
/* 063CBC 800630BC 8FBF003C */ lw $ra, 0x3c($sp)
glabel L800630C0
/* 063CC0 800630C0 93A500CA */ lbu $a1, 0xca($sp)
/* 063CC4 800630C4 02402025 */ move $a0, $s2
/* 063CC8 800630C8 0C002A13 */ jal __lookupVoice
@@ -408,6 +416,7 @@ glabel __CSPHandleMIDIMsg
/* 063D18 80063118 00403825 */ move $a3, $v0
/* 063D1C 8006311C 100001AC */ b .L800637D0
/* 063D20 80063120 8FBF003C */ lw $ra, 0x3c($sp)
glabel L80063124
/* 063D24 80063124 8E500064 */ lw $s0, 0x64($s2)
/* 063D28 80063128 00000000 */ nop
/* 063D2C 8006312C 120001A8 */ beqz $s0, .L800637D0
@@ -440,6 +449,7 @@ glabel __CSPHandleMIDIMsg
/* 063D90 80063190 00000000 */ nop
/* 063D94 80063194 1000018E */ b .L800637D0
/* 063D98 80063198 8FBF003C */ lw $ra, 0x3c($sp)
glabel L8006319C
/* 063D9C 8006319C 93B100CA */ lbu $s1, 0xca($sp)
/* 063DA0 800631A0 24010007 */ li $at, 7
/* 063DA4 800631A4 1221002E */ beq $s1, $at, .L80063260
@@ -808,6 +818,7 @@ glabel __CSPHandleMIDIMsg
/* 0642D4 800636D4 00000000 */ nop
/* 0642D8 800636D8 1000003D */ b .L800637D0
/* 0642DC 800636DC 8FBF003C */ lw $ra, 0x3c($sp)
glabel L800636E0
/* 0642E0 800636E0 8E420020 */ lw $v0, 0x20($s2)
/* 0642E4 800636E4 93AF00CA */ lbu $t7, 0xca($sp)
/* 0642E8 800636E8 844C0000 */ lh $t4, ($v0)
@@ -821,6 +832,7 @@ glabel __CSPHandleMIDIMsg
/* 064308 80063708 02803025 */ move $a2, $s4
/* 06430C 8006370C 10000030 */ b .L800637D0
/* 064310 80063710 8FBF003C */ lw $ra, 0x3c($sp)
glabel L80063714
/* 064314 80063714 00071880 */ sll $v1, $a3, 2
/* 064318 80063718 8E4B0060 */ lw $t3, 0x60($s2)
/* 06431C 8006371C 00671821 */ addu $v1, $v1, $a3
@@ -871,6 +883,7 @@ glabel __CSPHandleMIDIMsg
/* 0643C4 800637C4 1600FFF0 */ bnez $s0, .L80063788
/* 0643C8 800637C8 00000000 */ nop
.L800637CC:
glabel L800637CC
/* 0643CC 800637CC 8FBF003C */ lw $ra, 0x3c($sp)
.L800637D0:
/* 0643D0 800637D0 8FB00028 */ lw $s0, 0x28($sp)
@@ -1,3 +1,8 @@
.late_rodata
glabel jpt_800E6C90
.word L80062A90, L80062AF0, L80062AA8, L80062AC0, L80062AF0, L80062AF0, L80062AF0, L80062AF0, L80062AF0, L80062AF0, L80062AF0, L80062AF0, L80062AF0, L80062AF0, L80062AF0, L80062AF0, L80062AF0, L80062AE8, L80062AE8, L80062AE8
.text
glabel __CSPHandleNextSeqEvent
/* 06363C 80062A3C 27BDFFC8 */ addiu $sp, $sp, -0x38
/* 063640 80062A40 AFBF001C */ sw $ra, 0x1c($sp)
@@ -14,24 +19,27 @@ glabel __CSPHandleNextSeqEvent
/* 06366C 80062A6C 2DE10014 */ sltiu $at, $t7, 0x14
/* 063670 80062A70 1020001F */ beqz $at, .L80062AF0
/* 063674 80062A74 000F7880 */ sll $t7, $t7, 2
/* 063678 80062A78 3C01800E */ lui $at, %hi(D_800E6C90) # $at, 0x800e
/* 063678 80062A78 3C01800E */ lui $at, %hi(jpt_800E6C90) # $at, 0x800e
/* 06367C 80062A7C 002F0821 */ addu $at, $at, $t7
/* 063680 80062A80 8C2F6C90 */ lw $t7, %lo(D_800E6C90)($at)
/* 063680 80062A80 8C2F6C90 */ lw $t7, %lo(jpt_800E6C90)($at)
/* 063684 80062A84 00000000 */ nop
/* 063688 80062A88 01E00008 */ jr $t7
/* 06368C 80062A8C 00000000 */ nop
glabel L80062A90
/* 063690 80062A90 0C018AC0 */ jal __CSPHandleMIDIMsg
/* 063694 80062A94 02002025 */ move $a0, $s0
/* 063698 80062A98 0C018A73 */ jal __CSPPostNextSeqEvent
/* 06369C 80062A9C 02002025 */ move $a0, $s0
/* 0636A0 80062AA0 10000014 */ b .L80062AF4
/* 0636A4 80062AA4 8FBF001C */ lw $ra, 0x1c($sp)
glabel L80062AA8
/* 0636A8 80062AA8 0C018DFB */ jal __CSPHandleMetaMsg
/* 0636AC 80062AAC 02002025 */ move $a0, $s0
/* 0636B0 80062AB0 0C018A73 */ jal __CSPPostNextSeqEvent
/* 0636B4 80062AB4 02002025 */ move $a0, $s0
/* 0636B8 80062AB8 1000000E */ b .L80062AF4
/* 0636BC 80062ABC 8FBF001C */ lw $ra, 0x1c($sp)
glabel L80062AC0
/* 0636C0 80062AC0 24180002 */ li $t8, 2
/* 0636C4 80062AC4 AE18002C */ sw $t8, 0x2c($s0)
/* 0636C8 80062AC8 24190010 */ li $t9, 16
@@ -42,9 +50,11 @@ glabel __CSPHandleNextSeqEvent
/* 0636DC 80062ADC 26040048 */ addiu $a0, $s0, 0x48
/* 0636E0 80062AE0 10000004 */ b .L80062AF4
/* 0636E4 80062AE4 8FBF001C */ lw $ra, 0x1c($sp)
glabel L80062AE8
/* 0636E8 80062AE8 0C018A73 */ jal __CSPPostNextSeqEvent
/* 0636EC 80062AEC 02002025 */ move $a0, $s0
.L80062AF0:
glabel L80062AF0
/* 0636F0 80062AF0 8FBF001C */ lw $ra, 0x1c($sp)
.L80062AF4:
/* 0636F4 80062AF4 8FB00018 */ lw $s0, 0x18($sp)
@@ -1,3 +1,8 @@
.late_rodata
glabel jpt_800E6C30
.word L8006247C, L80062978, L800626F8, L80062978, L80062978, L800624AC, L800624FC, L8006270C, L80062978, L8006248C, L80062720, L80062978, L80062924, L80062944, L80062968, L80062788, L800627AC, L80062880, L80062978, L80062978, L80062978, L800626F8, L80062564, L80062668
.text
glabel __CSPVoiceHandler
/* 063008 80062408 27BDFF80 */ addiu $sp, $sp, -0x80
/* 06300C 8006240C AFBE0038 */ sw $fp, 0x38($sp)
@@ -23,16 +28,18 @@ glabel __CSPVoiceHandler
/* 063058 80062458 2DE10018 */ sltiu $at, $t7, 0x18
/* 06305C 8006245C 10200146 */ beqz $at, .L80062978
/* 063060 80062460 000F7880 */ sll $t7, $t7, 2
/* 063064 80062464 3C01800E */ lui $at, %hi(D_800E6C30) # $at, 0x800e
/* 063064 80062464 3C01800E */ lui $at, %hi(jpt_800E6C30) # $at, 0x800e
/* 063068 80062468 002F0821 */ addu $at, $at, $t7
/* 06306C 8006246C 8C2F6C30 */ lw $t7, %lo(D_800E6C30)($at)
/* 06306C 8006246C 8C2F6C30 */ lw $t7, %lo(jpt_800E6C30)($at)
/* 063070 80062470 00000000 */ nop
/* 063074 80062474 01E00008 */ jr $t7
/* 063078 80062478 00000000 */ nop
glabel L8006247C
/* 06307C 8006247C 0C018A8F */ jal __CSPHandleNextSeqEvent
/* 063080 80062480 02402025 */ move $a0, $s2
/* 063084 80062484 1000013D */ b .L8006297C
/* 063088 80062488 8FA50048 */ lw $a1, 0x48($sp)
glabel L8006248C
/* 06308C 8006248C 24180009 */ li $t8, 9
/* 063090 80062490 A7B8006C */ sh $t8, 0x6c($sp)
/* 063094 80062494 8E46005C */ lw $a2, 0x5c($s2)
@@ -41,6 +48,7 @@ glabel __CSPVoiceHandler
/* 0630A0 800624A0 03C02825 */ move $a1, $fp
/* 0630A4 800624A4 10000135 */ b .L8006297C
/* 0630A8 800624A8 8FA50048 */ lw $a1, 0x48($sp)
glabel L800624AC
/* 0630AC 800624AC 8E50003C */ lw $s0, 0x3c($s2)
/* 0630B0 800624B0 8E440014 */ lw $a0, 0x14($s2)
/* 0630B4 800624B4 0C03262C */ jal alSynStopVoice
@@ -62,6 +70,7 @@ glabel __CSPVoiceHandler
/* 0630F0 800624F0 02002825 */ move $a1, $s0
/* 0630F4 800624F4 10000121 */ b .L8006297C
/* 0630F8 800624F8 8FA50048 */ lw $a1, 0x48($sp)
glabel L800624FC
/* 0630FC 800624FC 8E50003C */ lw $s0, 0x3c($s2)
/* 063100 80062500 24090001 */ li $t1, 1
/* 063104 80062504 8E110010 */ lw $s1, 0x10($s0)
@@ -89,6 +98,7 @@ glabel __CSPVoiceHandler
/* 063158 80062558 02603825 */ move $a3, $s3
/* 06315C 8006255C 10000107 */ b .L8006297C
/* 063160 80062560 8FA50048 */ lw $a1, 0x48($sp)
glabel L80062564
/* 063164 80062564 8E540040 */ lw $s4, 0x40($s2)
/* 063168 80062568 8E590078 */ lw $t9, 0x78($s2)
/* 06316C 8006256C 8E51003C */ lw $s1, 0x3c($s2)
@@ -157,6 +167,7 @@ glabel __CSPVoiceHandler
/* 06325C 8006265C 02603025 */ move $a2, $s3
/* 063260 80062660 100000C6 */ b .L8006297C
/* 063264 80062664 8FA50048 */ lw $a1, 0x48($sp)
glabel L80062668
/* 063268 80062668 8E540040 */ lw $s4, 0x40($s2)
/* 06326C 8006266C 8E590078 */ lw $t9, 0x78($s2)
/* 063270 80062670 8E51003C */ lw $s1, 0x3c($s2)
@@ -193,16 +204,19 @@ glabel __CSPVoiceHandler
/* 0632EC 800626EC 02603025 */ move $a2, $s3
/* 0632F0 800626F0 100000A2 */ b .L8006297C
/* 0632F4 800626F4 8FA50048 */ lw $a1, 0x48($sp)
glabel L800626F8
/* 0632F8 800626F8 8FA50048 */ lw $a1, 0x48($sp)
/* 0632FC 800626FC 0C018AC0 */ jal __CSPHandleMIDIMsg
/* 063300 80062700 02402025 */ move $a0, $s2
/* 063304 80062704 1000009D */ b .L8006297C
/* 063308 80062708 8FA50048 */ lw $a1, 0x48($sp)
glabel L8006270C
/* 06330C 8006270C 8FA50048 */ lw $a1, 0x48($sp)
/* 063310 80062710 0C018DFB */ jal __CSPHandleMetaMsg
/* 063314 80062714 02402025 */ move $a0, $s2
/* 063318 80062718 10000098 */ b .L8006297C
/* 06331C 8006271C 8FA50048 */ lw $a1, 0x48($sp)
glabel L80062720
/* 063320 80062720 864E003C */ lh $t6, 0x3c($s2)
/* 063324 80062724 8E510064 */ lw $s1, 0x64($s2)
/* 063328 80062728 A64E0032 */ sh $t6, 0x32($s2)
@@ -230,6 +244,7 @@ glabel __CSPVoiceHandler
/* 06337C 8006277C 02202025 */ move $a0, $s1
/* 063380 80062780 1000007E */ b .L8006297C
/* 063384 80062784 8FA50048 */ lw $a1, 0x48($sp)
glabel L80062788
/* 063388 80062788 8E48002C */ lw $t0, 0x2c($s2)
/* 06338C 8006278C 24010001 */ li $at, 1
/* 063390 80062790 11010079 */ beq $t0, $at, .L80062978
@@ -239,6 +254,7 @@ glabel __CSPVoiceHandler
/* 0633A0 800627A0 02402025 */ move $a0, $s2
/* 0633A4 800627A4 10000075 */ b .L8006297C
/* 0633A8 800627A8 8FA50048 */ lw $a1, 0x48($sp)
glabel L800627AC
/* 0633AC 800627AC 8E59002C */ lw $t9, 0x2c($s2)
/* 0633B0 800627B0 24010002 */ li $at, 2
/* 0633B4 800627B4 17210070 */ bne $t9, $at, .L80062978
@@ -297,6 +313,7 @@ glabel __CSPVoiceHandler
.L80062878:
/* 063478 80062878 1000003F */ b .L80062978
/* 06347C 8006287C AE40002C */ sw $zero, 0x2c($s2)
glabel L80062880
/* 063480 80062880 8E59002C */ lw $t9, 0x2c($s2)
/* 063484 80062884 24010001 */ li $at, 1
/* 063488 80062888 1721003B */ bne $t9, $at, .L80062978
@@ -341,6 +358,7 @@ glabel __CSPVoiceHandler
/* 063518 80062918 03C02825 */ move $a1, $fp
/* 06351C 8006291C 10000017 */ b .L8006297C
/* 063520 80062920 8FA50048 */ lw $a1, 0x48($sp)
glabel L80062924
/* 063524 80062924 9250003C */ lbu $s0, 0x3c($s2)
/* 063528 80062928 8E4D0060 */ lw $t5, 0x60($s2)
/* 06352C 8006292C 02150019 */ multu $s0, $s5
@@ -349,6 +367,7 @@ glabel __CSPVoiceHandler
/* 063538 80062938 01AE7821 */ addu $t7, $t5, $t6
/* 06353C 8006293C 1000000E */ b .L80062978
/* 063540 80062940 A1EC0008 */ sb $t4, 8($t7)
glabel L80062944
/* 063544 80062944 8E58003C */ lw $t8, 0x3c($s2)
/* 063548 80062948 8E450020 */ lw $a1, 0x20($s2)
/* 06354C 8006294C AE580018 */ sw $t8, 0x18($s2)
@@ -358,11 +377,13 @@ glabel __CSPVoiceHandler
/* 06355C 8006295C 02402025 */ move $a0, $s2
/* 063560 80062960 10000006 */ b .L8006297C
/* 063564 80062964 8FA50048 */ lw $a1, 0x48($sp)
glabel L80062968
/* 063568 80062968 8E45003C */ lw $a1, 0x3c($s2)
/* 06356C 8006296C 02402025 */ move $a0, $s2
/* 063570 80062970 0C002B38 */ jal __initFromBank
/* 063574 80062974 AE450020 */ sw $a1, 0x20($s2)
.L80062978:
glabel L80062978
/* 063578 80062978 8FA50048 */ lw $a1, 0x48($sp)
.L8006297C:
/* 06357C 8006297C 0C0324B4 */ jal alEvtqNextEvent
-48
View File
@@ -8,54 +8,6 @@
const char D_800E6C20[] = "CSP: oh oh \n";
// Jump table in __CSPVoiceHandler
const u32 D_800E6C30[] = {
0x8006247C, 0x80062978, 0x800626F8, 0x80062978,
0x80062978, 0x800624AC, 0x800624FC, 0x8006270C,
0x80062978, 0x8006248C, 0x80062720, 0x80062978,
0x80062924, 0x80062944, 0x80062968, 0x80062788,
0x800627AC, 0x80062880, 0x80062978, 0x80062978,
0x80062978, 0x800626F8, 0x80062564, 0x80062668
};
// Jump table in __CSPHandleNextSeqEvent
const u32 D_800E6C90[] = {
0x80062A90, 0x80062AF0, 0x80062AA8, 0x80062AC0,
0x80062AF0, 0x80062AF0, 0x80062AF0, 0x80062AF0,
0x80062AF0, 0x80062AF0, 0x80062AF0, 0x80062AF0,
0x80062AF0, 0x80062AF0, 0x80062AF0, 0x80062AF0,
0x80062AF0, 0x80062AE8, 0x80062AE8, 0x80062AE8
};
// Jump table in __CSPHandleMIDIMsg
const u32 D_800E6CE0[] = {
0x80063068, 0x800637CC, 0x800637CC, 0x800637CC,
0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC,
0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC,
0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC,
0x80062C38, 0x800637CC, 0x800637CC, 0x800637CC,
0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC,
0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC,
0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC,
0x800630C0, 0x800637CC, 0x800637CC, 0x800637CC,
0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC,
0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC,
0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC,
0x8006319C, 0x800637CC, 0x800637CC, 0x800637CC,
0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC,
0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC,
0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC,
0x800636E0, 0x800637CC, 0x800637CC, 0x800637CC,
0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC,
0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC,
0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC,
0x80063124, 0x800637CC, 0x800637CC, 0x800637CC,
0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC,
0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC,
0x800637CC, 0x800637CC, 0x800637CC, 0x800637CC,
0x80063714
};
/*********************************/
GLOBAL_ASM("asm/non_matchings/unknown_061D30/alCSPNew.s")