diff --git a/asm/non_matchings/code/graph/Graph_TaskSet00.s b/asm/non_matchings/code/graph/Graph_TaskSet00.s index aded95d750..96e386167f 100644 --- a/asm/non_matchings/code/graph/Graph_TaskSet00.s +++ b/asm/non_matchings/code/graph/Graph_TaskSet00.s @@ -139,7 +139,7 @@ glabel Graph_TaskSet00 /* B3D100 800C5F60 8E2502F0 */ lw $a1, 0x2f0($s1) .L800C5F64: /* B3D104 800C5F64 0C001A78 */ jal osGetTime -/* B3D108 800C5F68 00000000 */ nop +/* B3D108 800C5F68 00000000 */ nop /* B3D10C 800C5F6C 3C048017 */ lui $a0, %hi(D_8016A550) # $a0, 0x8017 /* B3D110 800C5F70 2484A550 */ addiu $a0, %lo(D_8016A550) # addiu $a0, $a0, -0x5ab0 /* B3D114 800C5F74 8C980000 */ lw $t8, ($a0) @@ -291,7 +291,7 @@ glabel Graph_TaskSet00 /* B3D350 800C61B0 0C000C18 */ jal osSendMesg /* B3D354 800C61B4 AE240058 */ sw $a0, 0x58($s1) /* B3D358 800C61B8 3C048016 */ lui $a0, %hi(gSchedContext) # $a0, 0x8016 -/* B3D35C 800C61BC 0C03257E */ jal func_800C95F8 +/* B3D35C 800C61BC 0C03257E */ jal Sched_SendEntryMsg /* B3D360 800C61C0 24846668 */ addiu $a0, %lo(gSchedContext) # addiu $a0, $a0, 0x6668 /* B3D364 800C61C4 8FBF002C */ lw $ra, 0x2c($sp) /* B3D368 800C61C8 8FB00024 */ lw $s0, 0x24($sp) diff --git a/asm/non_matchings/code/graph/Graph_Update.s b/asm/non_matchings/code/graph/Graph_Update.s index 1d2dbd4014..0d0ad5f0ea 100644 --- a/asm/non_matchings/code/graph/Graph_Update.s +++ b/asm/non_matchings/code/graph/Graph_Update.s @@ -445,23 +445,23 @@ glabel Graph_Update /* B3D838 800C6698 00000000 */ nop /* B3D83C 800C669C 0C001A78 */ jal osGetTime /* B3D840 800C66A0 00000000 */ nop -/* B3D844 800C66A4 3C048017 */ lui $a0, %hi(D_8016A568) # $a0, 0x8017 -/* B3D848 800C66A8 2484A568 */ addiu $a0, %lo(D_8016A568) # addiu $a0, $a0, -0x5a98 +/* B3D844 800C66A4 3C048017 */ lui $a0, %hi(gRSPGFXTotalTime) # $a0, 0x8017 +/* B3D848 800C66A8 2484A568 */ addiu $a0, %lo(gRSPGFXTotalTime) # addiu $a0, $a0, -0x5a98 /* B3D84C 800C66AC 8C8E0000 */ lw $t6, ($a0) /* B3D850 800C66B0 8C8F0004 */ lw $t7, 4($a0) /* B3D854 800C66B4 3C188017 */ lui $t8, %hi(D_8016A538) # $t8, 0x8017 /* B3D858 800C66B8 2718A538 */ addiu $t8, %lo(D_8016A538) # addiu $t8, $t8, -0x5ac8 -/* B3D85C 800C66BC 3C058017 */ lui $a1, %hi(D_8016A560) # $a1, 0x8017 +/* B3D85C 800C66BC 3C058017 */ lui $a1, %hi(gRSPAudioTotalTime) # $a1, 0x8017 /* B3D860 800C66C0 AF0E0000 */ sw $t6, ($t8) -/* B3D864 800C66C4 24A5A560 */ addiu $a1, %lo(D_8016A560) # addiu $a1, $a1, -0x5aa0 +/* B3D864 800C66C4 24A5A560 */ addiu $a1, %lo(gRSPAudioTotalTime) # addiu $a1, $a1, -0x5aa0 /* B3D868 800C66C8 AF0F0004 */ sw $t7, 4($t8) /* B3D86C 800C66CC 8CAA0000 */ lw $t2, ($a1) /* B3D870 800C66D0 8CAB0004 */ lw $t3, 4($a1) /* B3D874 800C66D4 3C198017 */ lui $t9, %hi(D_8016A530) # $t9, 0x8017 /* B3D878 800C66D8 2739A530 */ addiu $t9, %lo(D_8016A530) # addiu $t9, $t9, -0x5ad0 -/* B3D87C 800C66DC 3C068017 */ lui $a2, %hi(D_8016A580) # $a2, 0x8017 +/* B3D87C 800C66DC 3C068017 */ lui $a2, %hi(gRDPTotalTime) # $a2, 0x8017 /* B3D880 800C66E0 AF2A0000 */ sw $t2, ($t9) -/* B3D884 800C66E4 24C6A580 */ addiu $a2, %lo(D_8016A580) # addiu $a2, $a2, -0x5a80 +/* B3D884 800C66E4 24C6A580 */ addiu $a2, %lo(gRDPTotalTime) # addiu $a2, $a2, -0x5a80 /* B3D888 800C66E8 AF2B0004 */ sw $t3, 4($t9) /* B3D88C 800C66EC 8CCC0000 */ lw $t4, ($a2) /* B3D890 800C66F0 8CCD0004 */ lw $t5, 4($a2) diff --git a/asm/non_matchings/code/sched/func_800C8A94.s b/asm/non_matchings/code/sched/Sched_Schedule.s similarity index 96% rename from asm/non_matchings/code/sched/func_800C8A94.s rename to asm/non_matchings/code/sched/Sched_Schedule.s index f807891afe..a2ff9f8d64 100644 --- a/asm/non_matchings/code/sched/func_800C8A94.s +++ b/asm/non_matchings/code/sched/Sched_Schedule.s @@ -1,4 +1,4 @@ -glabel func_800C8A94 +glabel Sched_Schedule /* B3FC34 800C8A94 27BDFFD8 */ addiu $sp, $sp, -0x28 /* B3FC38 800C8A98 AFBF001C */ sw $ra, 0x1c($sp) /* B3FC3C 800C8A9C AFB00018 */ sw $s0, 0x18($sp) @@ -11,7 +11,7 @@ glabel func_800C8A94 /* B3FC58 800C8AB8 8C820220 */ lw $v0, 0x220($a0) /* B3FC5C 800C8ABC 30EF0002 */ andi $t7, $a3, 2 /* B3FC60 800C8AC0 11E0000B */ beqz $t7, .L800C8AF0 -/* B3FC64 800C8AC4 00000000 */ nop +/* B3FC64 800C8AC4 00000000 */ nop /* B3FC68 800C8AC8 ACA20000 */ sw $v0, ($a1) /* B3FC6C 800C8ACC 8C990220 */ lw $t9, 0x220($a0) /* B3FC70 800C8AD0 AC80023C */ sw $zero, 0x23c($a0) @@ -29,12 +29,12 @@ glabel func_800C8A94 /* B3FC9C 800C8AFC 30EE0002 */ andi $t6, $a3, 2 /* B3FCA0 800C8B00 314B0020 */ andi $t3, $t2, 0x20 /* B3FCA4 800C8B04 15600006 */ bnez $t3, .L800C8B20 -/* B3FCA8 800C8B08 00000000 */ nop +/* B3FCA8 800C8B08 00000000 */ nop /* B3FCAC 800C8B0C 8E0C0008 */ lw $t4, 8($s0) /* B3FCB0 800C8B10 24010003 */ li $at, 3 /* B3FCB4 800C8B14 318D0001 */ andi $t5, $t4, 1 /* B3FCB8 800C8B18 15A0000C */ bnez $t5, .L800C8B4C -/* B3FCBC 800C8B1C 00000000 */ nop +/* B3FCBC 800C8B1C 00000000 */ nop .L800C8B20: /* B3FCC0 800C8B20 11C00023 */ beqz $t6, .L800C8BB0 /* B3FCC4 800C8B24 8FAF002C */ lw $t7, 0x2c($sp) diff --git a/asm/non_matchings/code/sched/func_800C82A0.s b/asm/non_matchings/code/sched/func_800C82A0.s deleted file mode 100644 index 39ab4bc061..0000000000 --- a/asm/non_matchings/code/sched/func_800C82A0.s +++ /dev/null @@ -1,172 +0,0 @@ -.rdata -glabel D_80145D40 - .asciz "cfbinfo->swapbuffer" - .balign 4 - -glabel D_80145D54 - .asciz "../sched.c" - .balign 4 - -glabel D_80145D60 - .asciz "osViSwapBuffer %08x %08x %08x\n" - .balign 4 - -.text -glabel func_800C82A0 -/* B3F440 800C82A0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B3F444 800C82A4 AFA40028 */ sw $a0, 0x28($sp) -/* B3F448 800C82A8 8FAE0028 */ lw $t6, 0x28($sp) -/* B3F44C 800C82AC AFBF0014 */ sw $ra, 0x14($sp) -/* B3F450 800C82B0 3C048014 */ lui $a0, %hi(D_80145D40) # $a0, 0x8014 -/* B3F454 800C82B4 3C068014 */ lui $a2, %hi(D_80145D54) # $a2, 0x8014 -/* B3F458 800C82B8 24C65D54 */ addiu $a2, %lo(D_80145D54) # addiu $a2, $a2, 0x5d54 -/* B3F45C 800C82BC 24845D40 */ addiu $a0, %lo(D_80145D40) # addiu $a0, $a0, 0x5d40 -/* B3F460 800C82C0 24070154 */ li $a3, 340 -/* B3F464 800C82C4 0C000B68 */ jal LogUtils_CheckValidPointer -/* B3F468 800C82C8 8DC50004 */ lw $a1, 4($t6) -/* B3F46C 800C82CC 8FAF0028 */ lw $t7, 0x28($sp) -/* B3F470 800C82D0 8DE40004 */ lw $a0, 4($t7) -/* B3F474 800C82D4 5080007E */ beql $a0, $zero, .L800C84D0 -/* B3F478 800C82D8 8FAD0028 */ lw $t5, 0x28($sp) -/* B3F47C 800C82DC 0C0019A4 */ jal osViSwapBuffer -/* B3F480 800C82E0 00000000 */ nop -/* B3F484 800C82E4 8FA30028 */ lw $v1, 0x28($sp) -/* B3F488 800C82E8 3C198013 */ lui $t9, %hi(D_8012D290) # $t9, 0x8013 -/* B3F48C 800C82EC 2739D290 */ addiu $t9, %lo(D_8012D290) # addiu $t9, $t9, -0x2d70 -/* B3F490 800C82F0 80780011 */ lb $t8, 0x11($v1) -/* B3F494 800C82F4 A0780012 */ sb $t8, 0x12($v1) -/* B3F498 800C82F8 8F280000 */ lw $t0, ($t9) -/* B3F49C 800C82FC 51000011 */ beql $t0, $zero, .L800C8344 -/* B3F4A0 800C8300 8C620008 */ lw $v0, 8($v1) -/* B3F4A4 800C8304 0C0419D8 */ jal osViGetCurrentFramebuffer -/* B3F4A8 800C8308 00000000 */ nop -/* B3F4AC 800C830C 0C0011D0 */ jal osViGetNextFramebuffer -/* B3F4B0 800C8310 AFA20018 */ sw $v0, 0x18($sp) -/* B3F4B4 800C8314 8FA90028 */ lw $t1, 0x28($sp) -/* B3F4B8 800C8318 3C048014 */ lui $a0, %hi(D_80145D60) # $a0, 0x8014 -/* B3F4BC 800C831C 24845D60 */ addiu $a0, %lo(D_80145D60) # addiu $a0, $a0, 0x5d60 -/* B3F4C0 800C8320 11200003 */ beqz $t1, .L800C8330 -/* B3F4C4 800C8324 00403025 */ move $a2, $v0 -/* B3F4C8 800C8328 10000002 */ b .L800C8334 -/* B3F4CC 800C832C 8D270004 */ lw $a3, 4($t1) -.L800C8330: -/* B3F4D0 800C8330 00003825 */ move $a3, $zero -.L800C8334: -/* B3F4D4 800C8334 0C00084C */ jal osSyncPrintf -/* B3F4D8 800C8338 8FA50018 */ lw $a1, 0x18($sp) -/* B3F4DC 800C833C 8FA30028 */ lw $v1, 0x28($sp) -/* B3F4E0 800C8340 8C620008 */ lw $v0, 8($v1) -.L800C8344: -/* B3F4E4 800C8344 3C058013 */ lui $a1, %hi(gScreenWidth+2) # $a1, 0x8013 -/* B3F4E8 800C8348 24060010 */ li $a2, 16 -/* B3F4EC 800C834C 10400003 */ beqz $v0, .L800C835C -/* B3F4F0 800C8350 00000000 */ nop -/* B3F4F4 800C8354 10000002 */ b .L800C8360 -/* B3F4F8 800C8358 9445000A */ lhu $a1, 0xa($v0) -.L800C835C: -/* B3F4FC 800C835C 94A5D272 */ lhu $a1, %lo(gScreenWidth+2)($a1) -.L800C8360: -/* B3F500 800C8360 0C03590C */ jal Fault_SetFB -/* B3F504 800C8364 8C640004 */ lw $a0, 4($v1) -/* B3F508 800C8368 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B3F50C 800C836C 2442FA90 */ addiu $v0, %lo(gGameInfo) # addiu $v0, $v0, -0x570 -/* B3F510 800C8370 8C430000 */ lw $v1, ($v0) -/* B3F514 800C8374 2405000D */ li $a1, 13 -/* B3F518 800C8378 84641074 */ lh $a0, 0x1074($v1) -/* B3F51C 800C837C 14A40024 */ bne $a1, $a0, .L800C8410 -/* B3F520 800C8380 00000000 */ nop -/* B3F524 800C8384 846A1092 */ lh $t2, 0x1092($v1) -/* B3F528 800C8388 10AA0021 */ beq $a1, $t2, .L800C8410 -/* B3F52C 800C838C 00000000 */ nop -/* B3F530 800C8390 A4601076 */ sh $zero, 0x1076($v1) -/* B3F534 800C8394 8C4B0000 */ lw $t3, ($v0) -/* B3F538 800C8398 24060001 */ li $a2, 1 -/* B3F53C 800C839C A5601078 */ sh $zero, 0x1078($t3) -/* B3F540 800C83A0 8C4C0000 */ lw $t4, ($v0) -/* B3F544 800C83A4 A586107A */ sh $a2, 0x107a($t4) -/* B3F548 800C83A8 8C4D0000 */ lw $t5, ($v0) -/* B3F54C 800C83AC A5A0107C */ sh $zero, 0x107c($t5) -/* B3F550 800C83B0 8C4E0000 */ lw $t6, ($v0) -/* B3F554 800C83B4 A5C6107E */ sh $a2, 0x107e($t6) -/* B3F558 800C83B8 8C4F0000 */ lw $t7, ($v0) -/* B3F55C 800C83BC A5E01080 */ sh $zero, 0x1080($t7) -/* B3F560 800C83C0 8C580000 */ lw $t8, ($v0) -/* B3F564 800C83C4 A7001082 */ sh $zero, 0x1082($t8) -/* B3F568 800C83C8 8C590000 */ lw $t9, ($v0) -/* B3F56C 800C83CC A7201084 */ sh $zero, 0x1084($t9) -/* B3F570 800C83D0 8C480000 */ lw $t0, ($v0) -/* B3F574 800C83D4 A5001086 */ sh $zero, 0x1086($t0) -/* B3F578 800C83D8 8C490000 */ lw $t1, ($v0) -/* B3F57C 800C83DC A5201088 */ sh $zero, 0x1088($t1) -/* B3F580 800C83E0 8C4A0000 */ lw $t2, ($v0) -/* B3F584 800C83E4 A540108A */ sh $zero, 0x108a($t2) -/* B3F588 800C83E8 8C4B0000 */ lw $t3, ($v0) -/* B3F58C 800C83EC A560108C */ sh $zero, 0x108c($t3) -/* B3F590 800C83F0 8C4C0000 */ lw $t4, ($v0) -/* B3F594 800C83F4 A580108E */ sh $zero, 0x108e($t4) -/* B3F598 800C83F8 8C4D0000 */ lw $t5, ($v0) -/* B3F59C 800C83FC A5A01090 */ sh $zero, 0x1090($t5) -/* B3F5A0 800C8400 8C4E0000 */ lw $t6, ($v0) -/* B3F5A4 800C8404 A5C51092 */ sh $a1, 0x1092($t6) -/* B3F5A8 800C8408 8C430000 */ lw $v1, ($v0) -/* B3F5AC 800C840C 84641074 */ lh $a0, 0x1074($v1) -.L800C8410: -/* B3F5B0 800C8410 54A4002F */ bnel $a1, $a0, .L800C84D0 -/* B3F5B4 800C8414 8FAD0028 */ lw $t5, 0x28($sp) -/* B3F5B8 800C8418 846F1076 */ lh $t7, 0x1076($v1) -/* B3F5BC 800C841C 24010002 */ li $at, 2 -/* B3F5C0 800C8420 55E1002B */ bnel $t7, $at, .L800C84D0 -/* B3F5C4 800C8424 8FAD0028 */ lw $t5, 0x28($sp) -/* B3F5C8 800C8428 84781078 */ lh $t8, 0x1078($v1) -/* B3F5CC 800C842C 24070002 */ li $a3, 2 -/* B3F5D0 800C8430 13000003 */ beqz $t8, .L800C8440 -/* B3F5D4 800C8434 00000000 */ nop -/* B3F5D8 800C8438 10000001 */ b .L800C8440 -/* B3F5DC 800C843C 24070001 */ li $a3, 1 -.L800C8440: -/* B3F5E0 800C8440 0C001DEC */ jal osViSetSpecialFeatures -/* B3F5E4 800C8444 00E02025 */ move $a0, $a3 -/* B3F5E8 800C8448 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B3F5EC 800C844C 2442FA90 */ addiu $v0, %lo(gGameInfo) # addiu $v0, $v0, -0x570 -/* B3F5F0 800C8450 8C590000 */ lw $t9, ($v0) -/* B3F5F4 800C8454 24070080 */ li $a3, 128 -/* B3F5F8 800C8458 8728107A */ lh $t0, 0x107a($t9) -/* B3F5FC 800C845C 11000003 */ beqz $t0, .L800C846C -/* B3F600 800C8460 00000000 */ nop -/* B3F604 800C8464 10000001 */ b .L800C846C -/* B3F608 800C8468 24070040 */ li $a3, 64 -.L800C846C: -/* B3F60C 800C846C 0C001DEC */ jal osViSetSpecialFeatures -/* B3F610 800C8470 00E02025 */ move $a0, $a3 -/* B3F614 800C8474 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B3F618 800C8478 2442FA90 */ addiu $v0, %lo(gGameInfo) # addiu $v0, $v0, -0x570 -/* B3F61C 800C847C 8C490000 */ lw $t1, ($v0) -/* B3F620 800C8480 24070008 */ li $a3, 8 -/* B3F624 800C8484 852A107C */ lh $t2, 0x107c($t1) -/* B3F628 800C8488 11400003 */ beqz $t2, .L800C8498 -/* B3F62C 800C848C 00000000 */ nop -/* B3F630 800C8490 10000001 */ b .L800C8498 -/* B3F634 800C8494 24070004 */ li $a3, 4 -.L800C8498: -/* B3F638 800C8498 0C001DEC */ jal osViSetSpecialFeatures -/* B3F63C 800C849C 00E02025 */ move $a0, $a3 -/* B3F640 800C84A0 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B3F644 800C84A4 2442FA90 */ addiu $v0, %lo(gGameInfo) # addiu $v0, $v0, -0x570 -/* B3F648 800C84A8 8C4B0000 */ lw $t3, ($v0) -/* B3F64C 800C84AC 24070020 */ li $a3, 32 -/* B3F650 800C84B0 856C107E */ lh $t4, 0x107e($t3) -/* B3F654 800C84B4 11800003 */ beqz $t4, .L800C84C4 -/* B3F658 800C84B8 00000000 */ nop -/* B3F65C 800C84BC 10000001 */ b .L800C84C4 -/* B3F660 800C84C0 24070010 */ li $a3, 16 -.L800C84C4: -/* B3F664 800C84C4 0C001DEC */ jal osViSetSpecialFeatures -/* B3F668 800C84C8 00E02025 */ move $a0, $a3 -/* B3F66C 800C84CC 8FAD0028 */ lw $t5, 0x28($sp) -.L800C84D0: -/* B3F670 800C84D0 A1A00010 */ sb $zero, 0x10($t5) -/* B3F674 800C84D4 8FBF0014 */ lw $ra, 0x14($sp) -/* B3F678 800C84D8 27BD0028 */ addiu $sp, $sp, 0x28 -/* B3F67C 800C84DC 03E00008 */ jr $ra -/* B3F680 800C84E0 00000000 */ nop - diff --git a/asm/non_matchings/code/sched/func_800C8534.s b/asm/non_matchings/code/sched/func_800C8534.s deleted file mode 100644 index d1e4c177ef..0000000000 --- a/asm/non_matchings/code/sched/func_800C8534.s +++ /dev/null @@ -1,198 +0,0 @@ -.rdata -glabel D_80145D80 - .asciz "../sched.c" - .balign 4 - -glabel D_80145D8C - .asciz "(((u64)(now - audio_rsp_start_time)*(1000000LL/15625LL))/((62500000LL*3/4)/15625LL)) = %lld\n" - .balign 4 - -glabel D_80145DEC - .asciz "../sched.c" - .balign 4 - -glabel D_80145DF8 - .asciz "(((u64)(now - graph_rsp_start_time)*(1000000LL/15625LL))/((62500000LL*3/4)/15625LL)) = %lld\n" - .balign 4 - -glabel D_80145E58 - .asciz "../sched.c" - .balign 4 - -glabel D_80145E64 - .asciz "(((u64)(now - rdp_start_time)*(1000000LL/15625LL))/((62500000LL*3/4)/15625LL)) = %lld\n" - .balign 4 - -.text -glabel func_800C8534 -/* B3F6D4 800C8534 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B3F6D8 800C8538 AFBF0014 */ sw $ra, 0x14($sp) -/* B3F6DC 800C853C AFA40020 */ sw $a0, 0x20($sp) -/* B3F6E0 800C8540 8C8F0230 */ lw $t7, 0x230($a0) -/* B3F6E4 800C8544 51E0009E */ beql $t7, $zero, .L800C87C0 -/* B3F6E8 800C8548 8FBF0014 */ lw $ra, 0x14($sp) -/* B3F6EC 800C854C 0C001A78 */ jal osGetTime -/* B3F6F0 800C8550 00000000 */ nop -/* B3F6F4 800C8554 8FB80020 */ lw $t8, 0x20($sp) -/* B3F6F8 800C8558 AFA20018 */ sw $v0, 0x18($sp) -/* B3F6FC 800C855C AFA3001C */ sw $v1, 0x1c($sp) -/* B3F700 800C8560 8F190230 */ lw $t9, 0x230($t8) -/* B3F704 800C8564 3C188017 */ lui $t8, %hi(D_8016A500) # $t8, 0x8017 -/* B3F708 800C8568 8FAF001C */ lw $t7, 0x1c($sp) -/* B3F70C 800C856C 8F28000C */ lw $t0, 0xc($t9) -/* B3F710 800C8570 3C198017 */ lui $t9, %hi(D_8016A504) # $t9, 0x8017 -/* B3F714 800C8574 8FAE0018 */ lw $t6, 0x18($sp) -/* B3F718 800C8578 1500001E */ bnez $t0, .L800C85F4 -/* B3F71C 800C857C 24060000 */ li $a2, 0 -/* B3F720 800C8580 3C048014 */ lui $a0, %hi(D_80145D80) # $a0, 0x8014 -/* B3F724 800C8584 24845D80 */ addiu $a0, %lo(D_80145D80) # addiu $a0, $a0, 0x5d80 -/* B3F728 800C8588 0C000B84 */ jal LogUtils_LogThreadId -/* B3F72C 800C858C 240501A5 */ li $a1, 421 -/* B3F730 800C8590 3C0C8017 */ lui $t4, %hi(D_8016A508) # $t4, 0x8017 -/* B3F734 800C8594 3C0D8017 */ lui $t5, %hi(D_8016A50C) # $t5, 0x8017 -/* B3F738 800C8598 8DADA50C */ lw $t5, %lo(D_8016A50C)($t5) -/* B3F73C 800C859C 8D8CA508 */ lw $t4, %lo(D_8016A508)($t4) -/* B3F740 800C85A0 8FAA0018 */ lw $t2, 0x18($sp) -/* B3F744 800C85A4 8FAB001C */ lw $t3, 0x1c($sp) -/* B3F748 800C85A8 24060000 */ li $a2, 0 -/* B3F74C 800C85AC 014C2023 */ subu $a0, $t2, $t4 -/* B3F750 800C85B0 016D082B */ sltu $at, $t3, $t5 -/* B3F754 800C85B4 00812023 */ subu $a0, $a0, $at -/* B3F758 800C85B8 24070040 */ li $a3, 64 -/* B3F75C 800C85BC 0C000E1E */ jal __ll_mul -/* B3F760 800C85C0 016D2823 */ subu $a1, $t3, $t5 -/* B3F764 800C85C4 00402025 */ move $a0, $v0 -/* B3F768 800C85C8 00602825 */ move $a1, $v1 -/* B3F76C 800C85CC 24060000 */ li $a2, 0 -/* B3F770 800C85D0 0C000DDE */ jal __ull_div -/* B3F774 800C85D4 24070BB8 */ li $a3, 3000 -/* B3F778 800C85D8 3C048014 */ lui $a0, %hi(D_80145D8C) # $a0, 0x8014 -/* B3F77C 800C85DC 24845D8C */ addiu $a0, %lo(D_80145D8C) # addiu $a0, $a0, 0x5d8c -/* B3F780 800C85E0 00403025 */ move $a2, $v0 -/* B3F784 800C85E4 0C00084C */ jal osSyncPrintf -/* B3F788 800C85E8 00603825 */ move $a3, $v1 -/* B3F78C 800C85EC 10000074 */ b .L800C87C0 -/* B3F790 800C85F0 8FBF0014 */ lw $ra, 0x14($sp) -.L800C85F4: -/* B3F794 800C85F4 8F18A500 */ lw $t8, %lo(D_8016A500)($t8) -/* B3F798 800C85F8 8F39A504 */ lw $t9, %lo(D_8016A504)($t9) -/* B3F79C 800C85FC 24070040 */ li $a3, 64 -/* B3F7A0 800C8600 01D82023 */ subu $a0, $t6, $t8 -/* B3F7A4 800C8604 01F9082B */ sltu $at, $t7, $t9 -/* B3F7A8 800C8608 00812023 */ subu $a0, $a0, $at -/* B3F7AC 800C860C 0C000E1E */ jal __ll_mul -/* B3F7B0 800C8610 01F92823 */ subu $a1, $t7, $t9 -/* B3F7B4 800C8614 00402025 */ move $a0, $v0 -/* B3F7B8 800C8618 00602825 */ move $a1, $v1 -/* B3F7BC 800C861C 24060000 */ li $a2, 0 -/* B3F7C0 800C8620 0C000DDE */ jal __ull_div -/* B3F7C4 800C8624 24070BB8 */ li $a3, 3000 -/* B3F7C8 800C8628 1440001C */ bnez $v0, .L800C869C -/* B3F7CC 800C862C 3C01000F */ lui $at, (0x000F4241 >> 16) # lui $at, 0xf -/* B3F7D0 800C8630 34214241 */ ori $at, (0x000F4241 & 0xFFFF) # ori $at, $at, 0x4241 -/* B3F7D4 800C8634 0061082B */ sltu $at, $v1, $at -/* B3F7D8 800C8638 10200018 */ beqz $at, .L800C869C -/* B3F7DC 800C863C 8FA80018 */ lw $t0, 0x18($sp) -/* B3F7E0 800C8640 3C0A8017 */ lui $t2, %hi(D_8016A518) # $t2, 0x8017 -/* B3F7E4 800C8644 3C0B8017 */ lui $t3, %hi(D_8016A51C) # $t3, 0x8017 -/* B3F7E8 800C8648 8D6BA51C */ lw $t3, %lo(D_8016A51C)($t3) -/* B3F7EC 800C864C 8D4AA518 */ lw $t2, %lo(D_8016A518)($t2) -/* B3F7F0 800C8650 8FA9001C */ lw $t1, 0x1c($sp) -/* B3F7F4 800C8654 24060000 */ li $a2, 0 -/* B3F7F8 800C8658 010A2023 */ subu $a0, $t0, $t2 -/* B3F7FC 800C865C 012B082B */ sltu $at, $t1, $t3 -/* B3F800 800C8660 00812023 */ subu $a0, $a0, $at -/* B3F804 800C8664 24070040 */ li $a3, 64 -/* B3F808 800C8668 0C000E1E */ jal __ll_mul -/* B3F80C 800C866C 012B2823 */ subu $a1, $t1, $t3 -/* B3F810 800C8670 00402025 */ move $a0, $v0 -/* B3F814 800C8674 00602825 */ move $a1, $v1 -/* B3F818 800C8678 24060000 */ li $a2, 0 -/* B3F81C 800C867C 0C000DDE */ jal __ull_div -/* B3F820 800C8680 24070BB8 */ li $a3, 3000 -/* B3F824 800C8684 14400005 */ bnez $v0, .L800C869C -/* B3F828 800C8688 3C01000F */ lui $at, (0x000F4241 >> 16) # lui $at, 0xf -/* B3F82C 800C868C 34214241 */ ori $at, (0x000F4241 & 0xFFFF) # ori $at, $at, 0x4241 -/* B3F830 800C8690 0061082B */ sltu $at, $v1, $at -/* B3F834 800C8694 5420004A */ bnezl $at, .L800C87C0 -/* B3F838 800C8698 8FBF0014 */ lw $ra, 0x14($sp) -.L800C869C: -/* B3F83C 800C869C 0C03EFF6 */ jal func_800FBFD8 -/* B3F840 800C86A0 00000000 */ nop -/* B3F844 800C86A4 8FAC0020 */ lw $t4, 0x20($sp) -/* B3F848 800C86A8 3C048014 */ lui $a0, %hi(D_80145DEC) # $a0, 0x8014 -/* B3F84C 800C86AC 24845DEC */ addiu $a0, %lo(D_80145DEC) # addiu $a0, $a0, 0x5dec -/* B3F850 800C86B0 8D8D0230 */ lw $t5, 0x230($t4) -/* B3F854 800C86B4 51A0001F */ beql $t5, $zero, .L800C8734 -/* B3F858 800C86B8 8FA80020 */ lw $t0, 0x20($sp) -/* B3F85C 800C86BC 0C000B84 */ jal LogUtils_LogThreadId -/* B3F860 800C86C0 240501AB */ li $a1, 427 -/* B3F864 800C86C4 3C188017 */ lui $t8, %hi(D_8016A500) # $t8, 0x8017 -/* B3F868 800C86C8 3C198017 */ lui $t9, %hi(D_8016A504) # $t9, 0x8017 -/* B3F86C 800C86CC 8F39A504 */ lw $t9, %lo(D_8016A504)($t9) -/* B3F870 800C86D0 8F18A500 */ lw $t8, %lo(D_8016A500)($t8) -/* B3F874 800C86D4 8FAE0018 */ lw $t6, 0x18($sp) -/* B3F878 800C86D8 8FAF001C */ lw $t7, 0x1c($sp) -/* B3F87C 800C86DC 24060000 */ li $a2, 0 -/* B3F880 800C86E0 01D82023 */ subu $a0, $t6, $t8 -/* B3F884 800C86E4 01F9082B */ sltu $at, $t7, $t9 -/* B3F888 800C86E8 00812023 */ subu $a0, $a0, $at -/* B3F88C 800C86EC 24070040 */ li $a3, 64 -/* B3F890 800C86F0 0C000E1E */ jal __ll_mul -/* B3F894 800C86F4 01F92823 */ subu $a1, $t7, $t9 -/* B3F898 800C86F8 00402025 */ move $a0, $v0 -/* B3F89C 800C86FC 00602825 */ move $a1, $v1 -/* B3F8A0 800C8700 24060000 */ li $a2, 0 -/* B3F8A4 800C8704 0C000DDE */ jal __ull_div -/* B3F8A8 800C8708 24070BB8 */ li $a3, 3000 -/* B3F8AC 800C870C 3C048014 */ lui $a0, %hi(D_80145DF8) # $a0, 0x8014 -/* B3F8B0 800C8710 24845DF8 */ addiu $a0, %lo(D_80145DF8) # addiu $a0, $a0, 0x5df8 -/* B3F8B4 800C8714 00403025 */ move $a2, $v0 -/* B3F8B8 800C8718 0C00084C */ jal osSyncPrintf -/* B3F8BC 800C871C 00603825 */ move $a3, $v1 -/* B3F8C0 800C8720 8FA40020 */ lw $a0, 0x20($sp) -/* B3F8C4 800C8724 2405029B */ li $a1, 667 -/* B3F8C8 800C8728 0C000C18 */ jal osSendMesg -/* B3F8CC 800C872C 00003025 */ move $a2, $zero -/* B3F8D0 800C8730 8FA80020 */ lw $t0, 0x20($sp) -.L800C8734: -/* B3F8D4 800C8734 3C048014 */ lui $a0, %hi(D_80145E58) # $a0, 0x8014 -/* B3F8D8 800C8738 24845E58 */ addiu $a0, %lo(D_80145E58) # addiu $a0, $a0, 0x5e58 -/* B3F8DC 800C873C 8D090234 */ lw $t1, 0x234($t0) -/* B3F8E0 800C8740 5120001F */ beql $t1, $zero, .L800C87C0 -/* B3F8E4 800C8744 8FBF0014 */ lw $ra, 0x14($sp) -/* B3F8E8 800C8748 0C000B84 */ jal LogUtils_LogThreadId -/* B3F8EC 800C874C 240501AF */ li $a1, 431 -/* B3F8F0 800C8750 3C0C8017 */ lui $t4, %hi(D_8016A518) # $t4, 0x8017 -/* B3F8F4 800C8754 3C0D8017 */ lui $t5, %hi(D_8016A51C) # $t5, 0x8017 -/* B3F8F8 800C8758 8DADA51C */ lw $t5, %lo(D_8016A51C)($t5) -/* B3F8FC 800C875C 8D8CA518 */ lw $t4, %lo(D_8016A518)($t4) -/* B3F900 800C8760 8FAA0018 */ lw $t2, 0x18($sp) -/* B3F904 800C8764 8FAB001C */ lw $t3, 0x1c($sp) -/* B3F908 800C8768 24060000 */ li $a2, 0 -/* B3F90C 800C876C 014C2023 */ subu $a0, $t2, $t4 -/* B3F910 800C8770 016D082B */ sltu $at, $t3, $t5 -/* B3F914 800C8774 00812023 */ subu $a0, $a0, $at -/* B3F918 800C8778 24070040 */ li $a3, 64 -/* B3F91C 800C877C 0C000E1E */ jal __ll_mul -/* B3F920 800C8780 016D2823 */ subu $a1, $t3, $t5 -/* B3F924 800C8784 00402025 */ move $a0, $v0 -/* B3F928 800C8788 00602825 */ move $a1, $v1 -/* B3F92C 800C878C 24060000 */ li $a2, 0 -/* B3F930 800C8790 0C000DDE */ jal __ull_div -/* B3F934 800C8794 24070BB8 */ li $a3, 3000 -/* B3F938 800C8798 3C048014 */ lui $a0, %hi(D_80145E64) # $a0, 0x8014 -/* B3F93C 800C879C 24845E64 */ addiu $a0, %lo(D_80145E64) # addiu $a0, $a0, 0x5e64 -/* B3F940 800C87A0 00403025 */ move $a2, $v0 -/* B3F944 800C87A4 0C00084C */ jal osSyncPrintf -/* B3F948 800C87A8 00603825 */ move $a3, $v1 -/* B3F94C 800C87AC 8FA40020 */ lw $a0, 0x20($sp) -/* B3F950 800C87B0 2405029C */ li $a1, 668 -/* B3F954 800C87B4 0C000C18 */ jal osSendMesg -/* B3F958 800C87B8 00003025 */ move $a2, $zero -/* B3F95C 800C87BC 8FBF0014 */ lw $ra, 0x14($sp) -.L800C87C0: -/* B3F960 800C87C0 27BD0020 */ addiu $sp, $sp, 0x20 -/* B3F964 800C87C4 03E00008 */ jr $ra -/* B3F968 800C87C8 00000000 */ nop - diff --git a/asm/non_matchings/code/sched/func_800C87F0.s b/asm/non_matchings/code/sched/func_800C87F0.s deleted file mode 100644 index 4c1b0f8518..0000000000 --- a/asm/non_matchings/code/sched/func_800C87F0.s +++ /dev/null @@ -1,102 +0,0 @@ -.rdata -glabel D_80145EBC - .asciz "(type == M_AUDTASK) || (type == M_GFXTASK) || (type == M_NJPEGTASK) || (type == M_NULTASK)" - .balign 4 - -glabel D_80145F18 - .asciz "../sched.c" - .balign 4 - -glabel D_80145F24 - .asciz "オーディオタスクをエントリしました\n" - # EUC-JP: オーディオタスクをエントリしました | Audio task entered - .balign 4 - -glabel D_80145F48 - .asciz "グラフタスクをエントリしました\n" - # EUC-JP: グラフタスクをエントリしました | Graph task entered - .balign 4 - -.text -glabel func_800C87F0 -/* B3F990 800C87F0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B3F994 800C87F4 AFBF001C */ sw $ra, 0x1c($sp) -/* B3F998 800C87F8 AFB00018 */ sw $s0, 0x18($sp) -/* B3F99C 800C87FC 8CA20010 */ lw $v0, 0x10($a1) -/* B3F9A0 800C8800 24010002 */ li $at, 2 -/* B3F9A4 800C8804 00808025 */ move $s0, $a0 -/* B3F9A8 800C8808 10410011 */ beq $v0, $at, .L800C8850 -/* B3F9AC 800C880C 00A03825 */ move $a3, $a1 -/* B3F9B0 800C8810 24010001 */ li $at, 1 -/* B3F9B4 800C8814 1041000E */ beq $v0, $at, .L800C8850 -/* B3F9B8 800C8818 24010004 */ li $at, 4 -/* B3F9BC 800C881C 5041000D */ beql $v0, $at, .L800C8854 -/* B3F9C0 800C8820 24010002 */ li $at, 2 -/* B3F9C4 800C8824 1040000A */ beqz $v0, .L800C8850 -/* B3F9C8 800C8828 3C048014 */ lui $a0, %hi(D_80145EBC) # $a0, 0x8014 -/* B3F9CC 800C882C 3C058014 */ lui $a1, %hi(D_80145F18) # $a1, 0x8014 -/* B3F9D0 800C8830 24A55F18 */ addiu $a1, %lo(D_80145F18) # addiu $a1, $a1, 0x5f18 -/* B3F9D4 800C8834 24845EBC */ addiu $a0, %lo(D_80145EBC) # addiu $a0, $a0, 0x5ebc -/* B3F9D8 800C8838 240601CF */ li $a2, 463 -/* B3F9DC 800C883C AFA20024 */ sw $v0, 0x24($sp) -/* B3F9E0 800C8840 0C0007FC */ jal __assert -/* B3F9E4 800C8844 AFA7002C */ sw $a3, 0x2c($sp) -/* B3F9E8 800C8848 8FA20024 */ lw $v0, 0x24($sp) -/* B3F9EC 800C884C 8FA7002C */ lw $a3, 0x2c($sp) -.L800C8850: -/* B3F9F0 800C8850 24010002 */ li $at, 2 -.L800C8854: -/* B3F9F4 800C8854 14410015 */ bne $v0, $at, .L800C88AC -/* B3F9F8 800C8858 3C198013 */ lui $t9, %hi(D_8012D290) # $t9, 0x8013 -/* B3F9FC 800C885C 3C0E8013 */ lui $t6, %hi(D_8012D290) # $t6, 0x8013 -/* B3FA00 800C8860 25CED290 */ addiu $t6, %lo(D_8012D290) # addiu $t6, $t6, -0x2d70 -/* B3FA04 800C8864 8DCF0000 */ lw $t7, ($t6) -/* B3FA08 800C8868 3C048014 */ lui $a0, %hi(D_80145F24) # $a0, 0x8014 -/* B3FA0C 800C886C 24845F24 */ addiu $a0, %lo(D_80145F24) # addiu $a0, $a0, 0x5f24 -/* B3FA10 800C8870 51E00005 */ beql $t7, $zero, .L800C8888 -/* B3FA14 800C8874 8E020228 */ lw $v0, 0x228($s0) -/* B3FA18 800C8878 0C00084C */ jal osSyncPrintf -/* B3FA1C 800C887C AFA7002C */ sw $a3, 0x2c($sp) -/* B3FA20 800C8880 8FA7002C */ lw $a3, 0x2c($sp) -/* B3FA24 800C8884 8E020228 */ lw $v0, 0x228($s0) -.L800C8888: -/* B3FA28 800C8888 24180001 */ li $t8, 1 -/* B3FA2C 800C888C 50400004 */ beql $v0, $zero, .L800C88A0 -/* B3FA30 800C8890 AE070220 */ sw $a3, 0x220($s0) -/* B3FA34 800C8894 10000002 */ b .L800C88A0 -/* B3FA38 800C8898 AC470000 */ sw $a3, ($v0) -/* B3FA3C 800C889C AE070220 */ sw $a3, 0x220($s0) -.L800C88A0: -/* B3FA40 800C88A0 AE070228 */ sw $a3, 0x228($s0) -/* B3FA44 800C88A4 10000011 */ b .L800C88EC -/* B3FA48 800C88A8 AE18023C */ sw $t8, 0x23c($s0) -.L800C88AC: -/* B3FA4C 800C88AC 2739D290 */ addiu $t9, %lo(D_8012D290) # addiu $t9, $t9, -0x2d70 -/* B3FA50 800C88B0 8F280000 */ lw $t0, ($t9) -/* B3FA54 800C88B4 3C048014 */ lui $a0, %hi(D_80145F48) # $a0, 0x8014 -/* B3FA58 800C88B8 24845F48 */ addiu $a0, %lo(D_80145F48) # addiu $a0, $a0, 0x5f48 -/* B3FA5C 800C88BC 51000005 */ beql $t0, $zero, .L800C88D4 -/* B3FA60 800C88C0 8E02022C */ lw $v0, 0x22c($s0) -/* B3FA64 800C88C4 0C00084C */ jal osSyncPrintf -/* B3FA68 800C88C8 AFA7002C */ sw $a3, 0x2c($sp) -/* B3FA6C 800C88CC 8FA7002C */ lw $a3, 0x2c($sp) -/* B3FA70 800C88D0 8E02022C */ lw $v0, 0x22c($s0) -.L800C88D4: -/* B3FA74 800C88D4 50400004 */ beql $v0, $zero, .L800C88E8 -/* B3FA78 800C88D8 AE070224 */ sw $a3, 0x224($s0) -/* B3FA7C 800C88DC 10000002 */ b .L800C88E8 -/* B3FA80 800C88E0 AC470000 */ sw $a3, ($v0) -/* B3FA84 800C88E4 AE070224 */ sw $a3, 0x224($s0) -.L800C88E8: -/* B3FA88 800C88E8 AE07022C */ sw $a3, 0x22c($s0) -.L800C88EC: -/* B3FA8C 800C88EC 8CE90008 */ lw $t1, 8($a3) -/* B3FA90 800C88F0 ACE00000 */ sw $zero, ($a3) -/* B3FA94 800C88F4 312A0003 */ andi $t2, $t1, 3 -/* B3FA98 800C88F8 ACEA0004 */ sw $t2, 4($a3) -/* B3FA9C 800C88FC 8FBF001C */ lw $ra, 0x1c($sp) -/* B3FAA0 800C8900 8FB00018 */ lw $s0, 0x18($sp) -/* B3FAA4 800C8904 27BD0028 */ addiu $sp, $sp, 0x28 -/* B3FAA8 800C8908 03E00008 */ jr $ra -/* B3FAAC 800C890C 00000000 */ nop - diff --git a/asm/non_matchings/code/sched/func_800C89D4.s b/asm/non_matchings/code/sched/func_800C89D4.s deleted file mode 100644 index 87bbf541a8..0000000000 --- a/asm/non_matchings/code/sched/func_800C89D4.s +++ /dev/null @@ -1,76 +0,0 @@ -.rdata -glabel D_80145FB4 - .asciz "sc->pending_swapbuffer1" - .balign 4 - -glabel D_80145FD8 - .asciz "../sched.c" - .balign 4 - -glabel D_80145FE4 - .asciz "sc->pending_swapbuffer2" - .balign 4 - -glabel D_80146008 - .asciz "../sched.c" - .balign 4 - -.text -glabel func_800C89D4 -/* B3FB74 800C89D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B3FB78 800C89D8 AFBF0014 */ sw $ra, 0x14($sp) -/* B3FB7C 800C89DC 14A00003 */ bnez $a1, .L800C89EC -/* B3FB80 800C89E0 00803025 */ move $a2, $a0 -/* B3FB84 800C89E4 10000027 */ b .L800C8A84 -/* B3FB88 800C89E8 00001025 */ move $v0, $zero -.L800C89EC: -/* B3FB8C 800C89EC 8CC40244 */ lw $a0, 0x244($a2) -/* B3FB90 800C89F0 50800004 */ beql $a0, $zero, .L800C8A04 -/* B3FB94 800C89F4 8CC20248 */ lw $v0, 0x248($a2) -/* B3FB98 800C89F8 10000022 */ b .L800C8A84 -/* B3FB9C 800C89FC 00001025 */ move $v0, $zero -/* B3FBA0 800C8A00 8CC20248 */ lw $v0, 0x248($a2) -.L800C8A04: -/* B3FBA4 800C8A04 10400003 */ beqz $v0, .L800C8A14 -/* B3FBA8 800C8A08 00000000 */ nop -/* B3FBAC 800C8A0C 1000001D */ b .L800C8A84 -/* B3FBB0 800C8A10 00001025 */ move $v0, $zero -.L800C8A14: -/* B3FBB4 800C8A14 10400003 */ beqz $v0, .L800C8A24 -/* B3FBB8 800C8A18 00001825 */ move $v1, $zero -/* B3FBBC 800C8A1C 10000001 */ b .L800C8A24 -/* B3FBC0 800C8A20 8C430004 */ lw $v1, 4($v0) -.L800C8A24: -/* B3FBC4 800C8A24 8CAE000C */ lw $t6, 0xc($a1) -/* B3FBC8 800C8A28 8DC20000 */ lw $v0, ($t6) -/* B3FBCC 800C8A2C 14620003 */ bne $v1, $v0, .L800C8A3C -/* B3FBD0 800C8A30 00000000 */ nop -/* B3FBD4 800C8A34 10000013 */ b .L800C8A84 -/* B3FBD8 800C8A38 00001025 */ move $v0, $zero -.L800C8A3C: -/* B3FBDC 800C8A3C 10800003 */ beqz $a0, .L800C8A4C -/* B3FBE0 800C8A40 00001825 */ move $v1, $zero -/* B3FBE4 800C8A44 10000001 */ b .L800C8A4C -/* B3FBE8 800C8A48 8C830004 */ lw $v1, 4($a0) -.L800C8A4C: -/* B3FBEC 800C8A4C 14620003 */ bne $v1, $v0, .L800C8A5C -/* B3FBF0 800C8A50 00000000 */ nop -/* B3FBF4 800C8A54 1000000B */ b .L800C8A84 -/* B3FBF8 800C8A58 00001025 */ move $v0, $zero -.L800C8A5C: -/* B3FBFC 800C8A5C 0C0419D8 */ jal osViGetCurrentFramebuffer -/* B3FC00 800C8A60 AFA5001C */ sw $a1, 0x1c($sp) -/* B3FC04 800C8A64 8FA5001C */ lw $a1, 0x1c($sp) -/* B3FC08 800C8A68 8CAF000C */ lw $t7, 0xc($a1) -/* B3FC0C 800C8A6C 8DF80000 */ lw $t8, ($t7) -/* B3FC10 800C8A70 54580004 */ bnel $v0, $t8, .L800C8A84 -/* B3FC14 800C8A74 00A01025 */ move $v0, $a1 -/* B3FC18 800C8A78 10000002 */ b .L800C8A84 -/* B3FC1C 800C8A7C 00001025 */ move $v0, $zero -/* B3FC20 800C8A80 00A01025 */ move $v0, $a1 -.L800C8A84: -/* B3FC24 800C8A84 8FBF0014 */ lw $ra, 0x14($sp) -/* B3FC28 800C8A88 27BD0018 */ addiu $sp, $sp, 0x18 -/* B3FC2C 800C8A8C 03E00008 */ jr $ra -/* B3FC30 800C8A90 00000000 */ nop - diff --git a/asm/non_matchings/code/sched/func_800C8CB8.s b/asm/non_matchings/code/sched/func_800C8CB8.s deleted file mode 100644 index 942e23e23c..0000000000 --- a/asm/non_matchings/code/sched/func_800C8CB8.s +++ /dev/null @@ -1,178 +0,0 @@ -.rdata -glabel D_80146020 - .asciz "sc->curRSPTask == NULL" - .balign 4 - -glabel D_80146038 - .asciz "../sched.c" - .balign 4 - -glabel D_80146044 - .asciz "%08d:osSpTaskStartGo(%08x) %s\n" - .balign 4 - -glabel D_80146064 - .asciz "AUDIO" - .balign 4 - -glabel D_8014606C - .asciz "GRAPH" - .balign 4 - -glabel D_80146074 - .asciz "OTHER" - .balign 4 - -.text -glabel func_800C8CB8 -/* B3FE58 800C8CB8 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B3FE5C 800C8CBC AFBF001C */ sw $ra, 0x1c($sp) -/* B3FE60 800C8CC0 AFB00018 */ sw $s0, 0x18($sp) -/* B3FE64 800C8CC4 AFA40048 */ sw $a0, 0x48($sp) -/* B3FE68 800C8CC8 AFA60050 */ sw $a2, 0x50($sp) -/* B3FE6C 800C8CCC 8C8F0230 */ lw $t7, 0x230($a0) -/* B3FE70 800C8CD0 3C048014 */ lui $a0, %hi(D_80146020) # $a0, 0x8014 -/* B3FE74 800C8CD4 00A08025 */ move $s0, $a1 -/* B3FE78 800C8CD8 11E00005 */ beqz $t7, .L800C8CF0 -/* B3FE7C 800C8CDC 24846020 */ addiu $a0, %lo(D_80146020) # addiu $a0, $a0, 0x6020 -/* B3FE80 800C8CE0 3C058014 */ lui $a1, %hi(D_80146038) # $a1, 0x8014 -/* B3FE84 800C8CE4 24A56038 */ addiu $a1, %lo(D_80146038) # addiu $a1, $a1, 0x6038 -/* B3FE88 800C8CE8 0C0007FC */ jal __assert -/* B3FE8C 800C8CEC 24060297 */ li $a2, 663 -.L800C8CF0: -/* B3FE90 800C8CF0 52000076 */ beql $s0, $zero, .L800C8ECC -/* B3FE94 800C8CF4 8FBF001C */ lw $ra, 0x1c($sp) -/* B3FE98 800C8CF8 8E180010 */ lw $t8, 0x10($s0) -/* B3FE9C 800C8CFC 02002825 */ move $a1, $s0 -/* B3FEA0 800C8D00 5700001A */ bnezl $t8, .L800C8D6C -/* B3FEA4 800C8D04 8E0F0004 */ lw $t7, 4($s0) -/* B3FEA8 800C8D08 8E020008 */ lw $v0, 8($s0) -/* B3FEAC 800C8D0C 30590002 */ andi $t9, $v0, 2 -/* B3FEB0 800C8D10 53200009 */ beql $t9, $zero, .L800C8D38 -/* B3FEB4 800C8D14 304B0001 */ andi $t3, $v0, 1 -/* B3FEB8 800C8D18 8E080004 */ lw $t0, 4($s0) -/* B3FEBC 800C8D1C 2401FFFD */ li $at, -3 -/* B3FEC0 800C8D20 01014824 */ and $t1, $t0, $at -/* B3FEC4 800C8D24 AE090004 */ sw $t1, 4($s0) -/* B3FEC8 800C8D28 8FAA0048 */ lw $t2, 0x48($sp) -/* B3FECC 800C8D2C AD400230 */ sw $zero, 0x230($t2) -/* B3FED0 800C8D30 8E020008 */ lw $v0, 8($s0) -/* B3FED4 800C8D34 304B0001 */ andi $t3, $v0, 1 -.L800C8D38: -/* B3FED8 800C8D38 11600007 */ beqz $t3, .L800C8D58 -/* B3FEDC 800C8D3C 00000000 */ nop -/* B3FEE0 800C8D40 8E0C0004 */ lw $t4, 4($s0) -/* B3FEE4 800C8D44 2401FFFE */ li $at, -2 -/* B3FEE8 800C8D48 01816824 */ and $t5, $t4, $at -/* B3FEEC 800C8D4C AE0D0004 */ sw $t5, 4($s0) -/* B3FEF0 800C8D50 8FAE0048 */ lw $t6, 0x48($sp) -/* B3FEF4 800C8D54 ADC00234 */ sw $zero, 0x234($t6) -.L800C8D58: -/* B3FEF8 800C8D58 0C032310 */ jal func_800C8C40 -/* B3FEFC 800C8D5C 8FA40048 */ lw $a0, 0x48($sp) -/* B3FF00 800C8D60 1000005A */ b .L800C8ECC -/* B3FF04 800C8D64 8FBF001C */ lw $ra, 0x1c($sp) -/* B3FF08 800C8D68 8E0F0004 */ lw $t7, 4($s0) -.L800C8D6C: -/* B3FF0C 800C8D6C 2401FFCF */ li $at, -49 -/* B3FF10 800C8D70 01E1C024 */ and $t8, $t7, $at -/* B3FF14 800C8D74 0C041924 */ jal osWritebackDCacheAll -/* B3FF18 800C8D78 AE180004 */ sw $t8, 4($s0) -/* B3FF1C 800C8D7C 26040010 */ addiu $a0, $s0, 0x10 -/* B3FF20 800C8D80 0C040173 */ jal osSpTaskLoad -/* B3FF24 800C8D84 AFA40020 */ sw $a0, 0x20($sp) -/* B3FF28 800C8D88 8E040010 */ lw $a0, 0x10($s0) -/* B3FF2C 800C8D8C 24010002 */ li $at, 2 -/* B3FF30 800C8D90 54810008 */ bnel $a0, $at, .L800C8DB4 -/* B3FF34 800C8D94 24010001 */ li $at, 1 -/* B3FF38 800C8D98 0C001A78 */ jal osGetTime -/* B3FF3C 800C8D9C 00000000 */ nop -/* B3FF40 800C8DA0 3C018017 */ lui $at, %hi(D_8016A50C) # $at, 0x8017 -/* B3FF44 800C8DA4 AC22A508 */ sw $v0, %lo(D_8016A508)($at) -/* B3FF48 800C8DA8 1000000F */ b .L800C8DE8 -/* B3FF4C 800C8DAC AC23A50C */ sw $v1, %lo(D_8016A50C)($at) -/* B3FF50 800C8DB0 24010001 */ li $at, 1 -.L800C8DB4: -/* B3FF54 800C8DB4 14810007 */ bne $a0, $at, .L800C8DD4 -/* B3FF58 800C8DB8 00000000 */ nop -/* B3FF5C 800C8DBC 0C001A78 */ jal osGetTime -/* B3FF60 800C8DC0 00000000 */ nop -/* B3FF64 800C8DC4 3C018017 */ lui $at, %hi(D_8016A504) # $at, 0x8017 -/* B3FF68 800C8DC8 AC22A500 */ sw $v0, %lo(D_8016A500)($at) -/* B3FF6C 800C8DCC 10000006 */ b .L800C8DE8 -/* B3FF70 800C8DD0 AC23A504 */ sw $v1, %lo(D_8016A504)($at) -.L800C8DD4: -/* B3FF74 800C8DD4 0C001A78 */ jal osGetTime -/* B3FF78 800C8DD8 00000000 */ nop -/* B3FF7C 800C8DDC 3C018017 */ lui $at, %hi(D_8016A514) # $at, 0x8017 -/* B3FF80 800C8DE0 AC22A510 */ sw $v0, %lo(D_8016A510)($at) -/* B3FF84 800C8DE4 AC23A514 */ sw $v1, %lo(D_8016A514)($at) -.L800C8DE8: -/* B3FF88 800C8DE8 0C0401CD */ jal osSpTaskStartGo -/* B3FF8C 800C8DEC 8FA40020 */ lw $a0, 0x20($sp) -/* B3FF90 800C8DF0 3C198013 */ lui $t9, %hi(D_8012D290) # $t9, 0x8013 -/* B3FF94 800C8DF4 2739D290 */ addiu $t9, %lo(D_8012D290) # addiu $t9, $t9, -0x2d70 -/* B3FF98 800C8DF8 8F280000 */ lw $t0, ($t9) -/* B3FF9C 800C8DFC 51000023 */ beql $t0, $zero, .L800C8E8C -/* B3FFA0 800C8E00 8FA20048 */ lw $v0, 0x48($sp) -/* B3FFA4 800C8E04 0C001A78 */ jal osGetTime -/* B3FFA8 800C8E08 00000000 */ nop -/* B3FFAC 800C8E0C 00402025 */ move $a0, $v0 -/* B3FFB0 800C8E10 00602825 */ move $a1, $v1 -/* B3FFB4 800C8E14 24060000 */ li $a2, 0 -/* B3FFB8 800C8E18 0C000E1E */ jal __ll_mul -/* B3FFBC 800C8E1C 24070040 */ li $a3, 64 -/* B3FFC0 800C8E20 00402025 */ move $a0, $v0 -/* B3FFC4 800C8E24 00602825 */ move $a1, $v1 -/* B3FFC8 800C8E28 24060000 */ li $a2, 0 -/* B3FFCC 800C8E2C 0C000DDE */ jal __ull_div -/* B3FFD0 800C8E30 24070BB8 */ li $a3, 3000 -/* B3FFD4 800C8E34 AFA20038 */ sw $v0, 0x38($sp) -/* B3FFD8 800C8E38 AFA3003C */ sw $v1, 0x3c($sp) -/* B3FFDC 800C8E3C 8E040010 */ lw $a0, 0x10($s0) -/* B3FFE0 800C8E40 24010002 */ li $at, 2 -/* B3FFE4 800C8E44 8FA5003C */ lw $a1, 0x3c($sp) -/* B3FFE8 800C8E48 14810004 */ bne $a0, $at, .L800C8E5C -/* B3FFEC 800C8E4C 8FA60020 */ lw $a2, 0x20($sp) -/* B3FFF0 800C8E50 3C078014 */ lui $a3, %hi(D_80146064) # $a3, 0x8014 -/* B3FFF4 800C8E54 10000009 */ b .L800C8E7C -/* B3FFF8 800C8E58 24E76064 */ addiu $a3, %lo(D_80146064) # addiu $a3, $a3, 0x6064 -.L800C8E5C: -/* B3FFFC 800C8E5C 24010001 */ li $at, 1 -/* B40000 800C8E60 14810004 */ bne $a0, $at, .L800C8E74 -/* B40004 800C8E64 3C028014 */ lui $v0, %hi(D_80146074) -/* B40008 800C8E68 3C028014 */ lui $v0, %hi(D_8014606C) # $v0, 0x8014 -/* B4000C 800C8E6C 10000002 */ b .L800C8E78 -/* B40010 800C8E70 2442606C */ addiu $v0, %lo(D_8014606C) # addiu $v0, $v0, 0x606c -.L800C8E74: -/* B40014 800C8E74 24426074 */ addiu $v0, %lo(D_80146074) -.L800C8E78: -/* B40018 800C8E78 00403825 */ move $a3, $v0 -.L800C8E7C: -/* B4001C 800C8E7C 3C048014 */ lui $a0, %hi(D_80146044) # $a0, 0x8014 -/* B40020 800C8E80 0C00084C */ jal osSyncPrintf -/* B40024 800C8E84 24846044 */ addiu $a0, %lo(D_80146044) # addiu $a0, $a0, 0x6044 -/* B40028 800C8E88 8FA20048 */ lw $v0, 0x48($sp) -.L800C8E8C: -/* B4002C 800C8E8C AC500230 */ sw $s0, 0x230($v0) -/* B40030 800C8E90 8FA90050 */ lw $t1, 0x50($sp) -/* B40034 800C8E94 5609000D */ bnel $s0, $t1, .L800C8ECC -/* B40038 800C8E98 8FBF001C */ lw $ra, 0x1c($sp) -/* B4003C 800C8E9C 8C4C0234 */ lw $t4, 0x234($v0) -/* B40040 800C8EA0 3C0E8017 */ lui $t6, %hi(D_8016A500) # $t6, 0x8017 -/* B40044 800C8EA4 3C0F8017 */ lui $t7, %hi(D_8016A504) # $t7, 0x8017 -/* B40048 800C8EA8 55800008 */ bnezl $t4, .L800C8ECC -/* B4004C 800C8EAC 8FBF001C */ lw $ra, 0x1c($sp) -/* B40050 800C8EB0 AC490234 */ sw $t1, 0x234($v0) -/* B40054 800C8EB4 8DEFA504 */ lw $t7, %lo(D_8016A504)($t7) -/* B40058 800C8EB8 8DCEA500 */ lw $t6, %lo(D_8016A500)($t6) -/* B4005C 800C8EBC 3C018017 */ lui $at, %hi(D_8016A518) # $at, 0x8017 -/* B40060 800C8EC0 AC2FA51C */ sw $t7, %lo(D_8016A51C)($at) -/* B40064 800C8EC4 AC2EA518 */ sw $t6, %lo(D_8016A518)($at) -/* B40068 800C8EC8 8FBF001C */ lw $ra, 0x1c($sp) -.L800C8ECC: -/* B4006C 800C8ECC 8FB00018 */ lw $s0, 0x18($sp) -/* B40070 800C8ED0 27BD0048 */ addiu $sp, $sp, 0x48 -/* B40074 800C8ED4 03E00008 */ jr $ra -/* B40078 800C8ED8 00000000 */ nop - diff --git a/asm/non_matchings/code/sched/func_800C8EDC.s b/asm/non_matchings/code/sched/func_800C8EDC.s deleted file mode 100644 index 6760c1530d..0000000000 --- a/asm/non_matchings/code/sched/func_800C8EDC.s +++ /dev/null @@ -1,98 +0,0 @@ -.rdata -glabel D_8014607C - .asciz "[YIELD B]" - .balign 4 - -glabel D_80146088 - .asciz "EN sc:%08x sp:%08x dp:%08x state:%x\n" - .balign 4 - -.text -glabel func_800C8EDC -/* B4007C 800C8EDC 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B40080 800C8EE0 AFB30028 */ sw $s3, 0x28($sp) -/* B40084 800C8EE4 AFB20024 */ sw $s2, 0x24($sp) -/* B40088 800C8EE8 AFB10020 */ sw $s1, 0x20($sp) -/* B4008C 800C8EEC 27B20038 */ addiu $s2, $sp, 0x38 -/* B40090 800C8EF0 00809825 */ move $s3, $a0 -/* B40094 800C8EF4 AFBF002C */ sw $ra, 0x2c($sp) -/* B40098 800C8EF8 24910038 */ addiu $s1, $a0, 0x38 -/* B4009C 800C8EFC AFB0001C */ sw $s0, 0x1c($sp) -/* B400A0 800C8F00 AFA00044 */ sw $zero, 0x44($sp) -/* B400A4 800C8F04 AFA00040 */ sw $zero, 0x40($sp) -/* B400A8 800C8F08 AFA00038 */ sw $zero, 0x38($sp) -/* B400AC 800C8F0C 02202025 */ move $a0, $s1 -/* B400B0 800C8F10 02402825 */ move $a1, $s2 -/* B400B4 800C8F14 0C000CA0 */ jal osRecvMesg -/* B400B8 800C8F18 00003025 */ move $a2, $zero -/* B400BC 800C8F1C 2410FFFF */ li $s0, -1 -/* B400C0 800C8F20 10500009 */ beq $v0, $s0, .L800C8F48 -/* B400C4 800C8F24 02602025 */ move $a0, $s3 -.L800C8F28: -/* B400C8 800C8F28 0C0321FC */ jal func_800C87F0 -/* B400CC 800C8F2C 8FA50038 */ lw $a1, 0x38($sp) -/* B400D0 800C8F30 02202025 */ move $a0, $s1 -/* B400D4 800C8F34 02402825 */ move $a1, $s2 -/* B400D8 800C8F38 0C000CA0 */ jal osRecvMesg -/* B400DC 800C8F3C 00003025 */ move $a2, $zero -/* B400E0 800C8F40 5450FFF9 */ bnel $v0, $s0, .L800C8F28 -/* B400E4 800C8F44 02602025 */ move $a0, $s3 -.L800C8F48: -/* B400E8 800C8F48 8E6E023C */ lw $t6, 0x23c($s3) -/* B400EC 800C8F4C 02602025 */ move $a0, $s3 -/* B400F0 800C8F50 27A50044 */ addiu $a1, $sp, 0x44 -/* B400F4 800C8F54 51C00011 */ beql $t6, $zero, .L800C8F9C -/* B400F8 800C8F58 8E680230 */ lw $t0, 0x230($s3) -/* B400FC 800C8F5C 8E6F0230 */ lw $t7, 0x230($s3) -/* B40100 800C8F60 3C188013 */ lui $t8, %hi(D_8012D290) # $t8, 0x8013 -/* B40104 800C8F64 2718D290 */ addiu $t8, %lo(D_8012D290) # addiu $t8, $t8, -0x2d70 -/* B40108 800C8F68 51E0000C */ beql $t7, $zero, .L800C8F9C -/* B4010C 800C8F6C 8E680230 */ lw $t0, 0x230($s3) -/* B40110 800C8F70 8F190000 */ lw $t9, ($t8) -/* B40114 800C8F74 3C048014 */ lui $a0, %hi(D_8014607C) # $a0, 0x8014 -/* B40118 800C8F78 13200003 */ beqz $t9, .L800C8F88 -/* B4011C 800C8F7C 00000000 */ nop -/* B40120 800C8F80 0C00084C */ jal osSyncPrintf -/* B40124 800C8F84 2484607C */ addiu $a0, %lo(D_8014607C) # addiu $a0, $a0, 0x607c -.L800C8F88: -/* B40128 800C8F88 0C032244 */ jal func_800C8910 -/* B4012C 800C8F8C 02602025 */ move $a0, $s3 -/* B40130 800C8F90 1000001B */ b .L800C9000 -/* B40134 800C8F94 8FBF002C */ lw $ra, 0x2c($sp) -/* B40138 800C8F98 8E680230 */ lw $t0, 0x230($s3) -.L800C8F9C: -/* B4013C 800C8F9C 8E6B0234 */ lw $t3, 0x234($s3) -/* B40140 800C8FA0 27A60040 */ addiu $a2, $sp, 0x40 -/* B40144 800C8FA4 2D090001 */ sltiu $t1, $t0, 1 -/* B40148 800C8FA8 00095040 */ sll $t2, $t1, 1 -/* B4014C 800C8FAC 2D6C0001 */ sltiu $t4, $t3, 1 -/* B40150 800C8FB0 014C8025 */ or $s0, $t2, $t4 -/* B40154 800C8FB4 0C0322A5 */ jal func_800C8A94 -/* B40158 800C8FB8 02003825 */ move $a3, $s0 -/* B4015C 800C8FBC 10500004 */ beq $v0, $s0, .L800C8FD0 -/* B40160 800C8FC0 02602025 */ move $a0, $s3 -/* B40164 800C8FC4 8FA50044 */ lw $a1, 0x44($sp) -/* B40168 800C8FC8 0C03232E */ jal func_800C8CB8 -/* B4016C 800C8FCC 8FA60040 */ lw $a2, 0x40($sp) -.L800C8FD0: -/* B40170 800C8FD0 3C0D8013 */ lui $t5, %hi(D_8012D290) # $t5, 0x8013 -/* B40174 800C8FD4 25ADD290 */ addiu $t5, %lo(D_8012D290) # addiu $t5, $t5, -0x2d70 -/* B40178 800C8FD8 8DAE0000 */ lw $t6, ($t5) -/* B4017C 800C8FDC 3C048014 */ lui $a0, %hi(D_80146088) # $a0, 0x8014 -/* B40180 800C8FE0 24846088 */ addiu $a0, %lo(D_80146088) # addiu $a0, $a0, 0x6088 -/* B40184 800C8FE4 11C00005 */ beqz $t6, .L800C8FFC -/* B40188 800C8FE8 02602825 */ move $a1, $s3 -/* B4018C 800C8FEC 8FA60044 */ lw $a2, 0x44($sp) -/* B40190 800C8FF0 8FA70040 */ lw $a3, 0x40($sp) -/* B40194 800C8FF4 0C00084C */ jal osSyncPrintf -/* B40198 800C8FF8 AFB00010 */ sw $s0, 0x10($sp) -.L800C8FFC: -/* B4019C 800C8FFC 8FBF002C */ lw $ra, 0x2c($sp) -.L800C9000: -/* B401A0 800C9000 8FB0001C */ lw $s0, 0x1c($sp) -/* B401A4 800C9004 8FB10020 */ lw $s1, 0x20($sp) -/* B401A8 800C9008 8FB20024 */ lw $s2, 0x24($sp) -/* B401AC 800C900C 8FB30028 */ lw $s3, 0x28($sp) -/* B401B0 800C9010 03E00008 */ jr $ra -/* B401B4 800C9014 27BD0048 */ addiu $sp, $sp, 0x48 - diff --git a/asm/non_matchings/code/sched/func_800C9018.s b/asm/non_matchings/code/sched/func_800C9018.s deleted file mode 100644 index 0a87d55fc3..0000000000 --- a/asm/non_matchings/code/sched/func_800C9018.s +++ /dev/null @@ -1,128 +0,0 @@ -.rdata -glabel D_801460B0 - .asciz "%08d:scHandleRetrace %08x\n" - .balign 4 - -glabel D_801460CC - .asciz "%08x %08x %08x %d\n" - .balign 4 - -.text -glabel func_800C9018 -/* B401B8 800C9018 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* B401BC 800C901C 3C0E8013 */ lui $t6, %hi(D_8012D290) # $t6, 0x8013 -/* B401C0 800C9020 AFBF0024 */ sw $ra, 0x24($sp) -/* B401C4 800C9024 AFB00020 */ sw $s0, 0x20($sp) -/* B401C8 800C9028 25CED290 */ addiu $t6, %lo(D_8012D290) # addiu $t6, $t6, -0x2d70 -/* B401CC 800C902C 8DCF0000 */ lw $t7, ($t6) -/* B401D0 800C9030 00808025 */ move $s0, $a0 -/* B401D4 800C9034 11E00015 */ beqz $t7, .L800C908C -/* B401D8 800C9038 00000000 */ nop -/* B401DC 800C903C 0C001A78 */ jal osGetTime -/* B401E0 800C9040 00000000 */ nop -/* B401E4 800C9044 00402025 */ move $a0, $v0 -/* B401E8 800C9048 00602825 */ move $a1, $v1 -/* B401EC 800C904C 24060000 */ li $a2, 0 -/* B401F0 800C9050 0C000E1E */ jal __ll_mul -/* B401F4 800C9054 24070040 */ li $a3, 64 -/* B401F8 800C9058 00402025 */ move $a0, $v0 -/* B401FC 800C905C 00602825 */ move $a1, $v1 -/* B40200 800C9060 24060000 */ li $a2, 0 -/* B40204 800C9064 0C000DDE */ jal __ull_div -/* B40208 800C9068 24070BB8 */ li $a3, 3000 -/* B4020C 800C906C AFA20048 */ sw $v0, 0x48($sp) -/* B40210 800C9070 0C0419D8 */ jal osViGetCurrentFramebuffer -/* B40214 800C9074 AFA3004C */ sw $v1, 0x4c($sp) -/* B40218 800C9078 3C048014 */ lui $a0, %hi(D_801460B0) # $a0, 0x8014 -/* B4021C 800C907C 248460B0 */ addiu $a0, %lo(D_801460B0) # addiu $a0, $a0, 0x60b0 -/* B40220 800C9080 8FA5004C */ lw $a1, 0x4c($sp) -/* B40224 800C9084 0C00084C */ jal osSyncPrintf -/* B40228 800C9088 00403025 */ move $a2, $v0 -.L800C908C: -/* B4022C 800C908C 0C0002D2 */ jal ViConfig_UpdateBlack -/* B40230 800C9090 00000000 */ nop -/* B40234 800C9094 8E090238 */ lw $t1, 0x238($s0) -/* B40238 800C9098 252A0001 */ addiu $t2, $t1, 1 -/* B4023C 800C909C 0C0419D8 */ jal osViGetCurrentFramebuffer -/* B40240 800C90A0 AE0A0238 */ sw $t2, 0x238($s0) -/* B40244 800C90A4 8E050244 */ lw $a1, 0x244($s0) -/* B40248 800C90A8 00004025 */ move $t0, $zero -/* B4024C 800C90AC 10A00003 */ beqz $a1, .L800C90BC -/* B40250 800C90B0 00000000 */ nop -/* B40254 800C90B4 10000001 */ b .L800C90BC -/* B40258 800C90B8 8CA80004 */ lw $t0, 4($a1) -.L800C90BC: -/* B4025C 800C90BC 5502000F */ bnel $t0, $v0, .L800C90FC -/* B40260 800C90C0 8E020240 */ lw $v0, 0x240($s0) -/* B40264 800C90C4 8E020240 */ lw $v0, 0x240($s0) -/* B40268 800C90C8 10400003 */ beqz $v0, .L800C90D8 -/* B4026C 800C90CC 00000000 */ nop -/* B40270 800C90D0 A0400010 */ sb $zero, 0x10($v0) -/* B40274 800C90D4 8E050244 */ lw $a1, 0x244($s0) -.L800C90D8: -/* B40278 800C90D8 50A00004 */ beql $a1, $zero, .L800C90EC -/* B4027C 800C90DC 8E0B0248 */ lw $t3, 0x248($s0) -/* B40280 800C90E0 A0A00010 */ sb $zero, 0x10($a1) -/* B40284 800C90E4 8E050244 */ lw $a1, 0x244($s0) -/* B40288 800C90E8 8E0B0248 */ lw $t3, 0x248($s0) -.L800C90EC: -/* B4028C 800C90EC AE050240 */ sw $a1, 0x240($s0) -/* B40290 800C90F0 AE000248 */ sw $zero, 0x248($s0) -/* B40294 800C90F4 AE0B0244 */ sw $t3, 0x244($s0) -/* B40298 800C90F8 8E020240 */ lw $v0, 0x240($s0) -.L800C90FC: -/* B4029C 800C90FC 1040000E */ beqz $v0, .L800C9138 -/* B402A0 800C9100 00000000 */ nop -/* B402A4 800C9104 80430012 */ lb $v1, 0x12($v0) -/* B402A8 800C9108 18600004 */ blez $v1, .L800C911C -/* B402AC 800C910C 246CFFFF */ addiu $t4, $v1, -1 -/* B402B0 800C9110 A04C0012 */ sb $t4, 0x12($v0) -/* B402B4 800C9114 8E0D0240 */ lw $t5, 0x240($s0) -/* B402B8 800C9118 81A30012 */ lb $v1, 0x12($t5) -.L800C911C: -/* B402BC 800C911C 1C600006 */ bgtz $v1, .L800C9138 -/* B402C0 800C9120 00000000 */ nop -/* B402C4 800C9124 8E050244 */ lw $a1, 0x244($s0) -/* B402C8 800C9128 10A00003 */ beqz $a1, .L800C9138 -/* B402CC 800C912C 00000000 */ nop -/* B402D0 800C9130 0C032139 */ jal func_800C84E4 -/* B402D4 800C9134 02002025 */ move $a0, $s0 -.L800C9138: -/* B402D8 800C9138 3C0E8013 */ lui $t6, %hi(D_8012D290) # $t6, 0x8013 -/* B402DC 800C913C 25CED290 */ addiu $t6, %lo(D_8012D290) # addiu $t6, $t6, -0x2d70 -/* B402E0 800C9140 8DCF0000 */ lw $t7, ($t6) -/* B402E4 800C9144 11E00016 */ beqz $t7, .L800C91A0 -/* B402E8 800C9148 00000000 */ nop -/* B402EC 800C914C 0C0419D8 */ jal osViGetCurrentFramebuffer -/* B402F0 800C9150 00000000 */ nop -/* B402F4 800C9154 0C0011D0 */ jal osViGetNextFramebuffer -/* B402F8 800C9158 AFA2002C */ sw $v0, 0x2c($sp) -/* B402FC 800C915C 8E050244 */ lw $a1, 0x244($s0) -/* B40300 800C9160 3C048014 */ lui $a0, %hi(D_801460CC) # $a0, 0x8014 -/* B40304 800C9164 248460CC */ addiu $a0, %lo(D_801460CC) # addiu $a0, $a0, 0x60cc -/* B40308 800C9168 10A00003 */ beqz $a1, .L800C9178 -/* B4030C 800C916C 00403025 */ move $a2, $v0 -/* B40310 800C9170 10000002 */ b .L800C917C -/* B40314 800C9174 8CA70004 */ lw $a3, 4($a1) -.L800C9178: -/* B40318 800C9178 00003825 */ move $a3, $zero -.L800C917C: -/* B4031C 800C917C 8E020240 */ lw $v0, 0x240($s0) -/* B40320 800C9180 8FA5002C */ lw $a1, 0x2c($sp) -/* B40324 800C9184 00004025 */ move $t0, $zero -/* B40328 800C9188 10400003 */ beqz $v0, .L800C9198 -/* B4032C 800C918C 00000000 */ nop -/* B40330 800C9190 10000001 */ b .L800C9198 -/* B40334 800C9194 80480012 */ lb $t0, 0x12($v0) -.L800C9198: -/* B40338 800C9198 0C00084C */ jal osSyncPrintf -/* B4033C 800C919C AFA80010 */ sw $t0, 0x10($sp) -.L800C91A0: -/* B40340 800C91A0 0C0323B7 */ jal func_800C8EDC -/* B40344 800C91A4 02002025 */ move $a0, $s0 -/* B40348 800C91A8 8FBF0024 */ lw $ra, 0x24($sp) -/* B4034C 800C91AC 8FB00020 */ lw $s0, 0x20($sp) -/* B40350 800C91B0 27BD0058 */ addiu $sp, $sp, 0x58 -/* B40354 800C91B4 03E00008 */ jr $ra -/* B40358 800C91B8 00000000 */ nop - diff --git a/asm/non_matchings/code/sched/func_800C91BC.s b/asm/non_matchings/code/sched/func_800C91BC.s deleted file mode 100644 index e27d3ca984..0000000000 --- a/asm/non_matchings/code/sched/func_800C91BC.s +++ /dev/null @@ -1,230 +0,0 @@ -.rdata -glabel D_801460E0 - .asciz "sc->curRSPTask" - .balign 4 - -glabel D_801460F0 - .asciz "../sched.c" - .balign 4 - -glabel D_801460FC - .asciz "RSP DONE %d %d" - .balign 4 - -glabel D_8014610C - .asciz "[YIELDED]\n" - .balign 4 - -glabel D_80146118 - .asciz "[NOT YIELDED]\n" - .balign 4 - -glabel D_80146128 - .asciz "SP sc:%08x sp:%08x dp:%08x state:%x\n" - .balign 4 - -.text -glabel func_800C91BC -/* B4035C 800C91BC 27BDFFB0 */ addiu $sp, $sp, -0x50 -/* B40360 800C91C0 AFBF0024 */ sw $ra, 0x24($sp) -/* B40364 800C91C4 AFB00020 */ sw $s0, 0x20($sp) -/* B40368 800C91C8 AFA00048 */ sw $zero, 0x48($sp) -/* B4036C 800C91CC AFA00044 */ sw $zero, 0x44($sp) -/* B40370 800C91D0 8C820230 */ lw $v0, 0x230($a0) -/* B40374 800C91D4 00808025 */ move $s0, $a0 -/* B40378 800C91D8 3C048014 */ lui $a0, %hi(D_801460E0) # $a0, 0x8014 -/* B4037C 800C91DC 14400006 */ bnez $v0, .L800C91F8 -/* B40380 800C91E0 248460E0 */ addiu $a0, %lo(D_801460E0) # addiu $a0, $a0, 0x60e0 -/* B40384 800C91E4 3C058014 */ lui $a1, %hi(D_801460F0) # $a1, 0x8014 -/* B40388 800C91E8 24A560F0 */ addiu $a1, %lo(D_801460F0) # addiu $a1, $a1, 0x60f0 -/* B4038C 800C91EC 0C0007FC */ jal __assert -/* B40390 800C91F0 24060333 */ li $a2, 819 -/* B40394 800C91F4 8E020230 */ lw $v0, 0x230($s0) -.L800C91F8: -/* B40398 800C91F8 8C430010 */ lw $v1, 0x10($v0) -/* B4039C 800C91FC 24010002 */ li $at, 2 -/* B403A0 800C9200 54610019 */ bnel $v1, $at, .L800C9268 -/* B403A4 800C9204 24010001 */ li $at, 1 -/* B403A8 800C9208 0C001A78 */ jal osGetTime -/* B403AC 800C920C 00000000 */ nop -/* B403B0 800C9210 3C0F8017 */ lui $t7, %hi(D_8016A50C) # $t7, 0x8017 -/* B403B4 800C9214 3C088017 */ lui $t0, %hi(D_8016A560) # $t0, 0x8017 -/* B403B8 800C9218 8DEFA50C */ lw $t7, %lo(D_8016A50C)($t7) -/* B403BC 800C921C 2508A560 */ addiu $t0, %lo(D_8016A560) # addiu $t0, $t0, -0x5aa0 -/* B403C0 800C9220 3C0E8017 */ lui $t6, %hi(D_8016A508) # $t6, 0x8017 -/* B403C4 800C9224 8DCEA508 */ lw $t6, %lo(D_8016A508)($t6) -/* B403C8 800C9228 8D0A0000 */ lw $t2, ($t0) -/* B403CC 800C922C 8D0B0004 */ lw $t3, 4($t0) -/* B403D0 800C9230 006F082B */ sltu $at, $v1, $t7 -/* B403D4 800C9234 006FC823 */ subu $t9, $v1, $t7 -/* B403D8 800C9238 004EC023 */ subu $t8, $v0, $t6 -/* B403DC 800C923C 0301C023 */ subu $t8, $t8, $at -/* B403E0 800C9240 032B6821 */ addu $t5, $t9, $t3 -/* B403E4 800C9244 01AB082B */ sltu $at, $t5, $t3 -/* B403E8 800C9248 00386021 */ addu $t4, $at, $t8 -/* B403EC 800C924C 3C018017 */ lui $at, %hi(D_8016A560) # $at, 0x8017 -/* B403F0 800C9250 018A6021 */ addu $t4, $t4, $t2 -/* B403F4 800C9254 AC2CA560 */ sw $t4, %lo(D_8016A560)($at) -/* B403F8 800C9258 3C018017 */ lui $at, %hi(D_8016A564) # $at, 0x8017 -/* B403FC 800C925C 10000031 */ b .L800C9324 -/* B40400 800C9260 AC2DA564 */ sw $t5, %lo(D_8016A564)($at) -/* B40404 800C9264 24010001 */ li $at, 1 -.L800C9268: -/* B40408 800C9268 14610018 */ bne $v1, $at, .L800C92CC -/* B4040C 800C926C 00000000 */ nop -/* B40410 800C9270 0C001A78 */ jal osGetTime -/* B40414 800C9274 00000000 */ nop -/* B40418 800C9278 3C0F8017 */ lui $t7, %hi(D_8016A504) # $t7, 0x8017 -/* B4041C 800C927C 3C188017 */ lui $t8, %hi(D_8016A568) # $t8, 0x8017 -/* B40420 800C9280 8DEFA504 */ lw $t7, %lo(D_8016A504)($t7) -/* B40424 800C9284 2718A568 */ addiu $t8, %lo(D_8016A568) # addiu $t8, $t8, -0x5a98 -/* B40428 800C9288 3C0E8017 */ lui $t6, %hi(D_8016A500) # $t6, 0x8017 -/* B4042C 800C928C 8DCEA500 */ lw $t6, %lo(D_8016A500)($t6) -/* B40430 800C9290 8F0A0000 */ lw $t2, ($t8) -/* B40434 800C9294 8F0B0004 */ lw $t3, 4($t8) -/* B40438 800C9298 006F082B */ sltu $at, $v1, $t7 -/* B4043C 800C929C 006F4823 */ subu $t1, $v1, $t7 -/* B40440 800C92A0 004E4023 */ subu $t0, $v0, $t6 -/* B40444 800C92A4 01014023 */ subu $t0, $t0, $at -/* B40448 800C92A8 012B6821 */ addu $t5, $t1, $t3 -/* B4044C 800C92AC 01AB082B */ sltu $at, $t5, $t3 -/* B40450 800C92B0 00286021 */ addu $t4, $at, $t0 -/* B40454 800C92B4 3C018017 */ lui $at, %hi(D_8016A568) # $at, 0x8017 -/* B40458 800C92B8 018A6021 */ addu $t4, $t4, $t2 -/* B4045C 800C92BC AC2CA568 */ sw $t4, %lo(D_8016A568)($at) -/* B40460 800C92C0 3C018017 */ lui $at, %hi(D_8016A56C) # $at, 0x8017 -/* B40464 800C92C4 10000017 */ b .L800C9324 -/* B40468 800C92C8 AC2DA56C */ sw $t5, %lo(D_8016A56C)($at) -.L800C92CC: -/* B4046C 800C92CC 0C001A78 */ jal osGetTime -/* B40470 800C92D0 00000000 */ nop -/* B40474 800C92D4 3C0F8017 */ lui $t7, %hi(D_8016A514) # $t7, 0x8017 -/* B40478 800C92D8 3C088017 */ lui $t0, %hi(D_8016A570) # $t0, 0x8017 -/* B4047C 800C92DC 8DEFA514 */ lw $t7, %lo(D_8016A514)($t7) -/* B40480 800C92E0 2508A570 */ addiu $t0, %lo(D_8016A570) # addiu $t0, $t0, -0x5a90 -/* B40484 800C92E4 3C0E8017 */ lui $t6, %hi(D_8016A510) # $t6, 0x8017 -/* B40488 800C92E8 8DCEA510 */ lw $t6, %lo(D_8016A510)($t6) -/* B4048C 800C92EC 8D0A0000 */ lw $t2, ($t0) -/* B40490 800C92F0 8D0B0004 */ lw $t3, 4($t0) -/* B40494 800C92F4 006F082B */ sltu $at, $v1, $t7 -/* B40498 800C92F8 006FC823 */ subu $t9, $v1, $t7 -/* B4049C 800C92FC 004EC023 */ subu $t8, $v0, $t6 -/* B404A0 800C9300 0301C023 */ subu $t8, $t8, $at -/* B404A4 800C9304 032B6821 */ addu $t5, $t9, $t3 -/* B404A8 800C9308 01AB082B */ sltu $at, $t5, $t3 -/* B404AC 800C930C 00386021 */ addu $t4, $at, $t8 -/* B404B0 800C9310 3C018017 */ lui $at, %hi(D_8016A570) # $at, 0x8017 -/* B404B4 800C9314 018A6021 */ addu $t4, $t4, $t2 -/* B404B8 800C9318 AC2CA570 */ sw $t4, %lo(D_8016A570)($at) -/* B404BC 800C931C 3C018017 */ lui $at, %hi(D_8016A574) # $at, 0x8017 -/* B404C0 800C9320 AC2DA574 */ sw $t5, %lo(D_8016A574)($at) -.L800C9324: -/* B404C4 800C9324 8E070230 */ lw $a3, 0x230($s0) -/* B404C8 800C9328 3C098013 */ lui $t1, %hi(D_8012D290) # $t1, 0x8013 -/* B404CC 800C932C AE000230 */ sw $zero, 0x230($s0) -/* B404D0 800C9330 2529D290 */ addiu $t1, %lo(D_8012D290) # addiu $t1, $t1, -0x2d70 -/* B404D4 800C9334 8D2E0000 */ lw $t6, ($t1) -/* B404D8 800C9338 24E40010 */ addiu $a0, $a3, 0x10 -/* B404DC 800C933C 51C0000C */ beql $t6, $zero, .L800C9370 -/* B404E0 800C9340 8CEF0004 */ lw $t7, 4($a3) -/* B404E4 800C9344 0C040F70 */ jal osSpTaskYielded -/* B404E8 800C9348 AFA7004C */ sw $a3, 0x4c($sp) -/* B404EC 800C934C 8FA7004C */ lw $a3, 0x4c($sp) -/* B404F0 800C9350 3C048014 */ lui $a0, %hi(D_801460FC) # $a0, 0x8014 -/* B404F4 800C9354 248460FC */ addiu $a0, %lo(D_801460FC) # addiu $a0, $a0, 0x60fc -/* B404F8 800C9358 8CE50004 */ lw $a1, 4($a3) -/* B404FC 800C935C 00403025 */ move $a2, $v0 -/* B40500 800C9360 0C00084C */ jal osSyncPrintf -/* B40504 800C9364 30A50010 */ andi $a1, $a1, 0x10 -/* B40508 800C9368 8FA7004C */ lw $a3, 0x4c($sp) -/* B4050C 800C936C 8CEF0004 */ lw $t7, 4($a3) -.L800C9370: -/* B40510 800C9370 24E40010 */ addiu $a0, $a3, 0x10 -/* B40514 800C9374 31E80010 */ andi $t0, $t7, 0x10 -/* B40518 800C9378 1100001A */ beqz $t0, .L800C93E4 -/* B4051C 800C937C 00000000 */ nop -/* B40520 800C9380 0C040F70 */ jal osSpTaskYielded -/* B40524 800C9384 AFA7004C */ sw $a3, 0x4c($sp) -/* B40528 800C9388 10400016 */ beqz $v0, .L800C93E4 -/* B4052C 800C938C 8FA7004C */ lw $a3, 0x4c($sp) -/* B40530 800C9390 3C188013 */ lui $t8, %hi(D_8012D290) # $t8, 0x8013 -/* B40534 800C9394 2718D290 */ addiu $t8, %lo(D_8012D290) # addiu $t8, $t8, -0x2d70 -/* B40538 800C9398 8F190000 */ lw $t9, ($t8) -/* B4053C 800C939C 3C048014 */ lui $a0, %hi(D_8014610C) # $a0, 0x8014 -/* B40540 800C93A0 2484610C */ addiu $a0, %lo(D_8014610C) # addiu $a0, $a0, 0x610c -/* B40544 800C93A4 53200005 */ beql $t9, $zero, .L800C93BC -/* B40548 800C93A8 8CEA0004 */ lw $t2, 4($a3) -/* B4054C 800C93AC 0C00084C */ jal osSyncPrintf -/* B40550 800C93B0 AFA7004C */ sw $a3, 0x4c($sp) -/* B40554 800C93B4 8FA7004C */ lw $a3, 0x4c($sp) -/* B40558 800C93B8 8CEA0004 */ lw $t2, 4($a3) -.L800C93BC: -/* B4055C 800C93BC 354B0020 */ ori $t3, $t2, 0x20 -/* B40560 800C93C0 ACEB0004 */ sw $t3, 4($a3) -/* B40564 800C93C4 8E0C0224 */ lw $t4, 0x224($s0) -/* B40568 800C93C8 ACEC0000 */ sw $t4, ($a3) -/* B4056C 800C93CC 8E0D022C */ lw $t5, 0x22c($s0) -/* B40570 800C93D0 AE070224 */ sw $a3, 0x224($s0) -/* B40574 800C93D4 55A00015 */ bnezl $t5, .L800C942C -/* B40578 800C93D8 8E180230 */ lw $t8, 0x230($s0) -/* B4057C 800C93DC 10000012 */ b .L800C9428 -/* B40580 800C93E0 AE07022C */ sw $a3, 0x22c($s0) -.L800C93E4: -/* B40584 800C93E4 3C098013 */ lui $t1, %hi(D_8012D290) # $t1, 0x8013 -/* B40588 800C93E8 2529D290 */ addiu $t1, %lo(D_8012D290) # addiu $t1, $t1, -0x2d70 -/* B4058C 800C93EC 8D2E0000 */ lw $t6, ($t1) -/* B40590 800C93F0 3C048014 */ lui $a0, %hi(D_80146118) # $a0, 0x8014 -/* B40594 800C93F4 24846118 */ addiu $a0, %lo(D_80146118) # addiu $a0, $a0, 0x6118 -/* B40598 800C93F8 51C00005 */ beql $t6, $zero, .L800C9410 -/* B4059C 800C93FC 8CEF0004 */ lw $t7, 4($a3) -/* B405A0 800C9400 0C00084C */ jal osSyncPrintf -/* B405A4 800C9404 AFA7004C */ sw $a3, 0x4c($sp) -/* B405A8 800C9408 8FA7004C */ lw $a3, 0x4c($sp) -/* B405AC 800C940C 8CEF0004 */ lw $t7, 4($a3) -.L800C9410: -/* B405B0 800C9410 2401FFFD */ li $at, -3 -/* B405B4 800C9414 02002025 */ move $a0, $s0 -/* B405B8 800C9418 01E14024 */ and $t0, $t7, $at -/* B405BC 800C941C ACE80004 */ sw $t0, 4($a3) -/* B405C0 800C9420 0C032310 */ jal func_800C8C40 -/* B405C4 800C9424 00E02825 */ move $a1, $a3 -.L800C9428: -/* B405C8 800C9428 8E180230 */ lw $t8, 0x230($s0) -.L800C942C: -/* B405CC 800C942C 8E0B0234 */ lw $t3, 0x234($s0) -/* B405D0 800C9430 02002025 */ move $a0, $s0 -/* B405D4 800C9434 2F190001 */ sltiu $t9, $t8, 1 -/* B405D8 800C9438 00195040 */ sll $t2, $t9, 1 -/* B405DC 800C943C 2D6C0001 */ sltiu $t4, $t3, 1 -/* B405E0 800C9440 014C3825 */ or $a3, $t2, $t4 -/* B405E4 800C9444 AFA70040 */ sw $a3, 0x40($sp) -/* B405E8 800C9448 27A50048 */ addiu $a1, $sp, 0x48 -/* B405EC 800C944C 0C0322A5 */ jal func_800C8A94 -/* B405F0 800C9450 27A60044 */ addiu $a2, $sp, 0x44 -/* B405F4 800C9454 8FAD0040 */ lw $t5, 0x40($sp) -/* B405F8 800C9458 02002025 */ move $a0, $s0 -/* B405FC 800C945C 8FA50048 */ lw $a1, 0x48($sp) -/* B40600 800C9460 104D0003 */ beq $v0, $t5, .L800C9470 -/* B40604 800C9464 00000000 */ nop -/* B40608 800C9468 0C03232E */ jal func_800C8CB8 -/* B4060C 800C946C 8FA60044 */ lw $a2, 0x44($sp) -.L800C9470: -/* B40610 800C9470 3C098013 */ lui $t1, %hi(D_8012D290) # $t1, 0x8013 -/* B40614 800C9474 2529D290 */ addiu $t1, %lo(D_8012D290) # addiu $t1, $t1, -0x2d70 -/* B40618 800C9478 8D2E0000 */ lw $t6, ($t1) -/* B4061C 800C947C 3C048014 */ lui $a0, %hi(D_80146128) # $a0, 0x8014 -/* B40620 800C9480 24846128 */ addiu $a0, %lo(D_80146128) # addiu $a0, $a0, 0x6128 -/* B40624 800C9484 11C00006 */ beqz $t6, .L800C94A0 -/* B40628 800C9488 02002825 */ move $a1, $s0 -/* B4062C 800C948C 8FAF0040 */ lw $t7, 0x40($sp) -/* B40630 800C9490 8FA60048 */ lw $a2, 0x48($sp) -/* B40634 800C9494 8FA70044 */ lw $a3, 0x44($sp) -/* B40638 800C9498 0C00084C */ jal osSyncPrintf -/* B4063C 800C949C AFAF0010 */ sw $t7, 0x10($sp) -.L800C94A0: -/* B40640 800C94A0 8FBF0024 */ lw $ra, 0x24($sp) -/* B40644 800C94A4 8FB00020 */ lw $s0, 0x20($sp) -/* B40648 800C94A8 27BD0050 */ addiu $sp, $sp, 0x50 -/* B4064C 800C94AC 03E00008 */ jr $ra -/* B40650 800C94B0 00000000 */ nop - diff --git a/asm/non_matchings/code/sched/func_800C94B4.s b/asm/non_matchings/code/sched/func_800C94B4.s deleted file mode 100644 index dd3a2ed4f1..0000000000 --- a/asm/non_matchings/code/sched/func_800C94B4.s +++ /dev/null @@ -1,109 +0,0 @@ -.rdata -glabel D_80146150 - .asciz "sc->curRDPTask" - .balign 4 - -glabel D_80146160 - .asciz "../sched.c" - .balign 4 - -glabel D_8014616C - .asciz "sc->curRDPTask->list.t.type == M_GFXTASK" - .balign 4 - -glabel D_80146198 - .asciz "../sched.c" - .balign 4 - -glabel D_801461A4 - .asciz "DP sc:%08x sp:%08x dp:%08x state:%x\n" - .balign 4 - -.text -glabel func_800C94B4 -/* B40654 800C94B4 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B40658 800C94B8 AFBF0024 */ sw $ra, 0x24($sp) -/* B4065C 800C94BC AFB00020 */ sw $s0, 0x20($sp) -/* B40660 800C94C0 00808025 */ move $s0, $a0 -/* B40664 800C94C4 AFA00038 */ sw $zero, 0x38($sp) -/* B40668 800C94C8 0C001A78 */ jal osGetTime -/* B4066C 800C94CC AFA00034 */ sw $zero, 0x34($sp) -/* B40670 800C94D0 3C0E8017 */ lui $t6, %hi(D_8016A518) # $t6, 0x8017 -/* B40674 800C94D4 3C0F8017 */ lui $t7, %hi(D_8016A51C) # $t7, 0x8017 -/* B40678 800C94D8 8DEFA51C */ lw $t7, %lo(D_8016A51C)($t7) -/* B4067C 800C94DC 8DCEA518 */ lw $t6, %lo(D_8016A518)($t6) -/* B40680 800C94E0 3C088017 */ lui $t0, %hi(D_8016A580) # $t0, 0x8017 -/* B40684 800C94E4 006F082B */ sltu $at, $v1, $t7 -/* B40688 800C94E8 004EC023 */ subu $t8, $v0, $t6 -/* B4068C 800C94EC 0301C023 */ subu $t8, $t8, $at -/* B40690 800C94F0 2508A580 */ addiu $t0, %lo(D_8016A580) # addiu $t0, $t0, -0x5a80 -/* B40694 800C94F4 AD180000 */ sw $t8, ($t0) -/* B40698 800C94F8 006FC823 */ subu $t9, $v1, $t7 -/* B4069C 800C94FC AD190004 */ sw $t9, 4($t0) -/* B406A0 800C9500 8E060234 */ lw $a2, 0x234($s0) -/* B406A4 800C9504 3C048014 */ lui $a0, %hi(D_80146150) # $a0, 0x8014 -/* B406A8 800C9508 24846150 */ addiu $a0, %lo(D_80146150) # addiu $a0, $a0, 0x6150 -/* B406AC 800C950C 14C00005 */ bnez $a2, .L800C9524 -/* B406B0 800C9510 3C058014 */ lui $a1, %hi(D_80146160) # $a1, 0x8014 -/* B406B4 800C9514 24A56160 */ addiu $a1, %lo(D_80146160) # addiu $a1, $a1, 0x6160 -/* B406B8 800C9518 0C0007FC */ jal __assert -/* B406BC 800C951C 2406036E */ li $a2, 878 -/* B406C0 800C9520 8E060234 */ lw $a2, 0x234($s0) -.L800C9524: -/* B406C4 800C9524 8CC90010 */ lw $t1, 0x10($a2) -/* B406C8 800C9528 24010001 */ li $at, 1 -/* B406CC 800C952C 3C048014 */ lui $a0, %hi(D_8014616C) # $a0, 0x8014 -/* B406D0 800C9530 11210006 */ beq $t1, $at, .L800C954C -/* B406D4 800C9534 2484616C */ addiu $a0, %lo(D_8014616C) # addiu $a0, $a0, 0x616c -/* B406D8 800C9538 3C058014 */ lui $a1, %hi(D_80146198) # $a1, 0x8014 -/* B406DC 800C953C 24A56198 */ addiu $a1, %lo(D_80146198) # addiu $a1, $a1, 0x6198 -/* B406E0 800C9540 0C0007FC */ jal __assert -/* B406E4 800C9544 2406036F */ li $a2, 879 -/* B406E8 800C9548 8E060234 */ lw $a2, 0x234($s0) -.L800C954C: -/* B406EC 800C954C AE000234 */ sw $zero, 0x234($s0) -/* B406F0 800C9550 8CCA0004 */ lw $t2, 4($a2) -/* B406F4 800C9554 2401FFFE */ li $at, -2 -/* B406F8 800C9558 00C02825 */ move $a1, $a2 -/* B406FC 800C955C 01415824 */ and $t3, $t2, $at -/* B40700 800C9560 ACCB0004 */ sw $t3, 4($a2) -/* B40704 800C9564 0C032310 */ jal func_800C8C40 -/* B40708 800C9568 02002025 */ move $a0, $s0 -/* B4070C 800C956C 8E0C0230 */ lw $t4, 0x230($s0) -/* B40710 800C9570 8E0F0234 */ lw $t7, 0x234($s0) -/* B40714 800C9574 02002025 */ move $a0, $s0 -/* B40718 800C9578 2D8D0001 */ sltiu $t5, $t4, 1 -/* B4071C 800C957C 000D7040 */ sll $t6, $t5, 1 -/* B40720 800C9580 2DF80001 */ sltiu $t8, $t7, 1 -/* B40724 800C9584 01D83825 */ or $a3, $t6, $t8 -/* B40728 800C9588 AFA70030 */ sw $a3, 0x30($sp) -/* B4072C 800C958C 27A50038 */ addiu $a1, $sp, 0x38 -/* B40730 800C9590 0C0322A5 */ jal func_800C8A94 -/* B40734 800C9594 27A60034 */ addiu $a2, $sp, 0x34 -/* B40738 800C9598 8FB90030 */ lw $t9, 0x30($sp) -/* B4073C 800C959C 02002025 */ move $a0, $s0 -/* B40740 800C95A0 8FA50038 */ lw $a1, 0x38($sp) -/* B40744 800C95A4 10590003 */ beq $v0, $t9, .L800C95B4 -/* B40748 800C95A8 00000000 */ nop -/* B4074C 800C95AC 0C03232E */ jal func_800C8CB8 -/* B40750 800C95B0 8FA60034 */ lw $a2, 0x34($sp) -.L800C95B4: -/* B40754 800C95B4 3C088013 */ lui $t0, %hi(D_8012D290) # $t0, 0x8013 -/* B40758 800C95B8 2508D290 */ addiu $t0, %lo(D_8012D290) # addiu $t0, $t0, -0x2d70 -/* B4075C 800C95BC 8D090000 */ lw $t1, ($t0) -/* B40760 800C95C0 3C048014 */ lui $a0, %hi(D_801461A4) # $a0, 0x8014 -/* B40764 800C95C4 248461A4 */ addiu $a0, %lo(D_801461A4) # addiu $a0, $a0, 0x61a4 -/* B40768 800C95C8 11200006 */ beqz $t1, .L800C95E4 -/* B4076C 800C95CC 02002825 */ move $a1, $s0 -/* B40770 800C95D0 8FAA0030 */ lw $t2, 0x30($sp) -/* B40774 800C95D4 8FA60038 */ lw $a2, 0x38($sp) -/* B40778 800C95D8 8FA70034 */ lw $a3, 0x34($sp) -/* B4077C 800C95DC 0C00084C */ jal osSyncPrintf -/* B40780 800C95E0 AFAA0010 */ sw $t2, 0x10($sp) -.L800C95E4: -/* B40784 800C95E4 8FBF0024 */ lw $ra, 0x24($sp) -/* B40788 800C95E8 8FB00020 */ lw $s0, 0x20($sp) -/* B4078C 800C95EC 27BD0040 */ addiu $sp, $sp, 0x40 -/* B40790 800C95F0 03E00008 */ jr $ra -/* B40794 800C95F4 00000000 */ nop - diff --git a/asm/non_matchings/code/sched/func_800C9644.s b/asm/non_matchings/code/sched/func_800C9644.s deleted file mode 100644 index 4090a32ae4..0000000000 --- a/asm/non_matchings/code/sched/func_800C9644.s +++ /dev/null @@ -1,172 +0,0 @@ -.rdata -glabel D_801461E0 - .asciz "%08d:待機中\n" - # EUC-JP: 待機中 | Waiting - .balign 4 - -glabel D_801461F0 - .asciz "%08d:ENTRY_MSG\n" - .balign 4 - -glabel D_80146200 - .asciz "%08d:RSP_DONE_MSG\n" - .balign 4 - -glabel D_80146214 - .asciz "%08d:RDP_DONE_MSG\n" - .balign 4 - -.text -glabel func_800C9644 -/* B407E4 800C9644 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B407E8 800C9648 AFB10018 */ sw $s1, 0x18($sp) -/* B407EC 800C964C AFB00014 */ sw $s0, 0x14($sp) -/* B407F0 800C9650 3C118013 */ lui $s1, %hi(D_8012D290) # $s1, 0x8013 -/* B407F4 800C9654 00808025 */ move $s0, $a0 -/* B407F8 800C9658 AFBF001C */ sw $ra, 0x1c($sp) -/* B407FC 800C965C AFA00044 */ sw $zero, 0x44($sp) -/* B40800 800C9660 2631D290 */ addiu $s1, %lo(D_8012D290) # addiu $s1, $s1, -0x2d70 -/* B40804 800C9664 8E2E0000 */ lw $t6, ($s1) -.L800C9668: -/* B40808 800C9668 51C00012 */ beql $t6, $zero, .L800C96B4 -/* B4080C 800C966C 02002025 */ move $a0, $s0 -/* B40810 800C9670 0C001A78 */ jal osGetTime -/* B40814 800C9674 00000000 */ nop -/* B40818 800C9678 00402025 */ move $a0, $v0 -/* B4081C 800C967C 00602825 */ move $a1, $v1 -/* B40820 800C9680 24060000 */ li $a2, 0 -/* B40824 800C9684 0C000E1E */ jal __ll_mul -/* B40828 800C9688 24070040 */ li $a3, 64 -/* B4082C 800C968C 00402025 */ move $a0, $v0 -/* B40830 800C9690 00602825 */ move $a1, $v1 -/* B40834 800C9694 24060000 */ li $a2, 0 -/* B40838 800C9698 0C000DDE */ jal __ull_div -/* B4083C 800C969C 24070BB8 */ li $a3, 3000 -/* B40840 800C96A0 3C048014 */ lui $a0, %hi(D_801461E0) # $a0, 0x8014 -/* B40844 800C96A4 248461E0 */ addiu $a0, %lo(D_801461E0) # addiu $a0, $a0, 0x61e0 -/* B40848 800C96A8 0C00084C */ jal osSyncPrintf -/* B4084C 800C96AC 00602825 */ move $a1, $v1 -/* B40850 800C96B0 02002025 */ move $a0, $s0 -.L800C96B4: -/* B40854 800C96B4 27A50044 */ addiu $a1, $sp, 0x44 -/* B40858 800C96B8 0C000CA0 */ jal osRecvMesg -/* B4085C 800C96BC 24060001 */ li $a2, 1 -/* B40860 800C96C0 8FAF0044 */ lw $t7, 0x44($sp) -/* B40864 800C96C4 2401029B */ li $at, 667 -/* B40868 800C96C8 11E1001C */ beq $t7, $at, .L800C973C -/* B4086C 800C96CC 2401029C */ li $at, 668 -/* B40870 800C96D0 11E10031 */ beq $t7, $at, .L800C9798 -/* B40874 800C96D4 2401029E */ li $at, 670 -/* B40878 800C96D8 15E10046 */ bne $t7, $at, .L800C97F4 -/* B4087C 800C96DC 8FA90044 */ lw $t1, 0x44($sp) -/* B40880 800C96E0 8E380000 */ lw $t8, ($s1) -/* B40884 800C96E4 13000011 */ beqz $t8, .L800C972C -/* B40888 800C96E8 00000000 */ nop -/* B4088C 800C96EC 0C001A78 */ jal osGetTime -/* B40890 800C96F0 00000000 */ nop -/* B40894 800C96F4 00402025 */ move $a0, $v0 -/* B40898 800C96F8 00602825 */ move $a1, $v1 -/* B4089C 800C96FC 24060000 */ li $a2, 0 -/* B408A0 800C9700 0C000E1E */ jal __ll_mul -/* B408A4 800C9704 24070040 */ li $a3, 64 -/* B408A8 800C9708 00402025 */ move $a0, $v0 -/* B408AC 800C970C 00602825 */ move $a1, $v1 -/* B408B0 800C9710 24060000 */ li $a2, 0 -/* B408B4 800C9714 0C000DDE */ jal __ull_div -/* B408B8 800C9718 24070BB8 */ li $a3, 3000 -/* B408BC 800C971C 3C048014 */ lui $a0, %hi(D_801461F0) # $a0, 0x8014 -/* B408C0 800C9720 248461F0 */ addiu $a0, %lo(D_801461F0) # addiu $a0, $a0, 0x61f0 -/* B408C4 800C9724 0C00084C */ jal osSyncPrintf -/* B408C8 800C9728 00602825 */ move $a1, $v1 -.L800C972C: -/* B408CC 800C972C 0C0323B7 */ jal func_800C8EDC -/* B408D0 800C9730 02002025 */ move $a0, $s0 -/* B408D4 800C9734 1000FFCC */ b .L800C9668 -/* B408D8 800C9738 8E2E0000 */ lw $t6, ($s1) -.L800C973C: -/* B408DC 800C973C 8E390000 */ lw $t9, ($s1) -/* B408E0 800C9740 13200011 */ beqz $t9, .L800C9788 -/* B408E4 800C9744 00000000 */ nop -/* B408E8 800C9748 0C001A78 */ jal osGetTime -/* B408EC 800C974C 00000000 */ nop -/* B408F0 800C9750 00402025 */ move $a0, $v0 -/* B408F4 800C9754 00602825 */ move $a1, $v1 -/* B408F8 800C9758 24060000 */ li $a2, 0 -/* B408FC 800C975C 0C000E1E */ jal __ll_mul -/* B40900 800C9760 24070040 */ li $a3, 64 -/* B40904 800C9764 00402025 */ move $a0, $v0 -/* B40908 800C9768 00602825 */ move $a1, $v1 -/* B4090C 800C976C 24060000 */ li $a2, 0 -/* B40910 800C9770 0C000DDE */ jal __ull_div -/* B40914 800C9774 24070BB8 */ li $a3, 3000 -/* B40918 800C9778 3C048014 */ lui $a0, %hi(D_80146200) # $a0, 0x8014 -/* B4091C 800C977C 24846200 */ addiu $a0, %lo(D_80146200) # addiu $a0, $a0, 0x6200 -/* B40920 800C9780 0C00084C */ jal osSyncPrintf -/* B40924 800C9784 00602825 */ move $a1, $v1 -.L800C9788: -/* B40928 800C9788 0C03246F */ jal func_800C91BC -/* B4092C 800C978C 02002025 */ move $a0, $s0 -/* B40930 800C9790 1000FFB5 */ b .L800C9668 -/* B40934 800C9794 8E2E0000 */ lw $t6, ($s1) -.L800C9798: -/* B40938 800C9798 8E280000 */ lw $t0, ($s1) -/* B4093C 800C979C 11000011 */ beqz $t0, .L800C97E4 -/* B40940 800C97A0 00000000 */ nop -/* B40944 800C97A4 0C001A78 */ jal osGetTime -/* B40948 800C97A8 00000000 */ nop -/* B4094C 800C97AC 00402025 */ move $a0, $v0 -/* B40950 800C97B0 00602825 */ move $a1, $v1 -/* B40954 800C97B4 24060000 */ li $a2, 0 -/* B40958 800C97B8 0C000E1E */ jal __ll_mul -/* B4095C 800C97BC 24070040 */ li $a3, 64 -/* B40960 800C97C0 00402025 */ move $a0, $v0 -/* B40964 800C97C4 00602825 */ move $a1, $v1 -/* B40968 800C97C8 24060000 */ li $a2, 0 -/* B4096C 800C97CC 0C000DDE */ jal __ull_div -/* B40970 800C97D0 24070BB8 */ li $a3, 3000 -/* B40974 800C97D4 3C048014 */ lui $a0, %hi(D_80146214) # $a0, 0x8014 -/* B40978 800C97D8 24846214 */ addiu $a0, %lo(D_80146214) # addiu $a0, $a0, 0x6214 -/* B4097C 800C97DC 0C00084C */ jal osSyncPrintf -/* B40980 800C97E0 00602825 */ move $a1, $v1 -.L800C97E4: -/* B40984 800C97E4 0C03252D */ jal func_800C94B4 -/* B40988 800C97E8 02002025 */ move $a0, $s0 -/* B4098C 800C97EC 1000FF9E */ b .L800C9668 -/* B40990 800C97F0 8E2E0000 */ lw $t6, ($s1) -.L800C97F4: -/* B40994 800C97F4 85220000 */ lh $v0, ($t1) -/* B40998 800C97F8 24010001 */ li $at, 1 -/* B4099C 800C97FC 10410007 */ beq $v0, $at, .L800C981C -/* B409A0 800C9800 24010003 */ li $at, 3 -/* B409A4 800C9804 1041000D */ beq $v0, $at, .L800C983C -/* B409A8 800C9808 24010004 */ li $at, 4 -/* B409AC 800C980C 10410007 */ beq $v0, $at, .L800C982C -/* B409B0 800C9810 00000000 */ nop -/* B409B4 800C9814 1000FF94 */ b .L800C9668 -/* B409B8 800C9818 8E2E0000 */ lw $t6, ($s1) -.L800C981C: -/* B409BC 800C981C 0C032406 */ jal func_800C9018 -/* B409C0 800C9820 02002025 */ move $a0, $s0 -/* B409C4 800C9824 1000FF90 */ b .L800C9668 -/* B409C8 800C9828 8E2E0000 */ lw $t6, ($s1) -.L800C982C: -/* B409CC 800C982C 0C03214D */ jal func_800C8534 -/* B409D0 800C9830 02002025 */ move $a0, $s0 -/* B409D4 800C9834 1000FF8C */ b .L800C9668 -/* B409D8 800C9838 8E2E0000 */ lw $t6, ($s1) -.L800C983C: -/* B409DC 800C983C 0C0321F3 */ jal func_800C87CC -/* B409E0 800C9840 02002025 */ move $a0, $s0 -/* B409E4 800C9844 1000FF88 */ b .L800C9668 -/* B409E8 800C9848 8E2E0000 */ lw $t6, ($s1) -/* B409F0 800C984C 00000000 */ nop -/* B409F0 800C9850 00000000 */ nop -/* B409F4 800C9854 00000000 */ nop -/* B409F8 800C9858 00000000 */ nop -/* B409FC 800C985C 00000000 */ nop -/* B40A00 800C9860 8FBF001C */ lw $ra, 0x1c($sp) -/* B40A04 800C9864 8FB00014 */ lw $s0, 0x14($sp) -/* B40A08 800C9868 8FB10018 */ lw $s1, 0x18($sp) -/* B40A0C 800C986C 03E00008 */ jr $ra -/* B40A10 800C9870 27BD0048 */ addiu $sp, $sp, 0x48 - diff --git a/asm/non_matchings/code/z_bgcheck/func_8003E3AC.s b/asm/non_matchings/code/z_bgcheck/func_8003E3AC.s index 4bd0ee0bab..48d483e17e 100644 --- a/asm/non_matchings/code/z_bgcheck/func_8003E3AC.s +++ b/asm/non_matchings/code/z_bgcheck/func_8003E3AC.s @@ -28,7 +28,7 @@ glabel func_8003E3AC /* AB55B0 8003E410 24C68AB4 */ addiu $a2, %lo(D_80138AB4) # addiu $a2, $a2, -0x754c /* AB55B4 8003E414 8FA40018 */ lw $a0, 0x18($sp) /* AB55B8 8003E418 8FA50024 */ lw $a1, 0x24($sp) -/* AB55BC 8003E41C 0C031521 */ jal GameState_AllocEnd +/* AB55BC 8003E41C 0C031521 */ jal GameState_Alloc /* AB55C0 8003E420 2407175B */ li $a3, 5979 /* AB55C4 8003E424 8FA8001C */ lw $t0, 0x1c($sp) /* AB55C8 8003E428 3C048014 */ lui $a0, %hi(D_80138AC4) # $a0, 0x8014 diff --git a/asm/non_matchings/code/z_construct/func_801109B0.s b/asm/non_matchings/code/z_construct/func_801109B0.s index baf2d97960..2d0eb3e354 100644 --- a/asm/non_matchings/code/z_construct/func_801109B0.s +++ b/asm/non_matchings/code/z_construct/func_801109B0.s @@ -173,7 +173,7 @@ glabel func_801109B0 /* B87C34 80110A94 24C64D78 */ addiu $a2, %lo(D_80154D78) # addiu $a2, $a2, 0x4d78 /* B87C38 80110A98 8FA40058 */ lw $a0, 0x58($sp) /* B87C3C 80110A9C 8FA5002C */ lw $a1, 0x2c($sp) -/* B87C40 80110AA0 0C031521 */ jal GameState_AllocEnd +/* B87C40 80110AA0 0C031521 */ jal GameState_Alloc /* B87C44 80110AA4 2407009F */ li $a3, 159 /* B87C48 80110AA8 3C048015 */ lui $a0, %hi(D_80154D8C) # $a0, 0x8015 /* B87C4C 80110AAC AE020130 */ sw $v0, 0x130($s0) @@ -202,7 +202,7 @@ glabel func_801109B0 /* B87CA4 80110B04 24C64DF8 */ addiu $a2, %lo(D_80154DF8) # addiu $a2, $a2, 0x4df8 /* B87CA8 80110B08 8FA40058 */ lw $a0, 0x58($sp) /* B87CAC 80110B0C 24050480 */ li $a1, 1152 -/* B87CB0 80110B10 0C031521 */ jal GameState_AllocEnd +/* B87CB0 80110B10 0C031521 */ jal GameState_Alloc /* B87CB4 80110B14 240700A6 */ li $a3, 166 /* B87CB8 80110B18 3C048015 */ lui $a0, %hi(D_80154E0C) # $a0, 0x8015 /* B87CBC 80110B1C AE020134 */ sw $v0, 0x134($s0) @@ -270,7 +270,7 @@ glabel func_801109B0 /* B87DA0 80110C00 24C64EB0 */ addiu $a2, %lo(D_80154EB0) # addiu $a2, $a2, 0x4eb0 /* B87DA4 80110C04 8FA40058 */ lw $a0, 0x58($sp) /* B87DA8 80110C08 24054000 */ li $a1, 16384 -/* B87DAC 80110C0C 0C031521 */ jal GameState_AllocEnd +/* B87DAC 80110C0C 0C031521 */ jal GameState_Alloc /* B87DB0 80110C10 240700BE */ li $a3, 190 /* B87DB4 80110C14 3C048015 */ lui $a0, %hi(D_80154EC4) # $a0, 0x8015 /* B87DB8 80110C18 AE020138 */ sw $v0, 0x138($s0) diff --git a/asm/non_matchings/code/z_play/Gameplay_Init.s b/asm/non_matchings/code/z_play/Gameplay_Init.s index 345e8a2f90..d894c54634 100644 --- a/asm/non_matchings/code/z_play/Gameplay_Init.s +++ b/asm/non_matchings/code/z_play/Gameplay_Init.s @@ -495,7 +495,7 @@ glabel Gameplay_Init /* B342B4 800BD114 24C64244 */ addiu $a2, %lo(D_80144244) # addiu $a2, $a2, 0x4244 /* B342B8 800BD118 02202025 */ move $a0, $s1 /* B342BC 800BD11C 00402825 */ move $a1, $v0 -/* B342C0 800BD120 0C031521 */ jal GameState_AllocEnd +/* B342C0 800BD120 0C031521 */ jal GameState_Alloc /* B342C4 800BD124 24070B66 */ li $a3, 2918 /* B342C8 800BD128 8FA9007C */ lw $t1, 0x7c($sp) /* B342CC 800BD12C 24460008 */ addiu $a2, $v0, 8 diff --git a/asm/non_matchings/code/z_room/func_80096FE8.s b/asm/non_matchings/code/z_room/func_80096FE8.s index feaad77699..79c83e6a63 100644 --- a/asm/non_matchings/code/z_room/func_80096FE8.s +++ b/asm/non_matchings/code/z_room/func_80096FE8.s @@ -171,7 +171,7 @@ glabel func_80096FE8 /* B0E354 800971B4 24C6F1BC */ addiu $a2, %lo(D_8013F1BC) # addiu $a2, $a2, -0xe44 /* B0E358 800971B8 8FA40040 */ lw $a0, 0x40($sp) /* B0E35C 800971BC 02602825 */ move $a1, $s3 -/* B0E360 800971C0 0C031521 */ jal GameState_AllocEnd +/* B0E360 800971C0 0C031521 */ jal GameState_Alloc /* B0E364 800971C4 240703B2 */ li $a3, 946 /* B0E368 800971C8 8FAB0044 */ lw $t3, 0x44($sp) /* B0E36C 800971CC 3C048014 */ lui $a0, %hi(D_8013F1C8) # $a0, 0x8014 diff --git a/asm/non_matchings/code/z_sram/func_800A9CD4.s b/asm/non_matchings/code/z_sram/func_800A9CD4.s index e7dabffaaf..9fc81085db 100644 --- a/asm/non_matchings/code/z_sram/func_800A9CD4.s +++ b/asm/non_matchings/code/z_sram/func_800A9CD4.s @@ -5,7 +5,7 @@ glabel func_800A9CD4 /* B20E80 800A9CE0 3C068014 */ lui $a2, %hi(D_80140F88) # $a2, 0x8014 /* B20E84 800A9CE4 24C60F88 */ addiu $a2, %lo(D_80140F88) # addiu $a2, $a2, 0xf88 /* B20E88 800A9CE8 34058000 */ li $a1, 32768 -/* B20E8C 800A9CEC 0C031521 */ jal GameState_AllocEnd +/* B20E8C 800A9CEC 0C031521 */ jal GameState_Alloc /* B20E90 800A9CF0 2407050E */ li $a3, 1294 /* B20E94 800A9CF4 8FAE001C */ lw $t6, 0x1c($sp) /* B20E98 800A9CF8 3C048014 */ lui $a0, %hi(D_80140F94) # $a0, 0x8014 diff --git a/asm/non_matchings/code/z_vr_box/func_800AF218.s b/asm/non_matchings/code/z_vr_box/func_800AF218.s index 0e7f1bad09..cc7cd07c06 100644 --- a/asm/non_matchings/code/z_vr_box/func_800AF218.s +++ b/asm/non_matchings/code/z_vr_box/func_800AF218.s @@ -1110,7 +1110,7 @@ glabel L800AF25C /* B265CC 800AF42C AFA50044 */ sw $a1, 0x44($sp) /* B265D0 800AF430 AFA20030 */ sw $v0, 0x30($sp) /* B265D4 800AF434 8FA40048 */ lw $a0, 0x48($sp) -/* B265D8 800AF438 0C031521 */ jal GameState_AllocEnd +/* B265D8 800AF438 0C031521 */ jal GameState_Alloc /* B265DC 800AF43C 2407041E */ li $a3, 1054 /* B265E0 800AF440 14400007 */ bnez $v0, .L800AF460 /* B265E4 800AF444 AE020128 */ sw $v0, 0x128($s0) @@ -1143,7 +1143,7 @@ glabel L800AF25C /* B2664C 800AF4AC AFA50044 */ sw $a1, 0x44($sp) /* B26650 800AF4B0 AFA3002C */ sw $v1, 0x2c($sp) /* B26654 800AF4B4 8FA40048 */ lw $a0, 0x48($sp) -/* B26658 800AF4B8 0C031521 */ jal GameState_AllocEnd +/* B26658 800AF4B8 0C031521 */ jal GameState_Alloc /* B2665C 800AF4BC 24070424 */ li $a3, 1060 /* B26660 800AF4C0 14400007 */ bnez $v0, .L800AF4E0 /* B26664 800AF4C4 AE02012C */ sw $v0, 0x12c($s0) @@ -1180,7 +1180,7 @@ glabel L800AF25C /* B266DC 800AF53C 24070430 */ li $a3, 1072 /* B266E0 800AF540 01CF1023 */ subu $v0, $t6, $t7 /* B266E4 800AF544 00022840 */ sll $a1, $v0, 1 -/* B266E8 800AF548 0C031521 */ jal GameState_AllocEnd +/* B266E8 800AF548 0C031521 */ jal GameState_Alloc /* B266EC 800AF54C AFA20044 */ sw $v0, 0x44($sp) /* B266F0 800AF550 14400007 */ bnez $v0, .L800AF570 /* B266F4 800AF554 AE020130 */ sw $v0, 0x130($s0) @@ -1219,7 +1219,7 @@ glabel L800AF25C /* B26770 800AF5D0 2407043D */ li $a3, 1085 /* B26774 800AF5D4 01CF1023 */ subu $v0, $t6, $t7 /* B26778 800AF5D8 00022840 */ sll $a1, $v0, 1 -/* B2677C 800AF5DC 0C031521 */ jal GameState_AllocEnd +/* B2677C 800AF5DC 0C031521 */ jal GameState_Alloc /* B26780 800AF5E0 AFA20044 */ sw $v0, 0x44($sp) /* B26784 800AF5E4 14400007 */ bnez $v0, .L800AF604 /* B26788 800AF5E8 AE020130 */ sw $v0, 0x130($s0) @@ -1265,7 +1265,7 @@ glabel L800AF658 /* B2681C 800AF67C AFA5002C */ sw $a1, 0x2c($sp) /* B26820 800AF680 AFA20030 */ sw $v0, 0x30($sp) /* B26824 800AF684 8FA40048 */ lw $a0, 0x48($sp) -/* B26828 800AF688 0C031521 */ jal GameState_AllocEnd +/* B26828 800AF688 0C031521 */ jal GameState_Alloc /* B2682C 800AF68C 24070467 */ li $a3, 1127 /* B26830 800AF690 14400007 */ bnez $v0, .L800AF6B0 /* B26834 800AF694 AE020128 */ sw $v0, 0x128($s0) @@ -1294,7 +1294,7 @@ glabel L800AF658 /* B2688C 800AF6EC AFA5002C */ sw $a1, 0x2c($sp) /* B26890 800AF6F0 AFA30030 */ sw $v1, 0x30($sp) /* B26894 800AF6F4 8FA40048 */ lw $a0, 0x48($sp) -/* B26898 800AF6F8 0C031521 */ jal GameState_AllocEnd +/* B26898 800AF6F8 0C031521 */ jal GameState_Alloc /* B2689C 800AF6FC 2407046C */ li $a3, 1132 /* B268A0 800AF700 14400007 */ bnez $v0, .L800AF720 /* B268A4 800AF704 AE020130 */ sw $v0, 0x130($s0) @@ -1329,7 +1329,7 @@ glabel L800AF750 /* B2690C 800AF76C AFA5002C */ sw $a1, 0x2c($sp) /* B26910 800AF770 AFA20030 */ sw $v0, 0x30($sp) /* B26914 800AF774 8FA40048 */ lw $a0, 0x48($sp) -/* B26918 800AF778 0C031521 */ jal GameState_AllocEnd +/* B26918 800AF778 0C031521 */ jal GameState_Alloc /* B2691C 800AF77C 24070483 */ li $a3, 1155 /* B26920 800AF780 14400007 */ bnez $v0, .L800AF7A0 /* B26924 800AF784 AE020128 */ sw $v0, 0x128($s0) @@ -1352,7 +1352,7 @@ glabel L800AF750 /* B26964 800AF7C4 24C61B98 */ addiu $a2, %lo(D_80141B98) # addiu $a2, $a2, 0x1b98 /* B26968 800AF7C8 8FA40048 */ lw $a0, 0x48($sp) /* B2696C 800AF7CC 8FA5002C */ lw $a1, 0x2c($sp) -/* B26970 800AF7D0 0C031521 */ jal GameState_AllocEnd +/* B26970 800AF7D0 0C031521 */ jal GameState_Alloc /* B26974 800AF7D4 2407048A */ li $a3, 1162 /* B26978 800AF7D8 14400007 */ bnez $v0, .L800AF7F8 /* B2697C 800AF7DC AE02012C */ sw $v0, 0x12c($s0) @@ -1382,7 +1382,7 @@ glabel L800AF750 /* B269D8 800AF838 AFA8002C */ sw $t0, 0x2c($sp) /* B269DC 800AF83C AFA30030 */ sw $v1, 0x30($sp) /* B269E0 800AF840 8FA40048 */ lw $a0, 0x48($sp) -/* B269E4 800AF844 0C031521 */ jal GameState_AllocEnd +/* B269E4 800AF844 0C031521 */ jal GameState_Alloc /* B269E8 800AF848 24070492 */ li $a3, 1170 /* B269EC 800AF84C 14400007 */ bnez $v0, .L800AF86C /* B269F0 800AF850 AE020130 */ sw $v0, 0x130($s0) @@ -1426,7 +1426,7 @@ glabel L800AF8B8 /* B26A7C 800AF8DC AFA5002C */ sw $a1, 0x2c($sp) /* B26A80 800AF8E0 AFA20030 */ sw $v0, 0x30($sp) /* B26A84 800AF8E4 8FA40048 */ lw $a0, 0x48($sp) -/* B26A88 800AF8E8 0C031521 */ jal GameState_AllocEnd +/* B26A88 800AF8E8 0C031521 */ jal GameState_Alloc /* B26A8C 800AF8EC 2407049E */ li $a3, 1182 /* B26A90 800AF8F0 14400007 */ bnez $v0, .L800AF910 /* B26A94 800AF8F4 AE020128 */ sw $v0, 0x128($s0) @@ -1459,7 +1459,7 @@ glabel L800AF8B8 /* B26AFC 800AF95C 24C61CC0 */ addiu $a2, %lo(D_80141CC0) # addiu $a2, $a2, 0x1cc0 /* B26B00 800AF960 8FA40048 */ lw $a0, 0x48($sp) /* B26B04 800AF964 8FA5002C */ lw $a1, 0x2c($sp) -/* B26B08 800AF968 0C031521 */ jal GameState_AllocEnd +/* B26B08 800AF968 0C031521 */ jal GameState_Alloc /* B26B0C 800AF96C 240704A4 */ li $a3, 1188 /* B26B10 800AF970 14400007 */ bnez $v0, .L800AF990 /* B26B14 800AF974 AE020130 */ sw $v0, 0x130($s0) @@ -1492,7 +1492,7 @@ glabel L800AF9B8 /* B26B74 800AF9D4 AFA5002C */ sw $a1, 0x2c($sp) /* B26B78 800AF9D8 AFA20030 */ sw $v0, 0x30($sp) /* B26B7C 800AF9DC 8FA40048 */ lw $a0, 0x48($sp) -/* B26B80 800AF9E0 0C031521 */ jal GameState_AllocEnd +/* B26B80 800AF9E0 0C031521 */ jal GameState_Alloc /* B26B84 800AF9E4 240704AC */ li $a3, 1196 /* B26B88 800AF9E8 14400007 */ bnez $v0, .L800AFA08 /* B26B8C 800AF9EC AE020128 */ sw $v0, 0x128($s0) @@ -1521,7 +1521,7 @@ glabel L800AF9B8 /* B26BE4 800AFA44 AFA5002C */ sw $a1, 0x2c($sp) /* B26BE8 800AFA48 AFA30030 */ sw $v1, 0x30($sp) /* B26BEC 800AFA4C 8FA40048 */ lw $a0, 0x48($sp) -/* B26BF0 800AFA50 0C031521 */ jal GameState_AllocEnd +/* B26BF0 800AFA50 0C031521 */ jal GameState_Alloc /* B26BF4 800AFA54 240704B3 */ li $a3, 1203 /* B26BF8 800AFA58 14400007 */ bnez $v0, .L800AFA78 /* B26BFC 800AFA5C AE02012C */ sw $v0, 0x12c($s0) @@ -1551,7 +1551,7 @@ glabel L800AF9B8 /* B26C58 800AFAB8 AFA8002C */ sw $t0, 0x2c($sp) /* B26C5C 800AFABC AFA30030 */ sw $v1, 0x30($sp) /* B26C60 800AFAC0 8FA40048 */ lw $a0, 0x48($sp) -/* B26C64 800AFAC4 0C031521 */ jal GameState_AllocEnd +/* B26C64 800AFAC4 0C031521 */ jal GameState_Alloc /* B26C68 800AFAC8 240704BB */ li $a3, 1211 /* B26C6C 800AFACC 14400007 */ bnez $v0, .L800AFAEC /* B26C70 800AFAD0 AE020130 */ sw $v0, 0x130($s0) @@ -1596,7 +1596,7 @@ glabel L800AFB3C /* B26D00 800AFB60 AFA5002C */ sw $a1, 0x2c($sp) /* B26D04 800AFB64 AFA20030 */ sw $v0, 0x30($sp) /* B26D08 800AFB68 8FA40048 */ lw $a0, 0x48($sp) -/* B26D0C 800AFB6C 0C031521 */ jal GameState_AllocEnd +/* B26D0C 800AFB6C 0C031521 */ jal GameState_Alloc /* B26D10 800AFB70 240704CA */ li $a3, 1226 /* B26D14 800AFB74 14400007 */ bnez $v0, .L800AFB94 /* B26D18 800AFB78 AE020128 */ sw $v0, 0x128($s0) @@ -1625,7 +1625,7 @@ glabel L800AFB3C /* B26D70 800AFBD0 AFA5002C */ sw $a1, 0x2c($sp) /* B26D74 800AFBD4 AFA30030 */ sw $v1, 0x30($sp) /* B26D78 800AFBD8 8FA40048 */ lw $a0, 0x48($sp) -/* B26D7C 800AFBDC 0C031521 */ jal GameState_AllocEnd +/* B26D7C 800AFBDC 0C031521 */ jal GameState_Alloc /* B26D80 800AFBE0 240704CF */ li $a3, 1231 /* B26D84 800AFBE4 14400007 */ bnez $v0, .L800AFC04 /* B26D88 800AFBE8 AE020130 */ sw $v0, 0x130($s0) @@ -1660,7 +1660,7 @@ glabel L800AFC2C /* B26DF0 800AFC50 AFA5002C */ sw $a1, 0x2c($sp) /* B26DF4 800AFC54 AFA20030 */ sw $v0, 0x30($sp) /* B26DF8 800AFC58 8FA40048 */ lw $a0, 0x48($sp) -/* B26DFC 800AFC5C 0C031521 */ jal GameState_AllocEnd +/* B26DFC 800AFC5C 0C031521 */ jal GameState_Alloc /* B26E00 800AFC60 240704E9 */ li $a3, 1257 /* B26E04 800AFC64 14400007 */ bnez $v0, .L800AFC84 /* B26E08 800AFC68 AE020128 */ sw $v0, 0x128($s0) @@ -1689,7 +1689,7 @@ glabel L800AFC2C /* B26E60 800AFCC0 AFA5002C */ sw $a1, 0x2c($sp) /* B26E64 800AFCC4 AFA30030 */ sw $v1, 0x30($sp) /* B26E68 800AFCC8 8FA40048 */ lw $a0, 0x48($sp) -/* B26E6C 800AFCCC 0C031521 */ jal GameState_AllocEnd +/* B26E6C 800AFCCC 0C031521 */ jal GameState_Alloc /* B26E70 800AFCD0 240704EE */ li $a3, 1262 /* B26E74 800AFCD4 14400007 */ bnez $v0, .L800AFCF4 /* B26E78 800AFCD8 AE020130 */ sw $v0, 0x130($s0) @@ -1724,7 +1724,7 @@ glabel L800AFD1C /* B26EE0 800AFD40 AFA5002C */ sw $a1, 0x2c($sp) /* B26EE4 800AFD44 AFA20030 */ sw $v0, 0x30($sp) /* B26EE8 800AFD48 8FA40048 */ lw $a0, 0x48($sp) -/* B26EEC 800AFD4C 0C031521 */ jal GameState_AllocEnd +/* B26EEC 800AFD4C 0C031521 */ jal GameState_Alloc /* B26EF0 800AFD50 240704F7 */ li $a3, 1271 /* B26EF4 800AFD54 14400007 */ bnez $v0, .L800AFD74 /* B26EF8 800AFD58 AE020128 */ sw $v0, 0x128($s0) @@ -1757,7 +1757,7 @@ glabel L800AFD1C /* B26F60 800AFDC0 24C61FF8 */ addiu $a2, %lo(D_80141FF8) # addiu $a2, $a2, 0x1ff8 /* B26F64 800AFDC4 8FA40048 */ lw $a0, 0x48($sp) /* B26F68 800AFDC8 8FA5002C */ lw $a1, 0x2c($sp) -/* B26F6C 800AFDCC 0C031521 */ jal GameState_AllocEnd +/* B26F6C 800AFDCC 0C031521 */ jal GameState_Alloc /* B26F70 800AFDD0 240704FD */ li $a3, 1277 /* B26F74 800AFDD4 14400007 */ bnez $v0, .L800AFDF4 /* B26F78 800AFDD8 AE020130 */ sw $v0, 0x130($s0) @@ -1792,7 +1792,7 @@ glabel L800AFE1C /* B26FE0 800AFE40 AFA5002C */ sw $a1, 0x2c($sp) /* B26FE4 800AFE44 AFA20030 */ sw $v0, 0x30($sp) /* B26FE8 800AFE48 8FA40048 */ lw $a0, 0x48($sp) -/* B26FEC 800AFE4C 0C031521 */ jal GameState_AllocEnd +/* B26FEC 800AFE4C 0C031521 */ jal GameState_Alloc /* B26FF0 800AFE50 24070506 */ li $a3, 1286 /* B26FF4 800AFE54 14400007 */ bnez $v0, .L800AFE74 /* B26FF8 800AFE58 AE020128 */ sw $v0, 0x128($s0) @@ -1821,7 +1821,7 @@ glabel L800AFE1C /* B27050 800AFEB0 AFA5002C */ sw $a1, 0x2c($sp) /* B27054 800AFEB4 AFA30030 */ sw $v1, 0x30($sp) /* B27058 800AFEB8 8FA40048 */ lw $a0, 0x48($sp) -/* B2705C 800AFEBC 0C031521 */ jal GameState_AllocEnd +/* B2705C 800AFEBC 0C031521 */ jal GameState_Alloc /* B27060 800AFEC0 2407050B */ li $a3, 1291 /* B27064 800AFEC4 14400007 */ bnez $v0, .L800AFEE4 /* B27068 800AFEC8 AE020130 */ sw $v0, 0x130($s0) @@ -1858,7 +1858,7 @@ glabel L800AFF14 /* B270D8 800AFF38 AFA5002C */ sw $a1, 0x2c($sp) /* B270DC 800AFF3C AFA20030 */ sw $v0, 0x30($sp) /* B270E0 800AFF40 8FA40048 */ lw $a0, 0x48($sp) -/* B270E4 800AFF44 0C031521 */ jal GameState_AllocEnd +/* B270E4 800AFF44 0C031521 */ jal GameState_Alloc /* B270E8 800AFF48 24070515 */ li $a3, 1301 /* B270EC 800AFF4C 14400007 */ bnez $v0, .L800AFF6C /* B270F0 800AFF50 AE020128 */ sw $v0, 0x128($s0) @@ -1887,7 +1887,7 @@ glabel L800AFF14 /* B27148 800AFFA8 AFA5002C */ sw $a1, 0x2c($sp) /* B2714C 800AFFAC AFA30030 */ sw $v1, 0x30($sp) /* B27150 800AFFB0 8FA40048 */ lw $a0, 0x48($sp) -/* B27154 800AFFB4 0C031521 */ jal GameState_AllocEnd +/* B27154 800AFFB4 0C031521 */ jal GameState_Alloc /* B27158 800AFFB8 2407051A */ li $a3, 1306 /* B2715C 800AFFBC 14400007 */ bnez $v0, .L800AFFDC /* B27160 800AFFC0 AE020130 */ sw $v0, 0x130($s0) @@ -1922,7 +1922,7 @@ glabel L800B0004 /* B271C8 800B0028 AFA5002C */ sw $a1, 0x2c($sp) /* B271CC 800B002C AFA20030 */ sw $v0, 0x30($sp) /* B271D0 800B0030 8FA40048 */ lw $a0, 0x48($sp) -/* B271D4 800B0034 0C031521 */ jal GameState_AllocEnd +/* B271D4 800B0034 0C031521 */ jal GameState_Alloc /* B271D8 800B0038 24070533 */ li $a3, 1331 /* B271DC 800B003C 14400007 */ bnez $v0, .L800B005C /* B271E0 800B0040 AE020128 */ sw $v0, 0x128($s0) @@ -1951,7 +1951,7 @@ glabel L800B0004 /* B27238 800B0098 AFA5002C */ sw $a1, 0x2c($sp) /* B2723C 800B009C AFA30030 */ sw $v1, 0x30($sp) /* B27240 800B00A0 8FA40048 */ lw $a0, 0x48($sp) -/* B27244 800B00A4 0C031521 */ jal GameState_AllocEnd +/* B27244 800B00A4 0C031521 */ jal GameState_Alloc /* B27248 800B00A8 24070538 */ li $a3, 1336 /* B2724C 800B00AC 14400007 */ bnez $v0, .L800B00CC /* B27250 800B00B0 AE020130 */ sw $v0, 0x130($s0) @@ -1986,7 +1986,7 @@ glabel L800B00F4 /* B272B8 800B0118 AFA5002C */ sw $a1, 0x2c($sp) /* B272BC 800B011C AFA20030 */ sw $v0, 0x30($sp) /* B272C0 800B0120 8FA40048 */ lw $a0, 0x48($sp) -/* B272C4 800B0124 0C031521 */ jal GameState_AllocEnd +/* B272C4 800B0124 0C031521 */ jal GameState_Alloc /* B272C8 800B0128 24070541 */ li $a3, 1345 /* B272CC 800B012C 14400007 */ bnez $v0, .L800B014C /* B272D0 800B0130 AE020128 */ sw $v0, 0x128($s0) @@ -2015,7 +2015,7 @@ glabel L800B00F4 /* B27328 800B0188 AFA5002C */ sw $a1, 0x2c($sp) /* B2732C 800B018C AFA30030 */ sw $v1, 0x30($sp) /* B27330 800B0190 8FA40048 */ lw $a0, 0x48($sp) -/* B27334 800B0194 0C031521 */ jal GameState_AllocEnd +/* B27334 800B0194 0C031521 */ jal GameState_Alloc /* B27338 800B0198 24070546 */ li $a3, 1350 /* B2733C 800B019C 14400007 */ bnez $v0, .L800B01BC /* B27340 800B01A0 AE020130 */ sw $v0, 0x130($s0) @@ -2050,7 +2050,7 @@ glabel L800B01E4 /* B273A8 800B0208 AFA5002C */ sw $a1, 0x2c($sp) /* B273AC 800B020C AFA20030 */ sw $v0, 0x30($sp) /* B273B0 800B0210 8FA40048 */ lw $a0, 0x48($sp) -/* B273B4 800B0214 0C031521 */ jal GameState_AllocEnd +/* B273B4 800B0214 0C031521 */ jal GameState_Alloc /* B273B8 800B0218 2407054F */ li $a3, 1359 /* B273BC 800B021C 14400007 */ bnez $v0, .L800B023C /* B273C0 800B0220 AE020128 */ sw $v0, 0x128($s0) @@ -2079,7 +2079,7 @@ glabel L800B01E4 /* B27418 800B0278 AFA5002C */ sw $a1, 0x2c($sp) /* B2741C 800B027C AFA30030 */ sw $v1, 0x30($sp) /* B27420 800B0280 8FA40048 */ lw $a0, 0x48($sp) -/* B27424 800B0284 0C031521 */ jal GameState_AllocEnd +/* B27424 800B0284 0C031521 */ jal GameState_Alloc /* B27428 800B0288 24070554 */ li $a3, 1364 /* B2742C 800B028C 14400007 */ bnez $v0, .L800B02AC /* B27430 800B0290 AE020130 */ sw $v0, 0x130($s0) @@ -2114,7 +2114,7 @@ glabel L800B02D4 /* B27498 800B02F8 AFA5002C */ sw $a1, 0x2c($sp) /* B2749C 800B02FC AFA20030 */ sw $v0, 0x30($sp) /* B274A0 800B0300 8FA40048 */ lw $a0, 0x48($sp) -/* B274A4 800B0304 0C031521 */ jal GameState_AllocEnd +/* B274A4 800B0304 0C031521 */ jal GameState_Alloc /* B274A8 800B0308 2407055D */ li $a3, 1373 /* B274AC 800B030C 14400007 */ bnez $v0, .L800B032C /* B274B0 800B0310 AE020128 */ sw $v0, 0x128($s0) @@ -2143,7 +2143,7 @@ glabel L800B02D4 /* B27508 800B0368 AFA5002C */ sw $a1, 0x2c($sp) /* B2750C 800B036C AFA30030 */ sw $v1, 0x30($sp) /* B27510 800B0370 8FA40048 */ lw $a0, 0x48($sp) -/* B27514 800B0374 0C031521 */ jal GameState_AllocEnd +/* B27514 800B0374 0C031521 */ jal GameState_Alloc /* B27518 800B0378 24070562 */ li $a3, 1378 /* B2751C 800B037C 14400007 */ bnez $v0, .L800B039C /* B27520 800B0380 AE020130 */ sw $v0, 0x130($s0) @@ -2180,7 +2180,7 @@ glabel L800B03CC /* B27590 800B03F0 AFA5002C */ sw $a1, 0x2c($sp) /* B27594 800B03F4 AFA20030 */ sw $v0, 0x30($sp) /* B27598 800B03F8 8FA40048 */ lw $a0, 0x48($sp) -/* B2759C 800B03FC 0C031521 */ jal GameState_AllocEnd +/* B2759C 800B03FC 0C031521 */ jal GameState_Alloc /* B275A0 800B0400 2407057D */ li $a3, 1405 /* B275A4 800B0404 14400007 */ bnez $v0, .L800B0424 /* B275A8 800B0408 AE020128 */ sw $v0, 0x128($s0) @@ -2209,7 +2209,7 @@ glabel L800B03CC /* B27600 800B0460 AFA5002C */ sw $a1, 0x2c($sp) /* B27604 800B0464 AFA30030 */ sw $v1, 0x30($sp) /* B27608 800B0468 8FA40048 */ lw $a0, 0x48($sp) -/* B2760C 800B046C 0C031521 */ jal GameState_AllocEnd +/* B2760C 800B046C 0C031521 */ jal GameState_Alloc /* B27610 800B0470 24070582 */ li $a3, 1410 /* B27614 800B0474 14400007 */ bnez $v0, .L800B0494 /* B27618 800B0478 AE020130 */ sw $v0, 0x130($s0) @@ -2246,7 +2246,7 @@ glabel L800B04C4 /* B27688 800B04E8 AFA5002C */ sw $a1, 0x2c($sp) /* B2768C 800B04EC AFA20030 */ sw $v0, 0x30($sp) /* B27690 800B04F0 8FA40048 */ lw $a0, 0x48($sp) -/* B27694 800B04F4 0C031521 */ jal GameState_AllocEnd +/* B27694 800B04F4 0C031521 */ jal GameState_Alloc /* B27698 800B04F8 2407058C */ li $a3, 1420 /* B2769C 800B04FC 14400007 */ bnez $v0, .L800B051C /* B276A0 800B0500 AE020128 */ sw $v0, 0x128($s0) @@ -2275,7 +2275,7 @@ glabel L800B04C4 /* B276F8 800B0558 AFA5002C */ sw $a1, 0x2c($sp) /* B276FC 800B055C AFA30030 */ sw $v1, 0x30($sp) /* B27700 800B0560 8FA40048 */ lw $a0, 0x48($sp) -/* B27704 800B0564 0C031521 */ jal GameState_AllocEnd +/* B27704 800B0564 0C031521 */ jal GameState_Alloc /* B27708 800B0568 24070591 */ li $a3, 1425 /* B2770C 800B056C 14400007 */ bnez $v0, .L800B058C /* B27710 800B0570 AE020130 */ sw $v0, 0x130($s0) @@ -2312,7 +2312,7 @@ glabel L800B05BC /* B27780 800B05E0 AFA5002C */ sw $a1, 0x2c($sp) /* B27784 800B05E4 AFA20030 */ sw $v0, 0x30($sp) /* B27788 800B05E8 8FA40048 */ lw $a0, 0x48($sp) -/* B2778C 800B05EC 0C031521 */ jal GameState_AllocEnd +/* B2778C 800B05EC 0C031521 */ jal GameState_Alloc /* B27790 800B05F0 240705AB */ li $a3, 1451 /* B27794 800B05F4 14400007 */ bnez $v0, .L800B0614 /* B27798 800B05F8 AE020128 */ sw $v0, 0x128($s0) @@ -2341,7 +2341,7 @@ glabel L800B05BC /* B277F0 800B0650 AFA5002C */ sw $a1, 0x2c($sp) /* B277F4 800B0654 AFA30030 */ sw $v1, 0x30($sp) /* B277F8 800B0658 8FA40048 */ lw $a0, 0x48($sp) -/* B277FC 800B065C 0C031521 */ jal GameState_AllocEnd +/* B277FC 800B065C 0C031521 */ jal GameState_Alloc /* B27800 800B0660 240705B0 */ li $a3, 1456 /* B27804 800B0664 14400007 */ bnez $v0, .L800B0684 /* B27808 800B0668 AE020130 */ sw $v0, 0x130($s0) @@ -2378,7 +2378,7 @@ glabel L800B06B4 /* B27878 800B06D8 AFA5002C */ sw $a1, 0x2c($sp) /* B2787C 800B06DC AFA20030 */ sw $v0, 0x30($sp) /* B27880 800B06E0 8FA40048 */ lw $a0, 0x48($sp) -/* B27884 800B06E4 0C031521 */ jal GameState_AllocEnd +/* B27884 800B06E4 0C031521 */ jal GameState_Alloc /* B27888 800B06E8 240705BA */ li $a3, 1466 /* B2788C 800B06EC 14400007 */ bnez $v0, .L800B070C /* B27890 800B06F0 AE020128 */ sw $v0, 0x128($s0) @@ -2407,7 +2407,7 @@ glabel L800B06B4 /* B278E8 800B0748 AFA5002C */ sw $a1, 0x2c($sp) /* B278EC 800B074C AFA30030 */ sw $v1, 0x30($sp) /* B278F0 800B0750 8FA40048 */ lw $a0, 0x48($sp) -/* B278F4 800B0754 0C031521 */ jal GameState_AllocEnd +/* B278F4 800B0754 0C031521 */ jal GameState_Alloc /* B278F8 800B0758 240705BF */ li $a3, 1471 /* B278FC 800B075C 14400007 */ bnez $v0, .L800B077C /* B27900 800B0760 AE020130 */ sw $v0, 0x130($s0) @@ -2444,7 +2444,7 @@ glabel L800B07AC /* B27970 800B07D0 AFA5002C */ sw $a1, 0x2c($sp) /* B27974 800B07D4 AFA20030 */ sw $v0, 0x30($sp) /* B27978 800B07D8 8FA40048 */ lw $a0, 0x48($sp) -/* B2797C 800B07DC 0C031521 */ jal GameState_AllocEnd +/* B2797C 800B07DC 0C031521 */ jal GameState_Alloc /* B27980 800B07E0 240705C9 */ li $a3, 1481 /* B27984 800B07E4 14400007 */ bnez $v0, .L800B0804 /* B27988 800B07E8 AE020128 */ sw $v0, 0x128($s0) @@ -2473,7 +2473,7 @@ glabel L800B07AC /* B279E0 800B0840 AFA5002C */ sw $a1, 0x2c($sp) /* B279E4 800B0844 AFA30030 */ sw $v1, 0x30($sp) /* B279E8 800B0848 8FA40048 */ lw $a0, 0x48($sp) -/* B279EC 800B084C 0C031521 */ jal GameState_AllocEnd +/* B279EC 800B084C 0C031521 */ jal GameState_Alloc /* B279F0 800B0850 240705CE */ li $a3, 1486 /* B279F4 800B0854 14400007 */ bnez $v0, .L800B0874 /* B279F8 800B0858 AE020130 */ sw $v0, 0x130($s0) @@ -2510,7 +2510,7 @@ glabel L800B08A4 /* B27A68 800B08C8 AFA5002C */ sw $a1, 0x2c($sp) /* B27A6C 800B08CC AFA20030 */ sw $v0, 0x30($sp) /* B27A70 800B08D0 8FA40048 */ lw $a0, 0x48($sp) -/* B27A74 800B08D4 0C031521 */ jal GameState_AllocEnd +/* B27A74 800B08D4 0C031521 */ jal GameState_Alloc /* B27A78 800B08D8 240705E8 */ li $a3, 1512 /* B27A7C 800B08DC 14400007 */ bnez $v0, .L800B08FC /* B27A80 800B08E0 AE020128 */ sw $v0, 0x128($s0) @@ -2539,7 +2539,7 @@ glabel L800B08A4 /* B27AD8 800B0938 AFA5002C */ sw $a1, 0x2c($sp) /* B27ADC 800B093C AFA30030 */ sw $v1, 0x30($sp) /* B27AE0 800B0940 8FA40048 */ lw $a0, 0x48($sp) -/* B27AE4 800B0944 0C031521 */ jal GameState_AllocEnd +/* B27AE4 800B0944 0C031521 */ jal GameState_Alloc /* B27AE8 800B0948 240705ED */ li $a3, 1517 /* B27AEC 800B094C 14400007 */ bnez $v0, .L800B096C /* B27AF0 800B0950 AE020130 */ sw $v0, 0x130($s0) @@ -2574,7 +2574,7 @@ glabel L800B0994 /* B27B58 800B09B8 AFA5002C */ sw $a1, 0x2c($sp) /* B27B5C 800B09BC AFA20030 */ sw $v0, 0x30($sp) /* B27B60 800B09C0 8FA40048 */ lw $a0, 0x48($sp) -/* B27B64 800B09C4 0C031521 */ jal GameState_AllocEnd +/* B27B64 800B09C4 0C031521 */ jal GameState_Alloc /* B27B68 800B09C8 240705F6 */ li $a3, 1526 /* B27B6C 800B09CC 14400007 */ bnez $v0, .L800B09EC /* B27B70 800B09D0 AE020128 */ sw $v0, 0x128($s0) @@ -2603,7 +2603,7 @@ glabel L800B0994 /* B27BC8 800B0A28 AFA5002C */ sw $a1, 0x2c($sp) /* B27BCC 800B0A2C AFA30030 */ sw $v1, 0x30($sp) /* B27BD0 800B0A30 8FA40048 */ lw $a0, 0x48($sp) -/* B27BD4 800B0A34 0C031521 */ jal GameState_AllocEnd +/* B27BD4 800B0A34 0C031521 */ jal GameState_Alloc /* B27BD8 800B0A38 240705FB */ li $a3, 1531 /* B27BDC 800B0A3C 14400007 */ bnez $v0, .L800B0A5C /* B27BE0 800B0A40 AE020130 */ sw $v0, 0x130($s0) @@ -2638,7 +2638,7 @@ glabel L800B0A84 /* B27C48 800B0AA8 AFA5002C */ sw $a1, 0x2c($sp) /* B27C4C 800B0AAC AFA20030 */ sw $v0, 0x30($sp) /* B27C50 800B0AB0 8FA40048 */ lw $a0, 0x48($sp) -/* B27C54 800B0AB4 0C031521 */ jal GameState_AllocEnd +/* B27C54 800B0AB4 0C031521 */ jal GameState_Alloc /* B27C58 800B0AB8 24070604 */ li $a3, 1540 /* B27C5C 800B0ABC 14400007 */ bnez $v0, .L800B0ADC /* B27C60 800B0AC0 AE020128 */ sw $v0, 0x128($s0) @@ -2667,7 +2667,7 @@ glabel L800B0A84 /* B27CB8 800B0B18 AFA5002C */ sw $a1, 0x2c($sp) /* B27CBC 800B0B1C AFA30030 */ sw $v1, 0x30($sp) /* B27CC0 800B0B20 8FA40048 */ lw $a0, 0x48($sp) -/* B27CC4 800B0B24 0C031521 */ jal GameState_AllocEnd +/* B27CC4 800B0B24 0C031521 */ jal GameState_Alloc /* B27CC8 800B0B28 24070609 */ li $a3, 1545 /* B27CCC 800B0B2C 14400007 */ bnez $v0, .L800B0B4C /* B27CD0 800B0B30 AE020130 */ sw $v0, 0x130($s0) @@ -2702,7 +2702,7 @@ glabel L800B0B74 /* B27D38 800B0B98 AFA5002C */ sw $a1, 0x2c($sp) /* B27D3C 800B0B9C AFA20030 */ sw $v0, 0x30($sp) /* B27D40 800B0BA0 8FA40048 */ lw $a0, 0x48($sp) -/* B27D44 800B0BA4 0C031521 */ jal GameState_AllocEnd +/* B27D44 800B0BA4 0C031521 */ jal GameState_Alloc /* B27D48 800B0BA8 24070618 */ li $a3, 1560 /* B27D4C 800B0BAC 14400007 */ bnez $v0, .L800B0BCC /* B27D50 800B0BB0 AE020128 */ sw $v0, 0x128($s0) @@ -2731,7 +2731,7 @@ glabel L800B0B74 /* B27DA8 800B0C08 AFA5002C */ sw $a1, 0x2c($sp) /* B27DAC 800B0C0C AFA30030 */ sw $v1, 0x30($sp) /* B27DB0 800B0C10 8FA40048 */ lw $a0, 0x48($sp) -/* B27DB4 800B0C14 0C031521 */ jal GameState_AllocEnd +/* B27DB4 800B0C14 0C031521 */ jal GameState_Alloc /* B27DB8 800B0C18 2407061D */ li $a3, 1565 /* B27DBC 800B0C1C 14400007 */ bnez $v0, .L800B0C3C /* B27DC0 800B0C20 AE020130 */ sw $v0, 0x130($s0) @@ -2766,7 +2766,7 @@ glabel L800B0C64 /* B27E28 800B0C88 AFA5002C */ sw $a1, 0x2c($sp) /* B27E2C 800B0C8C AFA20030 */ sw $v0, 0x30($sp) /* B27E30 800B0C90 8FA40048 */ lw $a0, 0x48($sp) -/* B27E34 800B0C94 0C031521 */ jal GameState_AllocEnd +/* B27E34 800B0C94 0C031521 */ jal GameState_Alloc /* B27E38 800B0C98 24070626 */ li $a3, 1574 /* B27E3C 800B0C9C 14400007 */ bnez $v0, .L800B0CBC /* B27E40 800B0CA0 AE020128 */ sw $v0, 0x128($s0) @@ -2795,7 +2795,7 @@ glabel L800B0C64 /* B27E98 800B0CF8 AFA5002C */ sw $a1, 0x2c($sp) /* B27E9C 800B0CFC AFA30030 */ sw $v1, 0x30($sp) /* B27EA0 800B0D00 8FA40048 */ lw $a0, 0x48($sp) -/* B27EA4 800B0D04 0C031521 */ jal GameState_AllocEnd +/* B27EA4 800B0D04 0C031521 */ jal GameState_Alloc /* B27EA8 800B0D08 2407062B */ li $a3, 1579 /* B27EAC 800B0D0C 14400007 */ bnez $v0, .L800B0D2C /* B27EB0 800B0D10 AE020130 */ sw $v0, 0x130($s0) @@ -2830,7 +2830,7 @@ glabel L800B0D54 /* B27F18 800B0D78 AFA5002C */ sw $a1, 0x2c($sp) /* B27F1C 800B0D7C AFA20030 */ sw $v0, 0x30($sp) /* B27F20 800B0D80 8FA40048 */ lw $a0, 0x48($sp) -/* B27F24 800B0D84 0C031521 */ jal GameState_AllocEnd +/* B27F24 800B0D84 0C031521 */ jal GameState_Alloc /* B27F28 800B0D88 24070634 */ li $a3, 1588 /* B27F2C 800B0D8C 14400007 */ bnez $v0, .L800B0DAC /* B27F30 800B0D90 AE020128 */ sw $v0, 0x128($s0) @@ -2859,7 +2859,7 @@ glabel L800B0D54 /* B27F88 800B0DE8 AFA5002C */ sw $a1, 0x2c($sp) /* B27F8C 800B0DEC AFA30030 */ sw $v1, 0x30($sp) /* B27F90 800B0DF0 8FA40048 */ lw $a0, 0x48($sp) -/* B27F94 800B0DF4 0C031521 */ jal GameState_AllocEnd +/* B27F94 800B0DF4 0C031521 */ jal GameState_Alloc /* B27F98 800B0DF8 24070639 */ li $a3, 1593 /* B27F9C 800B0DFC 14400007 */ bnez $v0, .L800B0E1C /* B27FA0 800B0E00 AE020130 */ sw $v0, 0x130($s0) diff --git a/asm/non_matchings/code/z_vr_box/func_800B0E50.s b/asm/non_matchings/code/z_vr_box/func_800B0E50.s index 9327bd6819..b7dfc5e802 100644 --- a/asm/non_matchings/code/z_vr_box/func_800B0E50.s +++ b/asm/non_matchings/code/z_vr_box/func_800B0E50.s @@ -102,7 +102,7 @@ glabel func_800B0E50 /* B28068 800B0EC8 24C62C74 */ addiu $a2, %lo(D_80142C74) # addiu $a2, $a2, 0x2c74 /* B2806C 800B0ECC 8FA40020 */ lw $a0, 0x20($sp) /* B28070 800B0ED0 24052580 */ li $a1, 9600 -/* B28074 800B0ED4 0C031521 */ jal GameState_AllocEnd +/* B28074 800B0ED4 0C031521 */ jal GameState_Alloc /* B28078 800B0ED8 24070664 */ li $a3, 1636 /* B2807C 800B0EDC 14400007 */ bnez $v0, .L800B0EFC /* B28080 800B0EE0 AE020134 */ sw $v0, 0x134($s0) @@ -117,7 +117,7 @@ glabel func_800B0E50 /* B280A0 800B0F00 24C62CAC */ addiu $a2, %lo(D_80142CAC) # addiu $a2, $a2, 0x2cac /* B280A4 800B0F04 8FA40020 */ lw $a0, 0x20($sp) /* B280A8 800B0F08 24051000 */ li $a1, 4096 -/* B280AC 800B0F0C 0C031521 */ jal GameState_AllocEnd +/* B280AC 800B0F0C 0C031521 */ jal GameState_Alloc /* B280B0 800B0F10 24070667 */ li $a3, 1639 /* B280B4 800B0F14 14400007 */ bnez $v0, .L800B0F34 /* B280B8 800B0F18 AE02013C */ sw $v0, 0x13c($s0) @@ -135,7 +135,7 @@ glabel func_800B0E50 /* B280E4 800B0F44 00000000 */ nop .L800B0F48: /* B280E8 800B0F48 24C62CE4 */ addiu $a2, %lo(D_80142CE4) -/* B280EC 800B0F4C 0C031521 */ jal GameState_AllocEnd +/* B280EC 800B0F4C 0C031521 */ jal GameState_Alloc /* B280F0 800B0F50 2407066B */ li $a3, 1643 /* B280F4 800B0F54 14400007 */ bnez $v0, .L800B0F74 /* B280F8 800B0F58 AE020134 */ sw $v0, 0x134($s0) @@ -155,7 +155,7 @@ glabel func_800B0E50 /* B2812C 800B0F8C 24C62D1C */ addiu $a2, %lo(D_80142D1C) # addiu $a2, $a2, 0x2d1c /* B28130 800B0F90 8FA40020 */ lw $a0, 0x20($sp) /* B28134 800B0F94 24050C00 */ li $a1, 3072 -/* B28138 800B0F98 0C031521 */ jal GameState_AllocEnd +/* B28138 800B0F98 0C031521 */ jal GameState_Alloc /* B2813C 800B0F9C 24070670 */ li $a3, 1648 /* B28140 800B0FA0 14400007 */ bnez $v0, .L800B0FC0 /* B28144 800B0FA4 AE02013C */ sw $v0, 0x13c($s0) @@ -174,7 +174,7 @@ glabel func_800B0E50 .L800B0FD4: /* B28174 800B0FD4 3C068014 */ lui $a2, %hi(D_80142D54) # $a2, 0x8014 /* B28178 800B0FD8 24C62D54 */ addiu $a2, %lo(D_80142D54) # addiu $a2, $a2, 0x2d54 -/* B2817C 800B0FDC 0C031521 */ jal GameState_AllocEnd +/* B2817C 800B0FDC 0C031521 */ jal GameState_Alloc /* B28180 800B0FE0 24070675 */ li $a3, 1653 /* B28184 800B0FE4 14400007 */ bnez $v0, .L800B1004 /* B28188 800B0FE8 AE02013C */ sw $v0, 0x13c($s0) diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A20.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A20.s index ec8f6ed9ec..ce3cd5fa0e 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A20.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A20.s @@ -22,7 +22,7 @@ glabel func_80811A20 /* 0DD2C 80811A6C 24C62F54 */ addiu $a2, $a2, %lo(D_80812F54) ## $a2 = 80812F54 /* 0DD30 80811A70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0DD34 80811A74 8FA5002C */ lw $a1, 0x002C($sp) -/* 0DD38 80811A78 0C031521 */ jal GameState_AllocEnd +/* 0DD38 80811A78 0C031521 */ jal GameState_Alloc /* 0DD3C 80811A7C 24070D40 */ addiu $a3, $zero, 0x0D40 ## $a3 = 00000D40 /* 0DD40 80811A80 14400007 */ bne $v0, $zero, .L80811AA0 @@ -53,7 +53,7 @@ glabel func_80811A20 /* 0DD9C 80811ADC AFA5002C */ sw $a1, 0x002C($sp) /* 0DDA0 80811AE0 AFA30030 */ sw $v1, 0x0030($sp) /* 0DDA4 80811AE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0DDA8 80811AE8 0C031521 */ jal GameState_AllocEnd +/* 0DDA8 80811AE8 0C031521 */ jal GameState_Alloc /* 0DDAC 80811AEC 24070D46 */ addiu $a3, $zero, 0x0D46 ## $a3 = 00000D46 /* 0DDB0 80811AF0 14400007 */ bne $v0, $zero, .L80811B10 diff --git a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801E44.s b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801E44.s index 6ba60b643e..7c1ac34a61 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801E44.s +++ b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801E44.s @@ -73,7 +73,7 @@ glabel func_80801E44 /* 013CC 80801F5C AFA5002C */ sw $a1, 0x002C($sp) /* 013D0 80801F60 AFA30030 */ sw $v1, 0x0030($sp) /* 013D4 80801F64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 013D8 80801F68 0C031521 */ jal GameState_AllocEnd +/* 013D8 80801F68 0C031521 */ jal GameState_Alloc /* 013DC 80801F6C 2407045A */ addiu $a3, $zero, 0x045A ## $a3 = 0000045A /* 013E0 80801F70 AE020238 */ sw $v0, 0x0238($s0) ## 00000238 /* 013E4 80801F74 3C078080 */ lui $a3, %hi(D_808035DC) ## $a3 = 80800000 diff --git a/data/sched.bss.s b/data/sched.bss.s deleted file mode 100644 index 65c9b4b086..0000000000 --- a/data/sched.bss.s +++ /dev/null @@ -1,83 +0,0 @@ -.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 purposee registers - -.section .bss - -glabel D_8016A500 - .space 0x4 - -glabel D_8016A504 - .space 0x4 - -glabel D_8016A508 - .space 0x4 - -glabel D_8016A50C - .space 0x4 - -glabel D_8016A510 - .space 0x4 - -glabel D_8016A514 - .space 0x4 - -glabel D_8016A518 - .space 0x4 - -glabel D_8016A51C - .space 0x4 - -glabel D_8016A520 - .space 0x8 - -glabel D_8016A528 - .space 0x8 - -glabel D_8016A530 - .space 0x8 - -glabel D_8016A538 - .space 0x8 - -glabel D_8016A540 - .space 0x8 - -glabel D_8016A548 - .space 0x8 - -glabel D_8016A550 - .space 0x8 - -glabel D_8016A558 - .space 0x4 - -glabel D_8016A55C - .space 0x4 - -glabel D_8016A560 - .space 0x4 - -glabel D_8016A564 - .space 0x4 - -glabel D_8016A568 - .space 0x4 - -glabel D_8016A56C - .space 0x4 - -glabel D_8016A570 - .space 0x4 - -glabel D_8016A574 - .space 0xC - -glabel D_8016A580 - .space 0x8 - -glabel gSpeedMeterTimeEntryPtr - .space 0x8 diff --git a/data/sched.data.s b/data/sched.data.s deleted file mode 100644 index d4778b9bf6..0000000000 --- a/data/sched.data.s +++ /dev/null @@ -1,11 +0,0 @@ -.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 purposee registers - -.section .data - -glabel D_8012D290 - .incbin "baserom.z64", 0xBA4430, 0x10 diff --git a/include/functions.h b/include/functions.h index d683237b0d..f7eaba1a1b 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1588,7 +1588,7 @@ void GameState_Init(GameState* gameState, GameStateFunc init, GraphicsContext* g void GameState_Destroy(GameState* gameState); GameStateFunc GameState_GetInit(GameState* gameState); u32 GameState_IsRunning(GameState* gameState); -void* GameState_AllocEnd(GameState* gameState, size_t size, char* file, s32 line); +void* GameState_Alloc(GameState* gameState, size_t size, char* file, s32 line); void func_800C55D0(GameAlloc* this); void* GameAlloc_MallocDebug(GameAlloc* this, u32 size, const char* file, s32 line); void* GameAlloc_Malloc(GameAlloc* this, u32 size); @@ -1633,24 +1633,24 @@ void PadMgr_HandlePreNMI(PadMgr* padmgr); // fault.c (actual bug in game), and the compiler notices and won't compile it // void PadMgr_RequestPadData(PadMgr* padmgr, Input* inputs, s32 mode); void PadMgr_Init(PadMgr* padmgr, OSMesgQueue* siIntMsgQ, UNK_TYPE arg2, OSId id, OSPri priority, void* stack); -// ? func_800C82A0(?); -// ? func_800C84E4(?); -// ? func_800C8534(?); -// ? func_800C87CC(?); -// ? func_800C87F0(?); -// ? func_800C8910(?); -// ? func_800C89D4(?); -// ? func_800C8A94(?); -// ? func_800C8BC4(?); -// ? func_800C8C40(?); -// ? func_800C8CB8(?); -// ? func_800C8EDC(?); -// ? func_800C9018(?); -// ? func_800C91BC(?); -// ? func_800C94B4(?); -// ? func_800C95F8(?); -void func_800C9644(u32 a0); -// ? func_800C9874(?); +void Sched_SwapFrameBuffer(CfbInfo* cfbInfo); +void func_800C84E4(SchedContext* sc, CfbInfo* cfbInfo); +void Sched_HandleReset(SchedContext* sc); +void Sched_HandleStart(SchedContext* sc); +void Sched_QueueTask(SchedContext* sc, OSScTask* task); +void Sched_Yield(SchedContext* sc); +OSScTask* func_800C89D4(SchedContext* sc, OSScTask* task); +s32 Sched_Schedule(SchedContext* sc, OSScTask** sp, OSScTask** dp, s32 state); +void func_800C8BC4(SchedContext* sc, OSScTask* task); +u32 Sched_IsComplete(SchedContext* sc, OSScTask* task); +void Sched_RunTask(SchedContext* sc, OSScTask* spTask, OSScTask* dpTask); +void Sched_HandleEntry(SchedContext* sc); +void Sched_HandleRetrace(SchedContext* sc); +void Sched_HandleRSPDone(SchedContext* sc); +void Sched_HandleRDPDone(SchedContext* sc); +void Sched_SendEntryMsg(OSMesgQueue* mq); +void Sched_ThreadEntry(void* arg); +void Sched_Init(SchedContext* sc, void* stack, OSPri priority, UNK_TYPE arg3, UNK_TYPE arg4, IrqMgr* irqMgr); void SpeedMeter_InitImpl(SpeedMeter* this, u32 arg1, u32 y); void SpeedMeter_Init(SpeedMeter* this); void SpeedMeter_Destroy(SpeedMeter* this); @@ -2056,7 +2056,7 @@ void func_800E301C(void* callback); // ? func_800E6818(?); // ? func_800E6840(?); // ? func_800E6880(?); -s32 osAiSetNextBuffer(void *, u32); +s32 osAiSetNextBuffer(void*, u32); void Audio_NoteSetVelPanReverb(Note* note, NoteSubEu* sub, Reverb* reverb); void Audio_NoteSetResamplingRate(NoteSubEu* noteSubEu, f32 resamplingRateInput); void Audio_NoteInit(Note* note); @@ -2276,7 +2276,7 @@ Gfx* GfxPrint_Close(GfxPrint*); void GfxPrint_VPrintf(GfxPrint*, const char*, va_list); void GfxPrint_Printf(GfxPrint*, const char*, ...); void func_800FBCE0(); -void func_800FBFD8(); +void func_800FBFD8(void); void* Overlay_AllocateAndLoad(u32 vRomStart, u32 vRomEnd, void* vRamStart, void* vRamEnd); // ? MtxConv_L2F(?); void Overlay_DoRelocation(void* allocatedVRamAddress, OverlayRelocationSection* overlayInfo, void* vRamAddress); @@ -2487,7 +2487,7 @@ u8 osMempakAddrCRC(u16 addr); u8 osMempakDataCRC(u8* data); u32 __osSpGetStatus(); void __osSpSetStatus(u32 status); -// ? osWritebackDCacheAll(?); +void osWritebackDCacheAll(void); OSThread* __osGetCurrFaultedThread(); // ? guMtxF2L(?); // ? __d_to_ll(?); @@ -2498,7 +2498,7 @@ OSThread* __osGetCurrFaultedThread(); // ? __ll_to_f(?); // ? __ull_to_d(?); // ? __ull_to_f(?); -// ? osViGetCurrentFramebuffer(?); +u32* osViGetCurrentFramebuffer(void); // ? __osSpSetPc(?); f32 absf(f32); void* func_80106860(void* ptr, s32 val, size_t size); diff --git a/include/variables.h b/include/variables.h index 017e7f1d2d..de78b01dbd 100644 --- a/include/variables.h +++ b/include/variables.h @@ -616,7 +616,6 @@ extern void* D_8012D1F0; extern s32 gScreenWidth; extern s32 gScreenHeight; extern u32 gSystemHeapSize; -extern volatile u32 D_8012D290; extern Mtx gMtxClear; extern MtxF gMtxFClear; extern u8 D_8012DBB0; @@ -3482,14 +3481,6 @@ extern SchedContext gSchedContext; extern PadMgr gPadMgr; //extern ? D_80166D28; extern u32 gSegments[NUM_SEGMENTS]; -//extern ? D_8016A500; -//extern ? D_8016A504; -//extern ? D_8016A508; -//extern ? D_8016A50C; -//extern ? D_8016A510; -//extern ? D_8016A514; -//extern ? D_8016A518; -//extern ? D_8016A51C; extern volatile OSTime D_8016A520; extern volatile OSTime D_8016A528; extern volatile OSTime D_8016A530; @@ -3498,11 +3489,10 @@ extern volatile OSTime D_8016A540; extern volatile OSTime D_8016A548; extern volatile OSTime D_8016A550; extern volatile OSTime D_8016A558; -extern volatile OSTime D_8016A560; -extern volatile OSTime D_8016A568; -//extern ? D_8016A570; -//extern ? D_8016A574; -extern volatile OSTime D_8016A580; +extern volatile OSTime gRSPAudioTotalTime; +extern volatile OSTime gRSPGFXTotalTime; +extern volatile OSTime gRSPOtherTotalTime; +extern volatile OSTime gRDPTotalTime; extern SpeedMeterTimeEntry* gSpeedMeterTimeEntryPtr; //extern ? D_8016A590; //extern ? D_8016A594; diff --git a/include/z64.h b/include/z64.h index 554becdf77..8450753e59 100644 --- a/include/z64.h +++ b/include/z64.h @@ -238,11 +238,24 @@ typedef struct { /* 0x000C */ Gfx* d; } TwoHeadGfxArena; // size = 0x10 +typedef struct { + /* 0x00 */ u16* fb1; + /* 0x04 */ u16* swapBuffer; + /* 0x08 */ OSViMode* viMode; + /* 0x0C */ u32 features; + /* 0x10 */ u8 unk_10; + /* 0x11 */ s8 updateRate; + /* 0x12 */ s8 updateRate2; + /* 0x13 */ u8 unk_13; + /* 0x14 */ f32 xScale; + /* 0x18 */ f32 yScale; +} CfbInfo; // size = 0x1C + typedef struct OSScTask { /* 0x00 */ struct OSScTask* next; /* 0x04 */ u32 state; /* 0x08 */ u32 flags; - /* 0x0C */ void* framebuffer; + /* 0x0C */ CfbInfo* framebuffer; /* 0x10 */ OSTask list; /* 0x50 */ OSMesgQueue* msgQ; /* 0x54 */ OSMesg msg; @@ -1364,48 +1377,6 @@ typedef struct { /* 0x10 */ u32 data[1]; } Yaz0Header; // size = 0x10 ("data" is not part of the header) -// == Previously sched.h - -#define OS_SC_NEEDS_RDP 0x0001 -#define OS_SC_NEEDS_RSP 0x0002 -#define OS_SC_DRAM_DLIST 0x0004 -#define OS_SC_PARALLEL_TASK 0x0010 -#define OS_SC_LAST_TASK 0x0020 -#define OS_SC_SWAPBUFFER 0x0040 - -#define OS_SC_RCP_MASK 0x0003 -#define OS_SC_TYPE_MASK 0x0007 - -typedef struct { - /* 0x00 */ char unk_00[0x12]; - /* 0x12 */ s8 unk_12; -} struct_800C8BC4; - -typedef struct { - /* 0x0000 */ OSMesgQueue interruptQ; - /* 0x0018 */ OSMesg intBuf[8]; - /* 0x0038 */ OSMesgQueue cmdQ; - /* 0x0050 */ OSMesg cmdMsgBuf[8]; - /* 0x0070 */ OSThread thread; - /* 0x0220 */ char unk_220[0x10]; - /* 0x0230 */ OSScTask* curRSPTask; - /* 0x0234 */ OSScTask* curRDPTask; - /* 0x0238 */ char unk_238[0x08]; - /* 0x0240 */ struct_800C8BC4* unk_240; - /* 0x0244 */ UNK_TYPE pendingSwapBuf1; - /* 0x0220 */ char unk_248[0x04]; - /* 0x0220 */ UNK_TYPE unk_24C; - /* 0x0220 */ UNK_TYPE unk_250; - /* 0x0220 */ char unk_254[0x04]; -} SchedContext; // size = 0x258 - -// ======================== - -#define OS_SC_RETRACE_MSG 1 -#define OS_SC_DONE_MSG 2 -#define OS_SC_NMI_MSG 3 // name is made up, 3 is OS_SC_RDP_DONE_MSG in the original sched.c -#define OS_SC_PRE_NMI_MSG 4 - typedef struct { /* 0x00 */ s16 type; /* 0x02 */ char misc[0x1E]; @@ -1430,6 +1401,56 @@ typedef struct { /* 0x278 */ OSTime retraceTime; } IrqMgr; // size = 0x280 +// == Previously sched.h + +#define OS_SC_NEEDS_RDP 0x0001 +#define OS_SC_NEEDS_RSP 0x0002 +#define OS_SC_DRAM_DLIST 0x0004 +#define OS_SC_PARALLEL_TASK 0x0010 +#define OS_SC_LAST_TASK 0x0020 +#define OS_SC_SWAPBUFFER 0x0040 + +#define OS_SC_RCP_MASK 0x0003 +#define OS_SC_TYPE_MASK 0x0007 + +typedef struct { + /* 0x0000 */ u16* curBuffer; + /* 0x0004 */ u16* nextBuffer; +} FrameBufferSwap; + +typedef struct { + /* 0x0000 */ OSMesgQueue interruptQ; + /* 0x0018 */ OSMesg intBuf[8]; + /* 0x0038 */ OSMesgQueue cmdQ; + /* 0x0050 */ OSMesg cmdMsgBuf[8]; + /* 0x0070 */ OSThread thread; + /* 0x0220 */ OSScTask* audioListHead; + /* 0x0224 */ OSScTask* gfxListHead; + /* 0x0228 */ OSScTask* audioListTail; + /* 0x022C */ OSScTask* gfxListTail; + /* 0x0230 */ OSScTask* curRSPTask; + /* 0x0234 */ OSScTask* curRDPTask; + /* 0x0238 */ s32 retraceCnt; + /* 0x023C */ s32 doAudio; + /* 0x0240 */ CfbInfo* curBuf; + /* 0x0244 */ CfbInfo* pendingSwapBuf1; + /* 0x0220 */ CfbInfo* pendingSwapBuf2; + /* 0x0220 */ UNK_TYPE unk_24C; + /* 0x0250 */ IrqMgrClient irqClient; +} SchedContext; // size = 0x258 + +// ======================== + +#define OS_SC_RETRACE_MSG 1 +#define OS_SC_DONE_MSG 2 +#define OS_SC_NMI_MSG 3 // name is made up, 3 is OS_SC_RDP_DONE_MSG in the original sched.c +#define OS_SC_PRE_NMI_MSG 4 + +#define OS_SC_DP 0x0001 +#define OS_SC_SP 0x0002 +#define OS_SC_YIELD 0x0010 +#define OS_SC_YIELDED 0x0020 + typedef struct { struct { /* 0x0000 */ s32 unk_0[0x10]; // not char to avoid generating lwl/lwr swl/swr in a struct copy @@ -1590,19 +1611,6 @@ typedef struct { /* 0xD4 */ u32 geometryMode; } UCodeDisas; // size = 0xD8 -typedef struct { - /* 0x00 */ u16* fb1; - /* 0x04 */ u16* swapbuffer; - /* 0x08 */ OSViMode* viMode; - /* 0x0C */ u32 features; - /* 0x10 */ u8 unk_10; - /* 0x11 */ u8 updateRate; - /* 0x12 */ u8 updateRate2; - /* 0x13 */ u8 unk_13; - /* 0x14 */ f32 xScale; - /* 0x18 */ f32 yScale; -} CfbInfo; // size = 0x1C - typedef struct { /* 0x00 */ u16 table[8*8]; } JpegQuantizationTable; // size = 0x80 diff --git a/spec b/spec index d4a038c594..55f9f0bd3f 100644 --- a/spec +++ b/spec @@ -407,8 +407,6 @@ beginseg include "build/src/code/main.o" include "build/src/code/padmgr.o" include "build/src/code/sched.o" - include "build/data/sched.data.o" - include "build/data/sched.bss.o" include "build/src/code/speed_meter.o" include "build/src/code/sys_cfb.o" include "build/src/code/sys_math.o" diff --git a/src/code/audioMgr.c b/src/code/audioMgr.c index e87813503e..cdec774cba 100644 --- a/src/code/audioMgr.c +++ b/src/code/audioMgr.c @@ -26,7 +26,7 @@ void AudioMgr_HandleRetrace(AudioMgr* audioMgr) { audioMgr->unk_5C = NULL; osSendMesg(&audioMgr->sched->cmdQ, &audioMgr->unk_8, OS_MESG_BLOCK); - func_800C95F8(audioMgr->sched); + Sched_SendEntryMsg(audioMgr->sched); } D_8016A550 = osGetTime(); if (SREG(20) >= 2) { diff --git a/src/code/game.c b/src/code/game.c index 7bbfb965a4..7a29a081a7 100644 --- a/src/code/game.c +++ b/src/code/game.c @@ -496,7 +496,7 @@ u32 GameState_IsRunning(GameState* gameState) { return gameState->running; } -void* GameState_AllocEnd(GameState* gameState, size_t size, char* file, s32 line) { +void* GameState_Alloc(GameState* gameState, size_t size, char* file, s32 line) { void* ret; if (THA_IsCrash(&gameState->tha)) { diff --git a/src/code/graph.c b/src/code/graph.c index e8c5a6393a..eab22cd5ca 100644 --- a/src/code/graph.c +++ b/src/code/graph.c @@ -244,7 +244,7 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) { cfb = sGraphCfbInfos + sGraphCfbInfoIdx++; cfb->fb1 = gfxCtx->curFrameBuffer; - cfb->swapbuffer = gfxCtx->curFrameBuffer; + cfb->swapBuffer = gfxCtx->curFrameBuffer; cfb->viMode = gfxCtx->viMode; cfb->features = gfxCtx->viFeatures; cfb->xScale = gfxCtx->xScale; @@ -257,7 +257,7 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) { gfxCtx->schedMsgQ = &gSchedContext.cmdQ; osSendMesg(&gSchedContext.cmdQ, scTask, OS_MESG_BLOCK); - func_800C95F8(&gSchedContext); // osScKickEntryMsg + Sched_SendEntryMsg(&gSchedContext); // osScKickEntryMsg } #else u32 D_8012D260 = 0; @@ -374,12 +374,12 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) { func_800F3054(); time = osGetTime(); - D_8016A538 = D_8016A568; - D_8016A530 = D_8016A560; - D_8016A540 = D_8016A580; - D_8016A568 = 0; - D_8016A560 = 0; - D_8016A580 = 0; + D_8016A538 = gRSPGFXTotalTime; + D_8016A530 = gRSPAudioTotalTime; + D_8016A540 = gRDPTotalTime; + gRSPGFXTotalTime = 0; + gRSPAudioTotalTime = 0; + gRDPTotalTime = 0; if (sGraphUpdateTime != 0) { D_8016A548 = time - sGraphUpdateTime; diff --git a/src/code/main.c b/src/code/main.c index 3b4abac431..6e08622873 100644 --- a/src/code/main.c +++ b/src/code/main.c @@ -79,7 +79,7 @@ void Main(void* arg0) { osSyncPrintf("タスクスケジューラの初期化\n"); // Initialize the task scheduler StackCheck_Init(&sSchedStackInfo, sSchedStack, sSchedStack + sizeof(sSchedStack), 0, 0x100, "sched"); - func_800C9874(&gSchedContext, &sAudioStack, 0xf, D_80013960, 1, &gIrqMgr); + Sched_Init(&gSchedContext, &sAudioStack, 0xf, D_80013960, 1, &gIrqMgr); IrqMgr_AddClient(&gIrqMgr, &irqClient, &irqMgrMsgQ); diff --git a/src/code/sched.c b/src/code/sched.c index a22b60ad25..ee91cfe6a8 100644 --- a/src/code/sched.c +++ b/src/code/sched.c @@ -1,9 +1,59 @@ #include #include -#pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_800C82A0.s") +#define RSP_DONE_MSG 667 +#define RDP_DONE_MSG 668 +#define ENTRY_MSG 670 -void func_800C84E4(SchedContext* sc, UNK_TYPE arg1) { +// data +volatile s32 sLogScheduler = false; + +// bss +OSTime sRSPGFXStartTime; +OSTime sRSPAudioStartTime; +OSTime sRSPOtherStartTime; +OSTime sRDPStartTime; + +void Sched_SwapFrameBuffer(CfbInfo* cfbInfo) { + u16 width; + LogUtils_CheckValidPointer("cfbinfo->swapbuffer", cfbInfo->swapBuffer, "../sched.c", 340); + if (cfbInfo->swapBuffer != NULL) { + osViSwapBuffer(cfbInfo->swapBuffer); + cfbInfo->updateRate2 = cfbInfo->updateRate; + if (sLogScheduler) { + osSyncPrintf("osViSwapBuffer %08x %08x %08x\n", osViGetCurrentFramebuffer(), osViGetNextFramebuffer(), + (cfbInfo != NULL ? cfbInfo->swapBuffer : NULL)); + } + width = cfbInfo->viMode != NULL ? cfbInfo->viMode->comRegs.width : gScreenWidth; + Fault_SetFB(cfbInfo->swapBuffer, width, 0x10); + if (HREG(80) == 0xD && HREG(95) != 0xD) { + HREG(81) = 0; + HREG(82) = 0; + HREG(83) = 1; + HREG(84) = 0; + HREG(85) = 1; + HREG(86) = 0; + HREG(87) = 0; + HREG(88) = 0; + HREG(89) = 0; + HREG(90) = 0; + HREG(91) = 0; + HREG(92) = 0; + HREG(93) = 0; + HREG(94) = 0; + HREG(95) = 0xD; + } + if (HREG(80) == 0xD && HREG(81) == 2) { + osViSetSpecialFeatures(HREG(82) != 0 ? 1 : 2); + osViSetSpecialFeatures(HREG(83) != 0 ? 0x40 : 0x80); + osViSetSpecialFeatures(HREG(84) != 0 ? 0x4 : 0x8); + osViSetSpecialFeatures(HREG(85) != 0 ? 0x10 : 0x20); + } + } + cfbInfo->unk_10 = 0; +} + +void func_800C84E4(SchedContext* sc, CfbInfo* cfbInfo) { if (sc->unk_24C != 0) { sc->unk_24C = 0; @@ -12,67 +62,189 @@ void func_800C84E4(SchedContext* sc, UNK_TYPE arg1) { } } - func_800C82A0(arg1); + Sched_SwapFrameBuffer(cfbInfo); } -#pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_800C8534.s") +void Sched_HandleReset(SchedContext* sc) { + OSTime now; + if (sc->curRSPTask != NULL) { + now = osGetTime(); + if (sc->curRSPTask->framebuffer == NULL) { + LOG_TIME("(((u64)(now - audio_rsp_start_time)*(1000000LL/15625LL))/((62500000LL*3/4)/15625LL))", + OS_CYCLES_TO_USEC(now - sRSPAudioStartTime), "../sched.c", 421); + } else if (OS_CYCLES_TO_USEC(now - sRSPGFXStartTime) > 1000000 || + OS_CYCLES_TO_USEC(now - sRDPStartTime) > 1000000) { + func_800FBFD8(); + if (sc->curRSPTask != NULL) { + LOG_TIME("(((u64)(now - graph_rsp_start_time)*(1000000LL/15625LL))/((62500000LL*3/4)/15625LL))", + OS_CYCLES_TO_USEC(now - sRSPGFXStartTime), "../sched.c", 427); + osSendMesg(&sc->interruptQ, RSP_DONE_MSG, OS_MESG_NOBLOCK); + } + if (sc->curRDPTask != NULL) { + LOG_TIME("(((u64)(now - rdp_start_time)*(1000000LL/15625LL))/((62500000LL*3/4)/15625LL))", + OS_CYCLES_TO_USEC(now - sRDPStartTime), "../sched.c", 431); + osSendMesg(&sc->interruptQ, RDP_DONE_MSG, 0); + } + } + } +} -void func_800C87CC(SchedContext* sc) { +void Sched_HandleStart(SchedContext* sc) { ViConfig_UpdateVi(1); } -#pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_800C87F0.s") +void Sched_QueueTask(SchedContext* sc, OSScTask* task) { + s32 type = task->list.t.type; + if (!((type == M_AUDTASK) || (type == M_GFXTASK) || (type == M_NJPEGTASK) || (type == M_NULTASK))) { + __assert("(type == M_AUDTASK) || (type == M_GFXTASK) || (type == M_NJPEGTASK) || (type == M_NULTASK)", + "../sched.c", 463); + } -void func_800C8910(SchedContext* sc) { - if (!(sc->curRSPTask->state & 0x10)) { + if (type == M_AUDTASK) { + if (sLogScheduler) { + // You have entered an audio task + osSyncPrintf("オーディオタスクをエントリしました\n"); + } + if (sc->audioListTail != NULL) { + sc->audioListTail->next = task; + } else { + sc->audioListHead = task; + } + sc->audioListTail = task; + sc->doAudio = 1; + } else { + if (sLogScheduler) { + // Entered graph task + osSyncPrintf("グラフタスクをエントリしました\n"); + } + + if (sc->gfxListTail != NULL) { + sc->gfxListTail->next = task; + } else { + sc->gfxListHead = task; + } + sc->gfxListTail = task; + } + task->next = NULL; + task->state = task->flags & (OS_SC_NEEDS_RDP | OS_SC_NEEDS_RSP); +} + +void Sched_Yield(SchedContext* sc) { + if (!(sc->curRSPTask->state & OS_SC_YIELD)) { if (sc->curRSPTask->list.t.type == M_AUDTASK) { __assert("sc->curRSPTask->list.t.type != M_AUDTASK", "../sched.c", 496); } - sc->curRSPTask->state |= 0x10; + sc->curRSPTask->state |= OS_SC_YIELD; osSpTaskYield(); - if (D_8012D290 != 0) { + if (sLogScheduler) { osSyncPrintf("%08d:osSpTaskYield\n", (u32)(OS_CYCLES_TO_USEC(osGetTime()))); } } } -#pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_800C89D4.s") +OSScTask* func_800C89D4(SchedContext* sc, OSScTask* task) { + if (task == NULL) { + return NULL; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_800C8A94.s") + if (sc->pendingSwapBuf1 != NULL) { + if (0) { + __assert("sc->pending_swapbuffer1", "../sched.c", UNK_LINE); + } + return NULL; + } -typedef struct { - /* 0x00 */ char unk_00[0x04]; - /* 0x00 */ u32 unk_04; - /* 0x00 */ u32 unk_08; - /* 0x0C */ UNK_TYPE unk_0C; - /* 0x10 */ char unk_10[0x40]; - /* 0x50 */ OSMesgQueue* msgQ; - /* 0x54 */ OSMesg msg; -} struct_800C8C40; + if (sc->pendingSwapBuf2 != NULL) { + if (0) { + __assert("sc->pending_swapbuffer2", "../sched.c", UNK_LINE); + } + return NULL; + } -void func_800C8BC4(SchedContext* sc, struct_800C8C40* arg1) { - if (sc->pendingSwapBuf1 == 0) { - sc->pendingSwapBuf1 = arg1->unk_0C; + if ((sc->pendingSwapBuf2 != NULL ? sc->pendingSwapBuf2->swapBuffer : NULL) == task->framebuffer->fb1) { + return NULL; + } + + if ((sc->pendingSwapBuf1 != NULL ? sc->pendingSwapBuf1->swapBuffer : NULL) == task->framebuffer->fb1) { + return NULL; + } + + if (osViGetCurrentFramebuffer() == (u32*)task->framebuffer->fb1) { + return NULL; + } + + return task; +} + +#ifdef NON_MATCHING +// regalloc +s32 Sched_Schedule(SchedContext* sc, OSScTask** sp, OSScTask** dp, s32 state) { + s32 ret = state; + OSScTask* gfxTask = sc->gfxListHead; + OSScTask* audioTask = sc->audioListHead; + + if (sc->doAudio && ret & OS_SC_SP) { + *sp = audioTask; + ret &= ~OS_SC_SP; + sc->doAudio = 0; + sc->audioListHead = sc->audioListHead->next; + if (sc->audioListHead == NULL) { + sc->audioListTail = NULL; + } + } else { + if (gfxTask != NULL) { + if (gfxTask->state & OS_SC_YIELDED || !(sc->gfxListHead->flags & OS_SC_NEEDS_RDP)) { + if (ret & OS_SC_SP) { + *sp = gfxTask; + ret &= ~OS_SC_SP; + sc->gfxListHead = sc->gfxListHead->next; + if (sc->gfxListHead == NULL) { + sc->gfxListTail = NULL; + } + } + } else { + if (ret == (OS_SC_SP | OS_SC_DP)) { + if (sc->gfxListHead->framebuffer == NULL || func_800C89D4(sc, gfxTask) != NULL) { + *sp = *dp = gfxTask; + ret &= ~(OS_SC_SP | OS_SC_DP); + sc->gfxListHead = sc->gfxListHead->next; + if (sc->gfxListHead == NULL) { + sc->gfxListTail = NULL; + } + } + } + } + } + } + return ret; +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/sched/Sched_Schedule.s") +#endif + +void func_800C8BC4(SchedContext* sc, OSScTask* task) { + if (sc->pendingSwapBuf1 == NULL) { + sc->pendingSwapBuf1 = task->framebuffer; LogUtils_CheckValidPointer("sc->pending_swapbuffer1", sc->pendingSwapBuf1, "../sched.c", 618); - if ((sc->unk_240 == NULL) || (sc->unk_240->unk_12 < 1)) { - func_800C84E4(sc, arg1->unk_0C); + if ((sc->curBuf == NULL) || (sc->curBuf->updateRate2 < 1)) { + func_800C84E4(sc, task->framebuffer); } } } -u32 func_800C8C40(SchedContext* sc, struct_800C8C40* arg1) { - if (!(arg1->unk_04 & 3)) { - if (arg1->msgQ != NULL) { - osSendMesg(arg1->msgQ, arg1->msg, OS_MESG_BLOCK); +u32 Sched_IsComplete(SchedContext* sc, OSScTask* task) { + if (!(task->state & (OS_SC_DP | OS_SC_SP))) { + if (task->msgQ != NULL) { + osSendMesg(task->msgQ, task->msg, OS_MESG_BLOCK); } - if (arg1->unk_08 & 0x40) { - func_800C8BC4(sc, arg1); + if (task->flags & OS_SC_SWAPBUFFER) { + func_800C8BC4(sc, task); } return 1; @@ -81,34 +253,259 @@ u32 func_800C8C40(SchedContext* sc, struct_800C8C40* arg1) { return 0; } -#pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_800C8CB8.s") +void Sched_RunTask(SchedContext* sc, OSScTask* spTask, OSScTask* dpTask) { -#pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_800C8EDC.s") + if (sc->curRSPTask != NULL) { + __assert("sc->curRSPTask == NULL", "../sched.c", 663); + } + if (spTask != NULL) { + if (spTask->list.t.type == 0) { + if (spTask->flags & OS_SC_NEEDS_RSP) { + spTask->state &= ~OS_SC_SP; + sc->curRSPTask = NULL; + } + if (spTask->flags & OS_SC_NEEDS_RDP) { + spTask->state &= ~OS_SC_DP; + sc->curRDPTask = NULL; + } + Sched_IsComplete(sc, spTask); + return; + } + spTask->state &= ~(OS_SC_YIELD | OS_SC_YIELDED); + osWritebackDCacheAll(); + osSpTaskLoad(&spTask->list); -#pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_800C9018.s") + if (spTask->list.t.type == M_AUDTASK) { + sRSPAudioStartTime = osGetTime(); + } else if (spTask->list.t.type == M_GFXTASK) { + sRSPGFXStartTime = osGetTime(); + } else { + sRSPOtherStartTime = osGetTime(); + } -#pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_800C91BC.s") + osSpTaskStartGo(&spTask->list); + if (sLogScheduler) { + osSyncPrintf( + "%08d:osSpTaskStartGo(%08x) %s\n", (u32)OS_CYCLES_TO_USEC(osGetTime()), &spTask->list, + (spTask->list.t.type == M_AUDTASK ? "AUDIO" : (spTask->list.t.type == M_GFXTASK ? "GRAPH" : "OTHER"))); + } + sc->curRSPTask = spTask; + if (spTask == dpTask && sc->curRDPTask == NULL) { + sc->curRDPTask = dpTask; + sRDPStartTime = sRSPGFXStartTime; + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_800C94B4.s") +void Sched_HandleEntry(SchedContext* sc) { + OSScTask* nextRSP; + OSScTask* nextRDP; + u32 state; + OSMesg msg; -void func_800C95F8(OSMesgQueue* mq) { - if (D_8012D290 != 0) { + nextRSP = NULL; + nextRDP = NULL; + msg = NULL; + while (osRecvMesg(&sc->cmdQ, &msg, OS_MESG_NOBLOCK) != -1) { + Sched_QueueTask(sc, msg); + } + + if (sc->doAudio != 0 && sc->curRSPTask != NULL) { + if (sLogScheduler) { + osSyncPrintf("[YIELD B]"); + } + Sched_Yield(sc); + return; + } + state = ((sc->curRSPTask == 0) * 2) | (sc->curRDPTask == 0); + if (Sched_Schedule(sc, &nextRSP, &nextRDP, state) != state) { + Sched_RunTask(sc, nextRSP, nextRDP); + } + if (sLogScheduler) { + osSyncPrintf("EN sc:%08x sp:%08x dp:%08x state:%x\n", sc, nextRSP, nextRDP, state); + } +} + +void Sched_HandleRetrace(SchedContext* sc) { + if (sLogScheduler) { + osSyncPrintf("%08d:scHandleRetrace %08x\n", (u32)OS_CYCLES_TO_USEC(osGetTime()), osViGetCurrentFramebuffer()); + } + ViConfig_UpdateBlack(); + sc->retraceCnt++; + if (osViGetCurrentFramebuffer() == (u32*)(sc->pendingSwapBuf1 != NULL ? sc->pendingSwapBuf1->swapBuffer : NULL)) { + if (sc->curBuf != NULL) { + sc->curBuf->unk_10 = 0; + } + + if (sc->pendingSwapBuf1 != NULL) { + sc->pendingSwapBuf1->unk_10 = 0; + } + sc->curBuf = sc->pendingSwapBuf1; + sc->pendingSwapBuf1 = sc->pendingSwapBuf2; + sc->pendingSwapBuf2 = NULL; + } + if (sc->curBuf != NULL) { + if (sc->curBuf->updateRate2 > 0) { + sc->curBuf->updateRate2--; + } + + if ((sc->curBuf->updateRate2 <= 0) && (sc->pendingSwapBuf1 != NULL)) { + func_800C84E4(sc, sc->pendingSwapBuf1); + } + } + if (sLogScheduler) { + osSyncPrintf("%08x %08x %08x %d\n", osViGetCurrentFramebuffer(), osViGetNextFramebuffer(), + sc->pendingSwapBuf1 != NULL ? sc->pendingSwapBuf1->swapBuffer : NULL, + sc->curBuf != NULL ? sc->curBuf->updateRate2 : 0); + } + Sched_HandleEntry(sc); +} + +void Sched_HandleRSPDone(SchedContext* sc) { + OSScTask* curRSPTask; + OSScTask* nextRSP; + OSScTask* nextRDP; + s32 state; + + nextRSP = NULL; + nextRDP = NULL; + if (sc->curRSPTask == NULL) { + __assert("sc->curRSPTask", "../sched.c", 819); + } + + if (sc->curRSPTask->list.t.type == M_AUDTASK) { + gRSPAudioTotalTime += osGetTime() - sRSPAudioStartTime; + } else if (sc->curRSPTask->list.t.type == M_GFXTASK) { + gRSPGFXTotalTime += osGetTime() - sRSPGFXStartTime; + } else { + gRSPOtherTotalTime += osGetTime() - sRSPOtherStartTime; + } + + curRSPTask = sc->curRSPTask; + sc->curRSPTask = NULL; + if (sLogScheduler) { + osSyncPrintf("RSP DONE %d %d", curRSPTask->state & 0x10, osSpTaskYielded(&curRSPTask->list)); + } + if (curRSPTask->state & OS_SC_YIELD && osSpTaskYielded(&curRSPTask->list)) { + if (sLogScheduler) { + osSyncPrintf("[YIELDED]\n"); + } + curRSPTask->state |= OS_SC_YIELDED; + curRSPTask->next = sc->gfxListHead; + sc->gfxListHead = curRSPTask; + if (sc->gfxListTail == NULL) { + sc->gfxListTail = curRSPTask; + } + } else { + if (sLogScheduler) { + osSyncPrintf("[NOT YIELDED]\n"); + } + curRSPTask->state &= ~OS_SC_SP; + Sched_IsComplete(sc, curRSPTask); + } + state = ((sc->curRSPTask == NULL) << 1) | (sc->curRDPTask == NULL); + if (Sched_Schedule(sc, &nextRSP, &nextRDP, state) != state) { + Sched_RunTask(sc, nextRSP, nextRDP); + } + if (sLogScheduler) { + osSyncPrintf("SP sc:%08x sp:%08x dp:%08x state:%x\n", sc, nextRSP, nextRDP, state); + } +} + +void Sched_HandleRDPDone(SchedContext* sc) { + OSScTask* curTask; + OSScTask* nextRSP; + OSScTask* nextRDP; + s32 state; + + nextRSP = NULL; + nextRDP = NULL; + + gRDPTotalTime = osGetTime() - sRDPStartTime; + if (sc->curRDPTask == NULL) { + __assert("sc->curRDPTask", "../sched.c", 878); + } + if (sc->curRDPTask->list.t.type != M_GFXTASK) { + __assert("sc->curRDPTask->list.t.type == M_GFXTASK", "../sched.c", 879); + } + curTask = sc->curRDPTask; + sc->curRDPTask = NULL; + curTask->state &= ~OS_SC_DP; + Sched_IsComplete(sc, curTask); + state = ((sc->curRSPTask == NULL) << 1) | (sc->curRDPTask == NULL); + if (Sched_Schedule(sc, &nextRSP, &nextRDP, state) != state) { + Sched_RunTask(sc, nextRSP, nextRDP); + } + if (sLogScheduler) { + osSyncPrintf("DP sc:%08x sp:%08x dp:%08x state:%x\n", sc, nextRSP, nextRDP, state); + } +} + +void Sched_SendEntryMsg(OSMesgQueue* mq) { + if (sLogScheduler) { osSyncPrintf("osScKickEntryMsg\n"); } - osSendMesg(mq, 670, OS_MESG_BLOCK); + osSendMesg(mq, ENTRY_MSG, OS_MESG_BLOCK); } -#pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_800C9644.s") +void Sched_ThreadEntry(void* arg) { + void* msg; + SchedContext* sc = (SchedContext*)arg; -void func_800C9874(SchedContext* sc, void* stack, OSPri priority, UNK_TYPE arg3, UNK_TYPE arg4, UNK_TYPE arg5) { + msg = NULL; + while (1) { + if (sLogScheduler) { + // %08d: standby + osSyncPrintf("%08d:待機中\n", (u32)OS_CYCLES_TO_USEC(osGetTime())); + } + + osRecvMesg(&sc->interruptQ, &msg, OS_MESG_BLOCK); + + switch ((s32)msg) { + case ENTRY_MSG: + if (sLogScheduler) { + osSyncPrintf("%08d:ENTRY_MSG\n", (u32)OS_CYCLES_TO_USEC(osGetTime())); + } + Sched_HandleEntry(sc); + continue; + case RSP_DONE_MSG: + if (sLogScheduler) { + osSyncPrintf("%08d:RSP_DONE_MSG\n", (u32)OS_CYCLES_TO_USEC(osGetTime())); + } + Sched_HandleRSPDone(sc); + continue; + case RDP_DONE_MSG: + if (sLogScheduler) { + osSyncPrintf("%08d:RDP_DONE_MSG\n", (u32)OS_CYCLES_TO_USEC(osGetTime())); + } + Sched_HandleRDPDone(sc); + continue; + default: + break; + } + switch (((OSScMsg*)msg)->type) { + case 1: + Sched_HandleRetrace(sc); + continue; + case 4: + Sched_HandleReset(sc); + continue; + case 3: + Sched_HandleStart(sc); + continue; + } + } +} + +void Sched_Init(SchedContext* sc, void* stack, OSPri priority, UNK_TYPE arg3, UNK_TYPE arg4, IrqMgr* irqMgr) { bzero(sc, sizeof(SchedContext)); sc->unk_24C = 1; osCreateMesgQueue(&sc->interruptQ, sc->intBuf, 8); osCreateMesgQueue(&sc->cmdQ, sc->cmdMsgBuf, 8); - osSetEventMesg(4, &sc->interruptQ, 667); - osSetEventMesg(9, &sc->interruptQ, 668); - IrqMgr_AddClient(arg5, &sc->unk_250, sc); - osCreateThread(&sc->thread, 5, func_800C9644, sc, stack, priority); + osSetEventMesg(OS_EVENT_SP, &sc->interruptQ, RSP_DONE_MSG); + osSetEventMesg(OS_EVENT_DP, &sc->interruptQ, RDP_DONE_MSG); + IrqMgr_AddClient(irqMgr, &sc->irqClient, &sc->interruptQ); + osCreateThread(&sc->thread, 5, Sched_ThreadEntry, sc, stack, priority); osStartThread(&sc->thread); } diff --git a/src/code/speed_meter.c b/src/code/speed_meter.c index 35790bbf1d..0e04fa954d 100644 --- a/src/code/speed_meter.c +++ b/src/code/speed_meter.c @@ -2,6 +2,21 @@ #include #include +volatile OSTime D_8016A520; +volatile OSTime D_8016A528; +volatile OSTime D_8016A530; +volatile OSTime D_8016A538; +volatile OSTime D_8016A540; +volatile OSTime D_8016A548; +volatile OSTime D_8016A550; +volatile OSTime D_8016A558; +volatile OSTime gRSPAudioTotalTime; +volatile OSTime gRSPGFXTotalTime; +volatile OSTime gRSPOtherTotalTime; +volatile OSTime D_8016A578; +volatile OSTime gRDPTotalTime; +SpeedMeterTimeEntry* gSpeedMeterTimeEntryPtr; + SpeedMeterTimeEntry sSpeedMeterTimeEntryArray[] = { { &D_8016A520, 0, 0, GPACK_RGBA5551(0xFF, 0x00, 0x00, 1) }, { &D_8016A528, 0, 2, GPACK_RGBA5551(0xFF, 0xFF, 0x00, 1) }, diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c index 487e1a841b..46a2944c8c 100644 --- a/src/code/sys_matrix.c +++ b/src/code/sys_matrix.c @@ -21,7 +21,7 @@ MtxF* sMatrixStack; // "Matrix_stack" MtxF* sCurrentMatrix; // "Matrix_now" void Matrix_Init(GameState* gameState) { - sCurrentMatrix = GameState_AllocEnd(gameState, 20 * sizeof(MtxF), "../sys_matrix.c", 153); + sCurrentMatrix = GameState_Alloc(gameState, 20 * sizeof(MtxF), "../sys_matrix.c", 153); sMatrixStack = sCurrentMatrix; } diff --git a/src/code/z_construct.c b/src/code/z_construct.c index 8d8d73faf2..e1aefde9bc 100644 --- a/src/code/z_construct.c +++ b/src/code/z_construct.c @@ -40,7 +40,7 @@ void func_801109B0(GlobalContext* globalCtx) { // Translates to: "Permanent PARAMETER Segment = %x" osSyncPrintf("常駐ＰＡＲＡＭＥＴＥＲセグメント=%x\n", parameterSize); - interfaceCtx->parameterSegment = GameState_AllocEnd(&globalCtx->state, parameterSize, "../z_construct.c", 159); + interfaceCtx->parameterSegment = GameState_Alloc(&globalCtx->state, parameterSize, "../z_construct.c", 159); osSyncPrintf("parameter->parameterSegment=%x", interfaceCtx->parameterSegment); @@ -50,7 +50,7 @@ void func_801109B0(GlobalContext* globalCtx) { DmaMgr_SendRequest1(interfaceCtx->parameterSegment, parameterStart, parameterSize, "../z_construct.c", 162); - interfaceCtx->do_actionSegment = GameState_AllocEnd(&globalCtx->state, 0x480, "../z_construct.c", 166); + interfaceCtx->do_actionSegment = GameState_Alloc(&globalCtx->state, 0x480, "../z_construct.c", 166); // Translates to: "DO Action Texture Initialization" osSyncPrintf("ＤＯアクション テクスチャ初期=%x\n", 0x480); @@ -84,7 +84,7 @@ void func_801109B0(GlobalContext* globalCtx) { DmaMgr_SendRequest1((void*)((u32)interfaceCtx->do_actionSegment + 0x300), do_actionStart + do_actionOffset, 0x180, "../z_construct.c", 178); - interfaceCtx->icon_itemSegment = GameState_AllocEnd(&globalCtx->state, 0x4000, "../z_construct.c", 190); + interfaceCtx->icon_itemSegment = GameState_Alloc(&globalCtx->state, 0x4000, "../z_construct.c", 190); // Translates to: "Icon Item Texture Initialization = %x" osSyncPrintf("アイコンアイテム テクスチャ初期=%x\n", 0x4000); @@ -201,7 +201,7 @@ void func_80110F68(GlobalContext* globalCtx) { View_Init(&msgCtx->view, globalCtx->state.gfxCtx); - msgCtx->textboxSegment = GameState_AllocEnd(&globalCtx->state, 0x2200, "../z_construct.c", 349); + msgCtx->textboxSegment = GameState_Alloc(&globalCtx->state, 0x2200, "../z_construct.c", 349); osSyncPrintf("message->fukidashiSegment=%x\n", msgCtx->textboxSegment); diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c index bc9afa4763..8c99bb3800 100644 --- a/src/code/z_effect_soft_sprite.c +++ b/src/code/z_effect_soft_sprite.c @@ -16,7 +16,7 @@ void EffectSs_InitInfo(GlobalContext* globalCtx, s32 tableSize) { } sEffectSsInfo.table = - GameState_AllocEnd(&globalCtx->state, tableSize * sizeof(EffectSs), "../z_effect_soft_sprite.c", 289); + GameState_Alloc(&globalCtx->state, tableSize * sizeof(EffectSs), "../z_effect_soft_sprite.c", 289); if (sEffectSsInfo.table == NULL) { __assert("EffectSS2Info.data_table != NULL", "../z_effect_soft_sprite.c", 290); } diff --git a/src/code/z_jpeg.c b/src/code/z_jpeg.c index 070cdadf71..609d1412f4 100644 --- a/src/code/z_jpeg.c +++ b/src/code/z_jpeg.c @@ -60,7 +60,7 @@ u32 Jpeg_SendTask(JpegContext* ctx) { ctx->scTask.list.t = sJpegTask; osSendMesg(&gSchedContext.cmdQ, (OSMesg)&ctx->scTask, OS_MESG_BLOCK); - func_800C95F8(&gSchedContext); // osScKickEntryMsg + Sched_SendEntryMsg(&gSchedContext); // osScKickEntryMsg osRecvMesg(&ctx->mq, NULL, OS_MESG_BLOCK); } diff --git a/src/code/z_kaleido_manager.c b/src/code/z_kaleido_manager.c index 4095e6a6ae..5fb9316e34 100644 --- a/src/code/z_kaleido_manager.c +++ b/src/code/z_kaleido_manager.c @@ -53,7 +53,7 @@ void KaleidoManager_Init(GlobalContext* globalCtx) { osSyncPrintf(VT_FGCOL(GREEN)); osSyncPrintf("KaleidoArea の最大サイズは %d バイトを確保します\n", largestOvl); osSyncPrintf(VT_RST); - sKaleidoAreaPtr = GameState_AllocEnd(&globalCtx->state, largestOvl, "../z_kaleido_manager.c", 150); + sKaleidoAreaPtr = GameState_Alloc(&globalCtx->state, largestOvl, "../z_kaleido_manager.c", 150); LogUtils_CheckNullPointer("KaleidoArea_allocp", sKaleidoAreaPtr, "../z_kaleido_manager.c", 151); osSyncPrintf(VT_FGCOL(GREEN)); osSyncPrintf("KaleidoArea %08x - %08x\n", sKaleidoAreaPtr, (u32)sKaleidoAreaPtr + largestOvl); diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c index aea0719ba0..690553acf0 100644 --- a/src/code/z_map_exp.c +++ b/src/code/z_map_exp.c @@ -232,7 +232,7 @@ void Map_Init(GlobalContext* globalCtx) { interfaceCtx->unk_258 = -1; interfaceCtx->unk_25A = -1; - interfaceCtx->mapSegment = GameState_AllocEnd(&globalCtx->state, 0x1000, "../z_map_exp.c", 457); + interfaceCtx->mapSegment = GameState_Alloc(&globalCtx->state, 0x1000, "../z_map_exp.c", 457); // Translates to "ＭＡＰ TEXTURE INITIALIZATION scene_data_ID=%d mapSegment=%x" osSyncPrintf("\n\n\nＭＡＰ テクスチャ初期化 scene_data_ID=%d\nmapSegment=%x\n\n", globalCtx->sceneNum, interfaceCtx->mapSegment, globalCtx); diff --git a/src/code/z_map_mark.c b/src/code/z_map_mark.c index deeeefaf70..510731fc66 100644 --- a/src/code/z_map_mark.c +++ b/src/code/z_map_mark.c @@ -57,7 +57,7 @@ void MapMark_Init(GlobalContext* globalCtx) { MapMarkDataOverlay* overlay = &sMapMarkDataOvl; u32 overlaySize = (u32)overlay->vramEnd - (u32)overlay->vramStart; - overlay->loadedRamAddr = GameState_AllocEnd(&globalCtx->state, overlaySize, "../z_map_mark.c", 235); + overlay->loadedRamAddr = GameState_Alloc(&globalCtx->state, overlaySize, "../z_map_mark.c", 235); LogUtils_CheckNullPointer("dlftbl->allocp", overlay->loadedRamAddr, "../z_map_mark.c", 236); Overlay_Load(overlay->vromStart, overlay->vromEnd, overlay->vramStart, overlay->vramEnd, overlay->loadedRamAddr); diff --git a/src/code/z_msgevent.c b/src/code/z_msgevent.c index c0fb5c8976..3a0f3f4170 100644 --- a/src/code/z_msgevent.c +++ b/src/code/z_msgevent.c @@ -16,6 +16,6 @@ void MsgEvent_SendNullTask() { task.list.t.type = M_NULTASK; osCreateMesgQueue(task.msgQ, &msg, 1); osSendMesg(&gSchedContext.cmdQ, &task, OS_MESG_BLOCK); - func_800C95F8(&gSchedContext); // osScKickEntryMsg + Sched_SendEntryMsg(&gSchedContext); // osScKickEntryMsg osRecvMesg(&queue, NULL, OS_MESG_BLOCK); } diff --git a/src/code/z_play.c b/src/code/z_play.c index 2f1411a92d..fcb0ae1362 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -371,7 +371,7 @@ void Gameplay_Init(GlobalContext* globalCtx) { osSyncPrintf("ZELDA ALLOC SIZE=%x\n", THA_GetSize(&globalCtx->state.tha)); zAllocSize = THA_GetSize(&globalCtx->state.tha); - zAlloc = GameState_AllocEnd(&globalCtx->state, zAllocSize, "../z_play.c", 2918); + zAlloc = GameState_Alloc(&globalCtx->state, zAllocSize, "../z_play.c", 2918); zAllocAligned = (void*)(((u32)zAlloc + 8) & ~0xF); ZeldaArena_Init(zAllocAligned, zAllocSize - (u32)zAllocAligned + (u32)zAlloc); osSyncPrintf("ゼルダヒープ %08x-%08x\n", zAllocAligned, @@ -1457,7 +1457,7 @@ void* Gameplay_LoadFile(GlobalContext* globalCtx, RomFile* file) { void* allocp; size = file->vromEnd - file->vromStart; - allocp = GameState_AllocEnd(&globalCtx->state, size, "../z_play.c", 4692); + allocp = GameState_Alloc(&globalCtx->state, size, "../z_play.c", 4692); DmaMgr_SendRequest1(allocp, file->vromStart, size, "../z_play.c", 4694); return allocp; diff --git a/src/code/z_room.c b/src/code/z_room.c index 90ca8ce640..f77216da60 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -566,7 +566,7 @@ u32 func_80096FE8(GlobalContext* globalCtx, RoomContext* roomCtx) { osSyncPrintf(VT_FGCOL(YELLOW)); // Translates to: "ROOM BUFFER SIZE=%08x(%5.1fK)" osSyncPrintf("部屋バッファサイズ=%08x(%5.1fK)\n", maxRoomSize, (f64)(maxRoomSize * 0.0009765625f)); - roomCtx->bufPtrs[0] = GameState_AllocEnd(&globalCtx->state, maxRoomSize, "../z_room.c", 946); + roomCtx->bufPtrs[0] = GameState_Alloc(&globalCtx->state, maxRoomSize, "../z_room.c", 946); // Translates to: "ROOM BUFFER INITIAL POINTER=%08x" osSyncPrintf("部屋バッファ開始ポインタ=%08x\n", roomCtx->bufPtrs[0]); roomCtx->bufPtrs[1] = (void*)((s32)roomCtx->bufPtrs[0] + maxRoomSize); diff --git a/src/code/z_sample.c b/src/code/z_sample.c index 74e7639f2f..4997f7bbe4 100644 --- a/src/code/z_sample.c +++ b/src/code/z_sample.c @@ -82,7 +82,7 @@ void Sample_SetupView(SampleContext* this) { void Sample_LoadTitleStatic(SampleContext* this) { u32 size = _title_staticSegmentRomEnd - _title_staticSegmentRomStart; - this->staticSegment = GameState_AllocEnd(&this->state, size, "../z_sample.c", 163); + this->staticSegment = GameState_Alloc(&this->state, size, "../z_sample.c", 163); DmaMgr_SendRequest1(this->staticSegment, _title_staticSegmentRomStart, size, "../z_sample.c", 164); } diff --git a/src/code/z_scene.c b/src/code/z_scene.c index 3c2825ca3a..23ad42dbd1 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -72,7 +72,7 @@ void Object_InitBank(GlobalContext* globalCtx, ObjectContext* objectCtx) { osSyncPrintf(VT_RST); objectCtx->spaceStart = objectCtx->status[0].segment = - GameState_AllocEnd(&globalCtx->state, spaceSize, "../z_scene.c", 219); + GameState_Alloc(&globalCtx->state, spaceSize, "../z_scene.c", 219); objectCtx->spaceEnd = (void*)((s32)objectCtx->spaceStart + spaceSize); objectCtx->mainKeepIndex = Object_Spawn(objectCtx, OBJECT_GAMEPLAY_KEEP); diff --git a/src/overlays/gamestates/ovl_title/z_title.c b/src/overlays/gamestates/ovl_title/z_title.c index b8511f02c1..999a64e26a 100644 --- a/src/overlays/gamestates/ovl_title/z_title.c +++ b/src/overlays/gamestates/ovl_title/z_title.c @@ -164,7 +164,7 @@ void Title_Init(TitleContext* this) { u32 size = (u32)_nintendo_rogo_staticSegmentRomEnd - (u32)_nintendo_rogo_staticSegmentRomStart; u32 pad; - this->staticSegment = GameState_AllocEnd(&this->state, size, "../z_title.c", 611); + this->staticSegment = GameState_Alloc(&this->state, size, "../z_title.c", 611); osSyncPrintf("z_title.c\n"); if (this->staticSegment == NULL) { __assert("this->staticSegment != NULL", "../z_title.c", 614);