From 8a4c4fbbf5670b541f2cb636f7cfa0bb2895fc95 Mon Sep 17 00:00:00 2001 From: Alex Bates Date: Wed, 14 Oct 2020 21:48:16 +0100 Subject: [PATCH] fix coverage, remove extraneous nusys asm --- .github/workflows/coverage.yaml | 2 +- .../code_39db0_len_8a0/nuScEventBroadcast.s | 31 ---- .../os/code_39db0_len_8a0/nuScRemoveClient.s | 39 ----- .../nuScResetClientMesgType.s | 20 --- .../os/code_3a650_len_40/nuGfxFuncSet.s | 20 --- .../os/code_3a690_len_40/nuGfxPreNMIFuncSet.s | 20 --- .../code_3a6d0_len_20/nuGfxTaskAllEndWait.s | 13 -- .../os/code_3a800_len_30/nuGfxDisplayOff.s | 16 -- .../os/code_3a830_len_20/nuGfxDisplayOn.s | 12 -- .../os/code_3a850_le_a40/contPakFileDelete.s | 20 --- .../os/code_3a850_le_a40/contPakFileNum.s | 15 -- .../os/code_3a850_le_a40/contPakFileOpen.s | 50 ------- .../code_3a850_le_a40/contPakFileReadWrite.s | 20 --- .../os/code_3a850_le_a40/contPakFileState.s | 15 -- .../os/code_3a850_le_a40/contPakFree.s | 14 -- .../os/code_3a850_le_a40/contPakOpen.s | 25 ---- .../os/code_3a850_le_a40/contPakRepairId.s | 13 -- .../os/code_3a850_le_a40/contRmbCheckMesg.s | 22 --- .../os/code_3a850_le_a40/contRmbControl.s | 109 -------------- .../os/code_3a850_le_a40/contRmbStartMesg.s | 39 ----- .../os/code_3a850_le_a40/nuContDataGet.s | 28 ---- .../os/code_3a850_le_a40/nuContInit.s | 20 --- .../os/code_3a850_le_a40/nuContPakMgrInit.s | 13 -- .../os/code_3a850_le_a40/nuContPakMgrRemove.s | 13 -- .../os/code_3a850_le_a40/nuContRmbMgrRemove.s | 13 -- .../os/code_3a850_le_a40/nuGfxInit.s | 48 ------ .../os/code_3a850_le_a40/nuPiInit.s | 20 --- .../os/code_3a850_le_a40/nuPiReadRom.s | 59 -------- .../os/code_3a850_le_a40/osMotorStop.s | 141 ------------------ .../os/code_3b290_len_100/nuContRmbCheck.s | 46 ------ .../os/code_3b290_len_100/nuContRmbStart.s | 29 ---- .../os/nuContRmbMgr/func_8005FDE4.s | 14 -- .../os/nuContRmbMgr/func_8005FE0C.s | 23 --- .../os/nuContRmbMgr/func_8005FE54.s | 20 --- coverage.py | 20 ++- 35 files changed, 18 insertions(+), 1004 deletions(-) delete mode 100644 asm/nonmatchings/os/code_39db0_len_8a0/nuScEventBroadcast.s delete mode 100644 asm/nonmatchings/os/code_39db0_len_8a0/nuScRemoveClient.s delete mode 100644 asm/nonmatchings/os/code_39db0_len_8a0/nuScResetClientMesgType.s delete mode 100644 asm/nonmatchings/os/code_3a650_len_40/nuGfxFuncSet.s delete mode 100644 asm/nonmatchings/os/code_3a690_len_40/nuGfxPreNMIFuncSet.s delete mode 100644 asm/nonmatchings/os/code_3a6d0_len_20/nuGfxTaskAllEndWait.s delete mode 100644 asm/nonmatchings/os/code_3a800_len_30/nuGfxDisplayOff.s delete mode 100644 asm/nonmatchings/os/code_3a830_len_20/nuGfxDisplayOn.s delete mode 100644 asm/nonmatchings/os/code_3a850_le_a40/contPakFileDelete.s delete mode 100644 asm/nonmatchings/os/code_3a850_le_a40/contPakFileNum.s delete mode 100644 asm/nonmatchings/os/code_3a850_le_a40/contPakFileOpen.s delete mode 100644 asm/nonmatchings/os/code_3a850_le_a40/contPakFileReadWrite.s delete mode 100644 asm/nonmatchings/os/code_3a850_le_a40/contPakFileState.s delete mode 100644 asm/nonmatchings/os/code_3a850_le_a40/contPakFree.s delete mode 100644 asm/nonmatchings/os/code_3a850_le_a40/contPakOpen.s delete mode 100644 asm/nonmatchings/os/code_3a850_le_a40/contPakRepairId.s delete mode 100644 asm/nonmatchings/os/code_3a850_le_a40/contRmbCheckMesg.s delete mode 100644 asm/nonmatchings/os/code_3a850_le_a40/contRmbControl.s delete mode 100644 asm/nonmatchings/os/code_3a850_le_a40/contRmbStartMesg.s delete mode 100644 asm/nonmatchings/os/code_3a850_le_a40/nuContDataGet.s delete mode 100644 asm/nonmatchings/os/code_3a850_le_a40/nuContInit.s delete mode 100644 asm/nonmatchings/os/code_3a850_le_a40/nuContPakMgrInit.s delete mode 100644 asm/nonmatchings/os/code_3a850_le_a40/nuContPakMgrRemove.s delete mode 100644 asm/nonmatchings/os/code_3a850_le_a40/nuContRmbMgrRemove.s delete mode 100644 asm/nonmatchings/os/code_3a850_le_a40/nuGfxInit.s delete mode 100644 asm/nonmatchings/os/code_3a850_le_a40/nuPiInit.s delete mode 100644 asm/nonmatchings/os/code_3a850_le_a40/nuPiReadRom.s delete mode 100644 asm/nonmatchings/os/code_3a850_le_a40/osMotorStop.s delete mode 100644 asm/nonmatchings/os/code_3b290_len_100/nuContRmbCheck.s delete mode 100644 asm/nonmatchings/os/code_3b290_len_100/nuContRmbStart.s delete mode 100644 asm/nonmatchings/os/nuContRmbMgr/func_8005FDE4.s delete mode 100644 asm/nonmatchings/os/nuContRmbMgr/func_8005FE0C.s delete mode 100644 asm/nonmatchings/os/nuContRmbMgr/func_8005FE54.s diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index a605fe243b..ff45c6072e 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -10,4 +10,4 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - - run: ./coverage.py --fail-matched-undeleted + - run: ./coverage.py --fail-matched-undeleted --fail-unincluded diff --git a/asm/nonmatchings/os/code_39db0_len_8a0/nuScEventBroadcast.s b/asm/nonmatchings/os/code_39db0_len_8a0/nuScEventBroadcast.s deleted file mode 100644 index 98c4bfafb7..0000000000 --- a/asm/nonmatchings/os/code_39db0_len_8a0/nuScEventBroadcast.s +++ /dev/null @@ -1,31 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuScEventBroadcast -/* 3A4C0 8005F0C0 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 3A4C4 8005F0C4 AFB00010 */ sw $s0, 0x10($sp) -/* 3A4C8 8005F0C8 3C10800E */ lui $s0, 0x800e -/* 3A4CC 8005F0CC 8E10AAA8 */ lw $s0, -0x5558($s0) -/* 3A4D0 8005F0D0 AFB10014 */ sw $s1, 0x14($sp) -/* 3A4D4 8005F0D4 0080882D */ daddu $s1, $a0, $zero -/* 3A4D8 8005F0D8 1200000C */ beqz $s0, .L8005F10C -/* 3A4DC 8005F0DC AFBF0018 */ sw $ra, 0x18($sp) -.L8005F0E0: -/* 3A4E0 8005F0E0 96020008 */ lhu $v0, 8($s0) -/* 3A4E4 8005F0E4 96230000 */ lhu $v1, ($s1) -/* 3A4E8 8005F0E8 00431024 */ and $v0, $v0, $v1 -/* 3A4EC 8005F0EC 10400004 */ beqz $v0, .L8005F100 -/* 3A4F0 8005F0F0 0220282D */ daddu $a1, $s1, $zero -/* 3A4F4 8005F0F4 8E040004 */ lw $a0, 4($s0) -/* 3A4F8 8005F0F8 0C019608 */ jal osSendMesg -/* 3A4FC 8005F0FC 0000302D */ daddu $a2, $zero, $zero -.L8005F100: -/* 3A500 8005F100 8E100000 */ lw $s0, ($s0) -/* 3A504 8005F104 1600FFF6 */ bnez $s0, .L8005F0E0 -/* 3A508 8005F108 00000000 */ nop -.L8005F10C: -/* 3A50C 8005F10C 8FBF0018 */ lw $ra, 0x18($sp) -/* 3A510 8005F110 8FB10014 */ lw $s1, 0x14($sp) -/* 3A514 8005F114 8FB00010 */ lw $s0, 0x10($sp) -/* 3A518 8005F118 03E00008 */ jr $ra -/* 3A51C 8005F11C 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/os/code_39db0_len_8a0/nuScRemoveClient.s b/asm/nonmatchings/os/code_39db0_len_8a0/nuScRemoveClient.s deleted file mode 100644 index 47f692639c..0000000000 --- a/asm/nonmatchings/os/code_39db0_len_8a0/nuScRemoveClient.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuScRemoveClient -/* 3A2BC 8005EEBC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3A2C0 8005EEC0 AFB00010 */ sw $s0, 0x10($sp) -/* 3A2C4 8005EEC4 0080802D */ daddu $s0, $a0, $zero -/* 3A2C8 8005EEC8 AFBF0014 */ sw $ra, 0x14($sp) -/* 3A2CC 8005EECC 0C018250 */ jal osSetIntMask -/* 3A2D0 8005EED0 24040001 */ addiu $a0, $zero, 1 -/* 3A2D4 8005EED4 3C06800E */ lui $a2, 0x800e -/* 3A2D8 8005EED8 24C6AAA8 */ addiu $a2, $a2, -0x5558 -/* 3A2DC 8005EEDC 0000282D */ daddu $a1, $zero, $zero -/* 3A2E0 8005EEE0 8CC30000 */ lw $v1, ($a2) -/* 3A2E4 8005EEE4 1060000E */ beqz $v1, .L8005EF20 -/* 3A2E8 8005EEE8 0040202D */ daddu $a0, $v0, $zero -.L8005EEEC: -/* 3A2EC 8005EEEC 54700009 */ bnel $v1, $s0, .L8005EF14 -/* 3A2F0 8005EEF0 0060282D */ daddu $a1, $v1, $zero -/* 3A2F4 8005EEF4 10A00004 */ beqz $a1, .L8005EF08 -/* 3A2F8 8005EEF8 00000000 */ nop -/* 3A2FC 8005EEFC 8C620000 */ lw $v0, ($v1) -/* 3A300 8005EF00 08017BC8 */ j .L8005EF20 -/* 3A304 8005EF04 ACA20000 */ sw $v0, ($a1) -.L8005EF08: -/* 3A308 8005EF08 8C620000 */ lw $v0, ($v1) -/* 3A30C 8005EF0C 08017BC8 */ j .L8005EF20 -/* 3A310 8005EF10 ACC20000 */ sw $v0, ($a2) -.L8005EF14: -/* 3A314 8005EF14 8C630000 */ lw $v1, ($v1) -/* 3A318 8005EF18 1460FFF4 */ bnez $v1, .L8005EEEC -/* 3A31C 8005EF1C 00000000 */ nop -.L8005EF20: -/* 3A320 8005EF20 0C018250 */ jal osSetIntMask -/* 3A324 8005EF24 00000000 */ nop -/* 3A328 8005EF28 8FBF0014 */ lw $ra, 0x14($sp) -/* 3A32C 8005EF2C 8FB00010 */ lw $s0, 0x10($sp) -/* 3A330 8005EF30 03E00008 */ jr $ra -/* 3A334 8005EF34 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/os/code_39db0_len_8a0/nuScResetClientMesgType.s b/asm/nonmatchings/os/code_39db0_len_8a0/nuScResetClientMesgType.s deleted file mode 100644 index ca5e2572df..0000000000 --- a/asm/nonmatchings/os/code_39db0_len_8a0/nuScResetClientMesgType.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuScResetClientMesgType -/* 3A338 8005EF38 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 3A33C 8005EF3C AFB10014 */ sw $s1, 0x14($sp) -/* 3A340 8005EF40 0080882D */ daddu $s1, $a0, $zero -/* 3A344 8005EF44 AFB00010 */ sw $s0, 0x10($sp) -/* 3A348 8005EF48 00A0802D */ daddu $s0, $a1, $zero -/* 3A34C 8005EF4C AFBF0018 */ sw $ra, 0x18($sp) -/* 3A350 8005EF50 0C018250 */ jal osSetIntMask -/* 3A354 8005EF54 24040001 */ addiu $a0, $zero, 1 -/* 3A358 8005EF58 0040202D */ daddu $a0, $v0, $zero -/* 3A35C 8005EF5C 0C018250 */ jal osSetIntMask -/* 3A360 8005EF60 A6300008 */ sh $s0, 8($s1) -/* 3A364 8005EF64 8FBF0018 */ lw $ra, 0x18($sp) -/* 3A368 8005EF68 8FB10014 */ lw $s1, 0x14($sp) -/* 3A36C 8005EF6C 8FB00010 */ lw $s0, 0x10($sp) -/* 3A370 8005EF70 03E00008 */ jr $ra -/* 3A374 8005EF74 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/os/code_3a650_len_40/nuGfxFuncSet.s b/asm/nonmatchings/os/code_3a650_len_40/nuGfxFuncSet.s deleted file mode 100644 index 18a01e5eb6..0000000000 --- a/asm/nonmatchings/os/code_3a650_len_40/nuGfxFuncSet.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuGfxFuncSet -/* 3A650 8005F250 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3A654 8005F254 AFB00010 */ sw $s0, 0x10($sp) -/* 3A658 8005F258 AFBF0014 */ sw $ra, 0x14($sp) -/* 3A65C 8005F25C 0C017CB4 */ jal nuGfxTaskAllEndWait -/* 3A660 8005F260 0080802D */ daddu $s0, $a0, $zero -/* 3A664 8005F264 0C018250 */ jal osSetIntMask -/* 3A668 8005F268 24040001 */ addiu $a0, $zero, 1 -/* 3A66C 8005F26C 3C018009 */ lui $at, 0x8009 -/* 3A670 8005F270 AC303D10 */ sw $s0, 0x3d10($at) -/* 3A674 8005F274 0C018250 */ jal osSetIntMask -/* 3A678 8005F278 0040202D */ daddu $a0, $v0, $zero -/* 3A67C 8005F27C 8FBF0014 */ lw $ra, 0x14($sp) -/* 3A680 8005F280 8FB00010 */ lw $s0, 0x10($sp) -/* 3A684 8005F284 03E00008 */ jr $ra -/* 3A688 8005F288 27BD0018 */ addiu $sp, $sp, 0x18 -/* 3A68C 8005F28C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3a690_len_40/nuGfxPreNMIFuncSet.s b/asm/nonmatchings/os/code_3a690_len_40/nuGfxPreNMIFuncSet.s deleted file mode 100644 index 7a4aad2635..0000000000 --- a/asm/nonmatchings/os/code_3a690_len_40/nuGfxPreNMIFuncSet.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuGfxPreNMIFuncSet -/* 3A690 8005F290 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3A694 8005F294 AFB00010 */ sw $s0, 0x10($sp) -/* 3A698 8005F298 0080802D */ daddu $s0, $a0, $zero -/* 3A69C 8005F29C AFBF0014 */ sw $ra, 0x14($sp) -/* 3A6A0 8005F2A0 0C018250 */ jal osSetIntMask -/* 3A6A4 8005F2A4 24040001 */ addiu $a0, $zero, 1 -/* 3A6A8 8005F2A8 3C018009 */ lui $at, 0x8009 -/* 3A6AC 8005F2AC AC303D14 */ sw $s0, 0x3d14($at) -/* 3A6B0 8005F2B0 0C018250 */ jal osSetIntMask -/* 3A6B4 8005F2B4 0040202D */ daddu $a0, $v0, $zero -/* 3A6B8 8005F2B8 8FBF0014 */ lw $ra, 0x14($sp) -/* 3A6BC 8005F2BC 8FB00010 */ lw $s0, 0x10($sp) -/* 3A6C0 8005F2C0 03E00008 */ jr $ra -/* 3A6C4 8005F2C4 27BD0018 */ addiu $sp, $sp, 0x18 -/* 3A6C8 8005F2C8 00000000 */ nop -/* 3A6CC 8005F2CC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3a6d0_len_20/nuGfxTaskAllEndWait.s b/asm/nonmatchings/os/code_3a6d0_len_20/nuGfxTaskAllEndWait.s deleted file mode 100644 index 911c807829..0000000000 --- a/asm/nonmatchings/os/code_3a6d0_len_20/nuGfxTaskAllEndWait.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuGfxTaskAllEndWait -.L8005F2D0: -/* 3A6D0 8005F2D0 3C02800A */ lui $v0, 0x800a -/* 3A6D4 8005F2D4 8C42A618 */ lw $v0, -0x59e8($v0) -/* 3A6D8 8005F2D8 1440FFFD */ bnez $v0, .L8005F2D0 -/* 3A6DC 8005F2DC 00000000 */ nop -/* 3A6E0 8005F2E0 03E00008 */ jr $ra -/* 3A6E4 8005F2E4 00000000 */ nop -/* 3A6E8 8005F2E8 00000000 */ nop -/* 3A6EC 8005F2EC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3a800_len_30/nuGfxDisplayOff.s b/asm/nonmatchings/os/code_3a800_len_30/nuGfxDisplayOff.s deleted file mode 100644 index 866ca1a428..0000000000 --- a/asm/nonmatchings/os/code_3a800_len_30/nuGfxDisplayOff.s +++ /dev/null @@ -1,16 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuGfxDisplayOff -/* 3A800 8005F400 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3A804 8005F404 AFBF0010 */ sw $ra, 0x10($sp) -/* 3A808 8005F408 3C01800A */ lui $at, 0x800a -/* 3A80C 8005F40C AC20A5F8 */ sw $zero, -0x5a08($at) -/* 3A810 8005F410 0C019CE0 */ jal osViBlack -/* 3A814 8005F414 24040001 */ addiu $a0, $zero, 1 -/* 3A818 8005F418 8FBF0010 */ lw $ra, 0x10($sp) -/* 3A81C 8005F41C 03E00008 */ jr $ra -/* 3A820 8005F420 27BD0018 */ addiu $sp, $sp, 0x18 -/* 3A824 8005F424 00000000 */ nop -/* 3A828 8005F428 00000000 */ nop -/* 3A82C 8005F42C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3a830_len_20/nuGfxDisplayOn.s b/asm/nonmatchings/os/code_3a830_len_20/nuGfxDisplayOn.s deleted file mode 100644 index a3597d6b03..0000000000 --- a/asm/nonmatchings/os/code_3a830_len_20/nuGfxDisplayOn.s +++ /dev/null @@ -1,12 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuGfxDisplayOn -/* 3A830 8005F430 24020080 */ addiu $v0, $zero, 0x80 -/* 3A834 8005F434 3C01800A */ lui $at, 0x800a -/* 3A838 8005F438 AC22A5F8 */ sw $v0, -0x5a08($at) -/* 3A83C 8005F43C 03E00008 */ jr $ra -/* 3A840 8005F440 00000000 */ nop -/* 3A844 8005F444 00000000 */ nop -/* 3A848 8005F448 00000000 */ nop -/* 3A84C 8005F44C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3a850_le_a40/contPakFileDelete.s b/asm/nonmatchings/os/code_3a850_le_a40/contPakFileDelete.s deleted file mode 100644 index b07a5ba1cf..0000000000 --- a/asm/nonmatchings/os/code_3a850_le_a40/contPakFileDelete.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel contPakFileDelete -/* 3AC64 8005F864 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 3AC68 8005F868 AFBF0018 */ sw $ra, 0x18($sp) -/* 3AC6C 8005F86C 8C82000C */ lw $v0, 0xc($a0) -/* 3AC70 8005F870 3C058009 */ lui $a1, 0x8009 -/* 3AC74 8005F874 94A53CA0 */ lhu $a1, 0x3ca0($a1) -/* 3AC78 8005F878 3C068009 */ lui $a2, 0x8009 -/* 3AC7C 8005F87C 8CC63CA4 */ lw $a2, 0x3ca4($a2) -/* 3AC80 8005F880 8C430008 */ lw $v1, 8($v0) -/* 3AC84 8005F884 8C440000 */ lw $a0, ($v0) -/* 3AC88 8005F888 AFA30010 */ sw $v1, 0x10($sp) -/* 3AC8C 8005F88C 8C840000 */ lw $a0, ($a0) -/* 3AC90 8005F890 0C01A170 */ jal osPfsDeleteFile -/* 3AC94 8005F894 8C470004 */ lw $a3, 4($v0) -/* 3AC98 8005F898 8FBF0018 */ lw $ra, 0x18($sp) -/* 3AC9C 8005F89C 03E00008 */ jr $ra -/* 3ACA0 8005F8A0 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/contPakFileNum.s b/asm/nonmatchings/os/code_3a850_le_a40/contPakFileNum.s deleted file mode 100644 index 000d850a0c..0000000000 --- a/asm/nonmatchings/os/code_3a850_le_a40/contPakFileNum.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel contPakFileNum -/* 3ACD0 8005F8D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3ACD4 8005F8D4 AFBF0010 */ sw $ra, 0x10($sp) -/* 3ACD8 8005F8D8 8C82000C */ lw $v0, 0xc($a0) -/* 3ACDC 8005F8DC 8C430000 */ lw $v1, ($v0) -/* 3ACE0 8005F8E0 8C450004 */ lw $a1, 4($v0) -/* 3ACE4 8005F8E4 8C460008 */ lw $a2, 8($v0) -/* 3ACE8 8005F8E8 0C01A424 */ jal osPfsNumFiles -/* 3ACEC 8005F8EC 8C640000 */ lw $a0, ($v1) -/* 3ACF0 8005F8F0 8FBF0010 */ lw $ra, 0x10($sp) -/* 3ACF4 8005F8F4 03E00008 */ jr $ra -/* 3ACF8 8005F8F8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/contPakFileOpen.s b/asm/nonmatchings/os/code_3a850_le_a40/contPakFileOpen.s deleted file mode 100644 index f8e630e2b9..0000000000 --- a/asm/nonmatchings/os/code_3a850_le_a40/contPakFileOpen.s +++ /dev/null @@ -1,50 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel contPakFileOpen -/* 3ABB0 8005F7B0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 3ABB4 8005F7B4 AFBF002C */ sw $ra, 0x2c($sp) -/* 3ABB8 8005F7B8 AFB20028 */ sw $s2, 0x28($sp) -/* 3ABBC 8005F7BC AFB10024 */ sw $s1, 0x24($sp) -/* 3ABC0 8005F7C0 AFB00020 */ sw $s0, 0x20($sp) -/* 3ABC4 8005F7C4 8C90000C */ lw $s0, 0xc($a0) -/* 3ABC8 8005F7C8 3C058009 */ lui $a1, 0x8009 -/* 3ABCC 8005F7CC 94A53CA0 */ lhu $a1, 0x3ca0($a1) -/* 3ABD0 8005F7D0 3C068009 */ lui $a2, 0x8009 -/* 3ABD4 8005F7D4 8CC63CA4 */ lw $a2, 0x3ca4($a2) -/* 3ABD8 8005F7D8 8E110000 */ lw $s1, ($s0) -/* 3ABDC 8005F7DC 8E020008 */ lw $v0, 8($s0) -/* 3ABE0 8005F7E0 26320004 */ addiu $s2, $s1, 4 -/* 3ABE4 8005F7E4 AFA20010 */ sw $v0, 0x10($sp) -/* 3ABE8 8005F7E8 AFB20014 */ sw $s2, 0x14($sp) -/* 3ABEC 8005F7EC 8E240000 */ lw $a0, ($s1) -/* 3ABF0 8005F7F0 0C01A370 */ jal osPfsFindFile -/* 3ABF4 8005F7F4 8E070004 */ lw $a3, 4($s0) -/* 3ABF8 8005F7F8 0040202D */ daddu $a0, $v0, $zero -/* 3ABFC 8005F7FC 24020005 */ addiu $v0, $zero, 5 -/* 3AC00 8005F800 14820011 */ bne $a0, $v0, .L8005F848 -/* 3AC04 8005F804 24020001 */ addiu $v0, $zero, 1 -/* 3AC08 8005F808 8E030010 */ lw $v1, 0x10($s0) -/* 3AC0C 8005F80C 1462000E */ bne $v1, $v0, .L8005F848 -/* 3AC10 8005F810 00000000 */ nop -/* 3AC14 8005F814 8E020008 */ lw $v0, 8($s0) -/* 3AC18 8005F818 3C058009 */ lui $a1, 0x8009 -/* 3AC1C 8005F81C 94A53CA0 */ lhu $a1, 0x3ca0($a1) -/* 3AC20 8005F820 3C068009 */ lui $a2, 0x8009 -/* 3AC24 8005F824 8CC63CA4 */ lw $a2, 0x3ca4($a2) -/* 3AC28 8005F828 AFA20010 */ sw $v0, 0x10($sp) -/* 3AC2C 8005F82C 8E02000C */ lw $v0, 0xc($s0) -/* 3AC30 8005F830 AFB20018 */ sw $s2, 0x18($sp) -/* 3AC34 8005F834 AFA20014 */ sw $v0, 0x14($sp) -/* 3AC38 8005F838 8E240000 */ lw $a0, ($s1) -/* 3AC3C 8005F83C 0C01A064 */ jal osPfsAllocateFile -/* 3AC40 8005F840 8E070004 */ lw $a3, 4($s0) -/* 3AC44 8005F844 0040202D */ daddu $a0, $v0, $zero -.L8005F848: -/* 3AC48 8005F848 8FBF002C */ lw $ra, 0x2c($sp) -/* 3AC4C 8005F84C 8FB20028 */ lw $s2, 0x28($sp) -/* 3AC50 8005F850 8FB10024 */ lw $s1, 0x24($sp) -/* 3AC54 8005F854 8FB00020 */ lw $s0, 0x20($sp) -/* 3AC58 8005F858 0080102D */ daddu $v0, $a0, $zero -/* 3AC5C 8005F85C 03E00008 */ jr $ra -/* 3AC60 8005F860 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/contPakFileReadWrite.s b/asm/nonmatchings/os/code_3a850_le_a40/contPakFileReadWrite.s deleted file mode 100644 index 18ae81f61e..0000000000 --- a/asm/nonmatchings/os/code_3a850_le_a40/contPakFileReadWrite.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel contPakFileReadWrite -/* 3AB70 8005F770 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 3AB74 8005F774 AFBF0018 */ sw $ra, 0x18($sp) -/* 3AB78 8005F778 8C83000C */ lw $v1, 0xc($a0) -/* 3AB7C 8005F77C 8C620008 */ lw $v0, 8($v1) -/* 3AB80 8005F780 8C650000 */ lw $a1, ($v1) -/* 3AB84 8005F784 9066000C */ lbu $a2, 0xc($v1) -/* 3AB88 8005F788 AFA20010 */ sw $v0, 0x10($sp) -/* 3AB8C 8005F78C 8C620010 */ lw $v0, 0x10($v1) -/* 3AB90 8005F790 AFA20014 */ sw $v0, 0x14($sp) -/* 3AB94 8005F794 8CA40000 */ lw $a0, ($a1) -/* 3AB98 8005F798 8CA50004 */ lw $a1, 4($a1) -/* 3AB9C 8005F79C 0C01A1F8 */ jal osPfsReadWriteFile -/* 3ABA0 8005F7A0 8C670004 */ lw $a3, 4($v1) -/* 3ABA4 8005F7A4 8FBF0018 */ lw $ra, 0x18($sp) -/* 3ABA8 8005F7A8 03E00008 */ jr $ra -/* 3ABAC 8005F7AC 27BD0020 */ addiu $sp, $sp, 0x20 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/contPakFileState.s b/asm/nonmatchings/os/code_3a850_le_a40/contPakFileState.s deleted file mode 100644 index b6c4163a35..0000000000 --- a/asm/nonmatchings/os/code_3a850_le_a40/contPakFileState.s +++ /dev/null @@ -1,15 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel contPakFileState -/* 3ACA4 8005F8A4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3ACA8 8005F8A8 AFBF0010 */ sw $ra, 0x10($sp) -/* 3ACAC 8005F8AC 8C83000C */ lw $v1, 0xc($a0) -/* 3ACB0 8005F8B0 8C620000 */ lw $v0, ($v1) -/* 3ACB4 8005F8B4 8C660004 */ lw $a2, 4($v1) -/* 3ACB8 8005F8B8 8C440000 */ lw $a0, ($v0) -/* 3ACBC 8005F8BC 0C01A308 */ jal osPfsFileState -/* 3ACC0 8005F8C0 8C450004 */ lw $a1, 4($v0) -/* 3ACC4 8005F8C4 8FBF0010 */ lw $ra, 0x10($sp) -/* 3ACC8 8005F8C8 03E00008 */ jr $ra -/* 3ACCC 8005F8CC 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/contPakFree.s b/asm/nonmatchings/os/code_3a850_le_a40/contPakFree.s deleted file mode 100644 index 8c08d6c576..0000000000 --- a/asm/nonmatchings/os/code_3a850_le_a40/contPakFree.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel contPakFree -/* 3AB48 8005F748 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3AB4C 8005F74C AFBF0010 */ sw $ra, 0x10($sp) -/* 3AB50 8005F750 8C85000C */ lw $a1, 0xc($a0) -/* 3AB54 8005F754 8CA20000 */ lw $v0, ($a1) -/* 3AB58 8005F758 8C440000 */ lw $a0, ($v0) -/* 3AB5C 8005F75C 0C01A3E0 */ jal osPfsFreeBlocks -/* 3AB60 8005F760 24A50004 */ addiu $a1, $a1, 4 -/* 3AB64 8005F764 8FBF0010 */ lw $ra, 0x10($sp) -/* 3AB68 8005F768 03E00008 */ jr $ra -/* 3AB6C 8005F76C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/contPakOpen.s b/asm/nonmatchings/os/code_3a850_le_a40/contPakOpen.s deleted file mode 100644 index 5acd563ba2..0000000000 --- a/asm/nonmatchings/os/code_3a850_le_a40/contPakOpen.s +++ /dev/null @@ -1,25 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel contPakOpen -/* 3AAF8 8005F6F8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3AAFC 8005F6FC AFBF0014 */ sw $ra, 0x14($sp) -/* 3AB00 8005F700 AFB00010 */ sw $s0, 0x10($sp) -/* 3AB04 8005F704 8C90000C */ lw $s0, 0xc($a0) -/* 3AB08 8005F708 8E050000 */ lw $a1, ($s0) -/* 3AB0C 8005F70C AE00000C */ sw $zero, 0xc($s0) -/* 3AB10 8005F710 8CA60008 */ lw $a2, 8($a1) -/* 3AB14 8005F714 3C04800E */ lui $a0, 0x800e -/* 3AB18 8005F718 2484AC78 */ addiu $a0, $a0, -0x5388 -/* 3AB1C 8005F71C 0C01A464 */ jal osPfsInitPak -/* 3AB20 8005F720 00000000 */ nop -/* 3AB24 8005F724 0040182D */ daddu $v1, $v0, $zero -/* 3AB28 8005F728 14600002 */ bnez $v1, .L8005F734 -/* 3AB2C 8005F72C 24020001 */ addiu $v0, $zero, 1 -/* 3AB30 8005F730 AE02000C */ sw $v0, 0xc($s0) -.L8005F734: -/* 3AB34 8005F734 8FBF0014 */ lw $ra, 0x14($sp) -/* 3AB38 8005F738 8FB00010 */ lw $s0, 0x10($sp) -/* 3AB3C 8005F73C 0060102D */ daddu $v0, $v1, $zero -/* 3AB40 8005F740 03E00008 */ jr $ra -/* 3AB44 8005F744 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/contPakRepairId.s b/asm/nonmatchings/os/code_3a850_le_a40/contPakRepairId.s deleted file mode 100644 index 224ececad3..0000000000 --- a/asm/nonmatchings/os/code_3a850_le_a40/contPakRepairId.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel contPakRepairId -/* 3ACFC 8005F8FC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3AD00 8005F900 AFBF0010 */ sw $ra, 0x10($sp) -/* 3AD04 8005F904 8C82000C */ lw $v0, 0xc($a0) -/* 3AD08 8005F908 0C01A518 */ jal osPfsRepairId -/* 3AD0C 8005F90C 8C440000 */ lw $a0, ($v0) -/* 3AD10 8005F910 8FBF0010 */ lw $ra, 0x10($sp) -/* 3AD14 8005F914 03E00008 */ jr $ra -/* 3AD18 8005F918 27BD0018 */ addiu $sp, $sp, 0x18 -/* 3AD1C 8005F91C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3a850_le_a40/contRmbCheckMesg.s b/asm/nonmatchings/os/code_3a850_le_a40/contRmbCheckMesg.s deleted file mode 100644 index c36dfc0687..0000000000 --- a/asm/nonmatchings/os/code_3a850_le_a40/contRmbCheckMesg.s +++ /dev/null @@ -1,22 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel contRmbCheckMesg -/* 3B110 8005FD10 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3B114 8005FD14 AFBF0010 */ sw $ra, 0x10($sp) -/* 3B118 8005FD18 8C82000C */ lw $v0, 0xc($a0) -/* 3B11C 8005FD1C 3C04800E */ lui $a0, 0x800e -/* 3B120 8005FD20 2484AC78 */ addiu $a0, $a0, -0x5388 -/* 3B124 8005FD24 90460000 */ lbu $a2, ($v0) -/* 3B128 8005FD28 3C02800E */ lui $v0, 0x800e -/* 3B12C 8005FD2C 2442AAD8 */ addiu $v0, $v0, -0x5528 -/* 3B130 8005FD30 00062840 */ sll $a1, $a2, 1 -/* 3B134 8005FD34 00A62821 */ addu $a1, $a1, $a2 -/* 3B138 8005FD38 00052880 */ sll $a1, $a1, 2 -/* 3B13C 8005FD3C 00A62821 */ addu $a1, $a1, $a2 -/* 3B140 8005FD40 000528C0 */ sll $a1, $a1, 3 -/* 3B144 8005FD44 0C019FD1 */ jal osMotorInit -/* 3B148 8005FD48 00A22821 */ addu $a1, $a1, $v0 -/* 3B14C 8005FD4C 8FBF0010 */ lw $ra, 0x10($sp) -/* 3B150 8005FD50 03E00008 */ jr $ra -/* 3B154 8005FD54 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/contRmbControl.s b/asm/nonmatchings/os/code_3a850_le_a40/contRmbControl.s deleted file mode 100644 index b9d3fa3374..0000000000 --- a/asm/nonmatchings/os/code_3a850_le_a40/contRmbControl.s +++ /dev/null @@ -1,109 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel contRmbControl -/* 3AF10 8005FB10 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 3AF14 8005FB14 AFB10014 */ sw $s1, 0x14($sp) -/* 3AF18 8005FB18 0000882D */ daddu $s1, $zero, $zero -/* 3AF1C 8005FB1C AFB40020 */ sw $s4, 0x20($sp) -/* 3AF20 8005FB20 24140002 */ addiu $s4, $zero, 2 -/* 3AF24 8005FB24 AFB50024 */ sw $s5, 0x24($sp) -/* 3AF28 8005FB28 24150001 */ addiu $s5, $zero, 1 -/* 3AF2C 8005FB2C AFB3001C */ sw $s3, 0x1c($sp) -/* 3AF30 8005FB30 0220982D */ daddu $s3, $s1, $zero -/* 3AF34 8005FB34 AFB20018 */ sw $s2, 0x18($sp) -/* 3AF38 8005FB38 0220902D */ daddu $s2, $s1, $zero -/* 3AF3C 8005FB3C AFBF0028 */ sw $ra, 0x28($sp) -/* 3AF40 8005FB40 AFB00010 */ sw $s0, 0x10($sp) -.L8005FB44: -/* 3AF44 8005FB44 3C02800B */ lui $v0, 0x800b -/* 3AF48 8005FB48 24421D40 */ addiu $v0, $v0, 0x1d40 -/* 3AF4C 8005FB4C 02428021 */ addu $s0, $s2, $v0 -/* 3AF50 8005FB50 92030007 */ lbu $v1, 7($s0) -/* 3AF54 8005FB54 10740015 */ beq $v1, $s4, .L8005FBAC -/* 3AF58 8005FB58 28620003 */ slti $v0, $v1, 3 -/* 3AF5C 8005FB5C 50400007 */ beql $v0, $zero, .L8005FB7C -/* 3AF60 8005FB60 28620083 */ slti $v0, $v1, 0x83 -/* 3AF64 8005FB64 5060003B */ beql $v1, $zero, .L8005FC54 -/* 3AF68 8005FB68 26730068 */ addiu $s3, $s3, 0x68 -/* 3AF6C 8005FB6C 10750009 */ beq $v1, $s5, .L8005FB94 -/* 3AF70 8005FB70 0200202D */ daddu $a0, $s0, $zero -/* 3AF74 8005FB74 08017F15 */ j .L8005FC54 -/* 3AF78 8005FB78 26730068 */ addiu $s3, $s3, 0x68 -.L8005FB7C: -/* 3AF7C 8005FB7C 10400034 */ beqz $v0, .L8005FC50 -/* 3AF80 8005FB80 28620081 */ slti $v0, $v1, 0x81 -/* 3AF84 8005FB84 54400033 */ bnel $v0, $zero, .L8005FC54 -/* 3AF88 8005FB88 26730068 */ addiu $s3, $s3, 0x68 -/* 3AF8C 8005FB8C 08017F0E */ j .L8005FC38 -/* 3AF90 8005FB90 00000000 */ nop -.L8005FB94: -/* 3AF94 8005FB94 0C017E48 */ jal osMotorStop -/* 3AF98 8005FB98 0220282D */ daddu $a1, $s1, $zero -/* 3AF9C 8005FB9C 5440002C */ bnel $v0, $zero, .L8005FC50 -/* 3AFA0 8005FBA0 A2000007 */ sb $zero, 7($s0) -/* 3AFA4 8005FBA4 08017F15 */ j .L8005FC54 -/* 3AFA8 8005FBA8 26730068 */ addiu $s3, $s3, 0x68 -.L8005FBAC: -/* 3AFAC 8005FBAC 92020008 */ lbu $v0, 8($s0) -/* 3AFB0 8005FBB0 14400019 */ bnez $v0, .L8005FC18 -/* 3AFB4 8005FBB4 0200202D */ daddu $a0, $s0, $zero -/* 3AFB8 8005FBB8 96030004 */ lhu $v1, 4($s0) -/* 3AFBC 8005FBBC 3C028009 */ lui $v0, 0x8009 -/* 3AFC0 8005FBC0 8C423CE0 */ lw $v0, 0x3ce0($v0) -/* 3AFC4 8005FBC4 14400002 */ bnez $v0, .L8005FBD0 -/* 3AFC8 8005FBC8 0062001B */ divu $zero, $v1, $v0 -/* 3AFCC 8005FBCC 0007000D */ break 7 -.L8005FBD0: -/* 3AFD0 8005FBD0 00001010 */ mfhi $v0 -/* 3AFD4 8005FBD4 1440000C */ bnez $v0, .L8005FC08 -/* 3AFD8 8005FBD8 00000000 */ nop -/* 3AFDC 8005FBDC 3C04800E */ lui $a0, 0x800e -/* 3AFE0 8005FBE0 2484AC78 */ addiu $a0, $a0, -0x5388 -/* 3AFE4 8005FBE4 3C05800E */ lui $a1, 0x800e -/* 3AFE8 8005FBE8 24A5AAD8 */ addiu $a1, $a1, -0x5528 -/* 3AFEC 8005FBEC 02652821 */ addu $a1, $s3, $a1 -/* 3AFF0 8005FBF0 0C019FD1 */ jal osMotorInit -/* 3AFF4 8005FBF4 0220302D */ daddu $a2, $s1, $zero -/* 3AFF8 8005FBF8 14400003 */ bnez $v0, .L8005FC08 -/* 3AFFC 8005FBFC 00000000 */ nop -/* 3B000 8005FC00 A2150008 */ sb $s5, 8($s0) -/* 3B004 8005FC04 A2140009 */ sb $s4, 9($s0) -.L8005FC08: -/* 3B008 8005FC08 96020004 */ lhu $v0, 4($s0) -/* 3B00C 8005FC0C 24420001 */ addiu $v0, $v0, 1 -/* 3B010 8005FC10 08017F14 */ j .L8005FC50 -/* 3B014 8005FC14 A6020004 */ sh $v0, 4($s0) -.L8005FC18: -/* 3B018 8005FC18 0C017E48 */ jal osMotorStop -/* 3B01C 8005FC1C 0220282D */ daddu $a1, $s1, $zero -/* 3B020 8005FC20 5040000C */ beql $v0, $zero, .L8005FC54 -/* 3B024 8005FC24 26730068 */ addiu $s3, $s3, 0x68 -/* 3B028 8005FC28 A6110004 */ sh $s1, 4($s0) -/* 3B02C 8005FC2C A2000008 */ sb $zero, 8($s0) -/* 3B030 8005FC30 08017F14 */ j .L8005FC50 -/* 3B034 8005FC34 A2000009 */ sb $zero, 9($s0) -.L8005FC38: -/* 3B038 8005FC38 92020009 */ lbu $v0, 9($s0) -/* 3B03C 8005FC3C 54540005 */ bnel $v0, $s4, .L8005FC54 -/* 3B040 8005FC40 26730068 */ addiu $s3, $s3, 0x68 -/* 3B044 8005FC44 0200202D */ daddu $a0, $s0, $zero -/* 3B048 8005FC48 0C017E48 */ jal osMotorStop -/* 3B04C 8005FC4C 0220282D */ daddu $a1, $s1, $zero -.L8005FC50: -/* 3B050 8005FC50 26730068 */ addiu $s3, $s3, 0x68 -.L8005FC54: -/* 3B054 8005FC54 26310001 */ addiu $s1, $s1, 1 -/* 3B058 8005FC58 2E220004 */ sltiu $v0, $s1, 4 -/* 3B05C 8005FC5C 1440FFB9 */ bnez $v0, .L8005FB44 -/* 3B060 8005FC60 2652000A */ addiu $s2, $s2, 0xa -/* 3B064 8005FC64 8FBF0028 */ lw $ra, 0x28($sp) -/* 3B068 8005FC68 8FB50024 */ lw $s5, 0x24($sp) -/* 3B06C 8005FC6C 8FB40020 */ lw $s4, 0x20($sp) -/* 3B070 8005FC70 8FB3001C */ lw $s3, 0x1c($sp) -/* 3B074 8005FC74 8FB20018 */ lw $s2, 0x18($sp) -/* 3B078 8005FC78 8FB10014 */ lw $s1, 0x14($sp) -/* 3B07C 8005FC7C 8FB00010 */ lw $s0, 0x10($sp) -/* 3B080 8005FC80 0000102D */ daddu $v0, $zero, $zero -/* 3B084 8005FC84 03E00008 */ jr $ra -/* 3B088 8005FC88 27BD0030 */ addiu $sp, $sp, 0x30 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/contRmbStartMesg.s b/asm/nonmatchings/os/code_3a850_le_a40/contRmbStartMesg.s deleted file mode 100644 index f622424471..0000000000 --- a/asm/nonmatchings/os/code_3a850_le_a40/contRmbStartMesg.s +++ /dev/null @@ -1,39 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel contRmbStartMesg -/* 3B158 8005FD58 8C84000C */ lw $a0, 0xc($a0) -/* 3B15C 8005FD5C 90830000 */ lbu $v1, ($a0) -/* 3B160 8005FD60 8C850008 */ lw $a1, 8($a0) -/* 3B164 8005FD64 00031080 */ sll $v0, $v1, 2 -/* 3B168 8005FD68 00431021 */ addu $v0, $v0, $v1 -/* 3B16C 8005FD6C 90A30006 */ lbu $v1, 6($a1) -/* 3B170 8005FD70 00021040 */ sll $v0, $v0, 1 -/* 3B174 8005FD74 3C01800B */ lui $at, 0x800b -/* 3B178 8005FD78 00220821 */ addu $at, $at, $v0 -/* 3B17C 8005FD7C A0231D46 */ sb $v1, 0x1d46($at) -/* 3B180 8005FD80 90830000 */ lbu $v1, ($a0) -/* 3B184 8005FD84 00031080 */ sll $v0, $v1, 2 -/* 3B188 8005FD88 00431021 */ addu $v0, $v0, $v1 -/* 3B18C 8005FD8C 94A30002 */ lhu $v1, 2($a1) -/* 3B190 8005FD90 00021040 */ sll $v0, $v0, 1 -/* 3B194 8005FD94 3C01800B */ lui $at, 0x800b -/* 3B198 8005FD98 00220821 */ addu $at, $at, $v0 -/* 3B19C 8005FD9C A4231D42 */ sh $v1, 0x1d42($at) -/* 3B1A0 8005FDA0 90830000 */ lbu $v1, ($a0) -/* 3B1A4 8005FDA4 00031080 */ sll $v0, $v1, 2 -/* 3B1A8 8005FDA8 00431021 */ addu $v0, $v0, $v1 -/* 3B1AC 8005FDAC 94A30000 */ lhu $v1, ($a1) -/* 3B1B0 8005FDB0 00021040 */ sll $v0, $v0, 1 -/* 3B1B4 8005FDB4 3C01800B */ lui $at, 0x800b -/* 3B1B8 8005FDB8 00220821 */ addu $at, $at, $v0 -/* 3B1BC 8005FDBC A4231D40 */ sh $v1, 0x1d40($at) -/* 3B1C0 8005FDC0 90830000 */ lbu $v1, ($a0) -/* 3B1C4 8005FDC4 00031080 */ sll $v0, $v1, 2 -/* 3B1C8 8005FDC8 00431021 */ addu $v0, $v0, $v1 -/* 3B1CC 8005FDCC 00021040 */ sll $v0, $v0, 1 -/* 3B1D0 8005FDD0 3C01800B */ lui $at, 0x800b -/* 3B1D4 8005FDD4 00220821 */ addu $at, $at, $v0 -/* 3B1D8 8005FDD8 A4201D44 */ sh $zero, 0x1d44($at) -/* 3B1DC 8005FDDC 03E00008 */ jr $ra -/* 3B1E0 8005FDE0 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/os/code_3a850_le_a40/nuContDataGet.s b/asm/nonmatchings/os/code_3a850_le_a40/nuContDataGet.s deleted file mode 100644 index cdc5934786..0000000000 --- a/asm/nonmatchings/os/code_3a850_le_a40/nuContDataGet.s +++ /dev/null @@ -1,28 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuContDataGet -/* 3AA50 8005F650 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 3AA54 8005F654 AFB10014 */ sw $s1, 0x14($sp) -/* 3AA58 8005F658 0080882D */ daddu $s1, $a0, $zero -/* 3AA5C 8005F65C AFB00010 */ sw $s0, 0x10($sp) -/* 3AA60 8005F660 AFBF0018 */ sw $ra, 0x18($sp) -/* 3AA64 8005F664 0C018183 */ jal nuContDataClose -/* 3AA68 8005F668 00A0802D */ daddu $s0, $a1, $zero -/* 3AA6C 8005F66C 00102040 */ sll $a0, $s0, 1 -/* 3AA70 8005F670 00902021 */ addu $a0, $a0, $s0 -/* 3AA74 8005F674 00042040 */ sll $a0, $a0, 1 -/* 3AA78 8005F678 3C02800B */ lui $v0, 0x800b -/* 3AA7C 8005F67C 24421D68 */ addiu $v0, $v0, 0x1d68 -/* 3AA80 8005F680 00822021 */ addu $a0, $a0, $v0 -/* 3AA84 8005F684 0220282D */ daddu $a1, $s1, $zero -/* 3AA88 8005F688 0C019194 */ jal bcopy -/* 3AA8C 8005F68C 24060006 */ addiu $a2, $zero, 6 -/* 3AA90 8005F690 0C01818D */ jal nuContDataOpen -/* 3AA94 8005F694 00000000 */ nop -/* 3AA98 8005F698 8FBF0018 */ lw $ra, 0x18($sp) -/* 3AA9C 8005F69C 8FB10014 */ lw $s1, 0x14($sp) -/* 3AAA0 8005F6A0 8FB00010 */ lw $s0, 0x10($sp) -/* 3AAA4 8005F6A4 03E00008 */ jr $ra -/* 3AAA8 8005F6A8 27BD0020 */ addiu $sp, $sp, 0x20 -/* 3AAAC 8005F6AC 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3a850_le_a40/nuContInit.s b/asm/nonmatchings/os/code_3a850_le_a40/nuContInit.s deleted file mode 100644 index fbda953206..0000000000 --- a/asm/nonmatchings/os/code_3a850_le_a40/nuContInit.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuContInit -/* 3AA10 8005F610 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3AA14 8005F614 AFBF0014 */ sw $ra, 0x14($sp) -/* 3AA18 8005F618 0C00B38C */ jal nuSiMgrInit -/* 3AA1C 8005F61C AFB00010 */ sw $s0, 0x10($sp) -/* 3AA20 8005F620 0C018144 */ jal nuContMgrInit -/* 3AA24 8005F624 0040802D */ daddu $s0, $v0, $zero -/* 3AA28 8005F628 0C017DAC */ jal nuContPakMgrInit -/* 3AA2C 8005F62C 00000000 */ nop -/* 3AA30 8005F630 0C017F23 */ jal nuContRmbMgrInit -/* 3AA34 8005F634 00000000 */ nop -/* 3AA38 8005F638 320200FF */ andi $v0, $s0, 0xff -/* 3AA3C 8005F63C 8FBF0014 */ lw $ra, 0x14($sp) -/* 3AA40 8005F640 8FB00010 */ lw $s0, 0x10($sp) -/* 3AA44 8005F644 03E00008 */ jr $ra -/* 3AA48 8005F648 27BD0018 */ addiu $sp, $sp, 0x18 -/* 3AA4C 8005F64C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3a850_le_a40/nuContPakMgrInit.s b/asm/nonmatchings/os/code_3a850_le_a40/nuContPakMgrInit.s deleted file mode 100644 index 6e47754b3b..0000000000 --- a/asm/nonmatchings/os/code_3a850_le_a40/nuContPakMgrInit.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuContPakMgrInit -/* 3AAB0 8005F6B0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3AAB4 8005F6B4 3C048009 */ lui $a0, 0x8009 -/* 3AAB8 8005F6B8 24843CD0 */ addiu $a0, $a0, 0x3cd0 -/* 3AABC 8005F6BC AFBF0010 */ sw $ra, 0x10($sp) -/* 3AAC0 8005F6C0 0C0180FC */ jal nuSiCallBackAdd -/* 3AAC4 8005F6C4 00000000 */ nop -/* 3AAC8 8005F6C8 8FBF0010 */ lw $ra, 0x10($sp) -/* 3AACC 8005F6CC 03E00008 */ jr $ra -/* 3AAD0 8005F6D0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/nuContPakMgrRemove.s b/asm/nonmatchings/os/code_3a850_le_a40/nuContPakMgrRemove.s deleted file mode 100644 index f2cebc7b0c..0000000000 --- a/asm/nonmatchings/os/code_3a850_le_a40/nuContPakMgrRemove.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuContPakMgrRemove -/* 3AAD4 8005F6D4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3AAD8 8005F6D8 3C048009 */ lui $a0, 0x8009 -/* 3AADC 8005F6DC 24843CD0 */ addiu $a0, $a0, 0x3cd0 -/* 3AAE0 8005F6E0 AFBF0010 */ sw $ra, 0x10($sp) -/* 3AAE4 8005F6E4 0C018124 */ jal nuSiCallBackRemove -/* 3AAE8 8005F6E8 00000000 */ nop -/* 3AAEC 8005F6EC 8FBF0010 */ lw $ra, 0x10($sp) -/* 3AAF0 8005F6F0 03E00008 */ jr $ra -/* 3AAF4 8005F6F4 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/nuContRmbMgrRemove.s b/asm/nonmatchings/os/code_3a850_le_a40/nuContRmbMgrRemove.s deleted file mode 100644 index 4b2e3f30d6..0000000000 --- a/asm/nonmatchings/os/code_3a850_le_a40/nuContRmbMgrRemove.s +++ /dev/null @@ -1,13 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuContRmbMgrRemove -/* 3B0EC 8005FCEC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3B0F0 8005FCF0 3C048009 */ lui $a0, 0x8009 -/* 3B0F4 8005FCF4 24843D00 */ addiu $a0, $a0, 0x3d00 -/* 3B0F8 8005FCF8 AFBF0010 */ sw $ra, 0x10($sp) -/* 3B0FC 8005FCFC 0C018124 */ jal nuSiCallBackRemove -/* 3B100 8005FD00 00000000 */ nop -/* 3B104 8005FD04 8FBF0010 */ lw $ra, 0x10($sp) -/* 3B108 8005FD08 03E00008 */ jr $ra -/* 3B10C 8005FD0C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/nuGfxInit.s b/asm/nonmatchings/os/code_3a850_le_a40/nuGfxInit.s deleted file mode 100644 index 7f37033a81..0000000000 --- a/asm/nonmatchings/os/code_3a850_le_a40/nuGfxInit.s +++ /dev/null @@ -1,48 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuGfxInit -/* 3A960 8005F560 27BDF7E8 */ addiu $sp, $sp, -0x818 -/* 3A964 8005F564 AFBF0810 */ sw $ra, 0x810($sp) -/* 3A968 8005F568 0C01807C */ jal nuGfxThreadStart -/* 3A96C 8005F56C 00000000 */ nop -/* 3A970 8005F570 3C048009 */ lui $a0, 0x8009 -/* 3A974 8005F574 24843BA8 */ addiu $a0, $a0, 0x3ba8 -/* 3A978 8005F578 0C017CBC */ jal nuGfxSetCfb -/* 3A97C 8005F57C 24050003 */ addiu $a1, $zero, 3 -/* 3A980 8005F580 3C028000 */ lui $v0, 0x8000 -/* 3A984 8005F584 34420400 */ ori $v0, $v0, 0x400 -/* 3A988 8005F588 3C048006 */ lui $a0, 0x8006 -/* 3A98C 8005F58C 24840350 */ addiu $a0, $a0, 0x350 -/* 3A990 8005F590 3C01800A */ lui $at, 0x800a -/* 3A994 8005F594 AC22A5DC */ sw $v0, -0x5a24($at) -/* 3A998 8005F598 0C0180C4 */ jal nuGfxSwapCfbFuncSet -/* 3A99C 8005F59C 00000000 */ nop -/* 3A9A0 8005F5A0 3C028009 */ lui $v0, 0x8009 -/* 3A9A4 8005F5A4 24423BA0 */ addiu $v0, $v0, 0x3ba0 -/* 3A9A8 8005F5A8 3C01800A */ lui $at, 0x800a -/* 3A9AC 8005F5AC AC22A610 */ sw $v0, -0x59f0($at) -/* 3A9B0 8005F5B0 0C00B2CE */ jal nuGfxTaskMgrInit -/* 3A9B4 8005F5B4 00000000 */ nop -/* 3A9B8 8005F5B8 27A40010 */ addiu $a0, $sp, 0x10 -/* 3A9BC 8005F5BC 27A50028 */ addiu $a1, $sp, 0x28 -/* 3A9C0 8005F5C0 00A42823 */ subu $a1, $a1, $a0 -/* 3A9C4 8005F5C4 3C02DE00 */ lui $v0, 0xde00 -/* 3A9C8 8005F5C8 AFA20010 */ sw $v0, 0x10($sp) -/* 3A9CC 8005F5CC 3C020009 */ lui $v0, 9 -/* 3A9D0 8005F5D0 24423BB8 */ addiu $v0, $v0, 0x3bb8 -/* 3A9D4 8005F5D4 AC820004 */ sw $v0, 4($a0) -/* 3A9D8 8005F5D8 3C02E900 */ lui $v0, 0xe900 -/* 3A9DC 8005F5DC AFA20018 */ sw $v0, 0x18($sp) -/* 3A9E0 8005F5E0 3C02DF00 */ lui $v0, 0xdf00 -/* 3A9E4 8005F5E4 0000302D */ daddu $a2, $zero, $zero -/* 3A9E8 8005F5E8 00C0382D */ daddu $a3, $a2, $zero -/* 3A9EC 8005F5EC AFA0001C */ sw $zero, 0x1c($sp) -/* 3A9F0 8005F5F0 AFA20020 */ sw $v0, 0x20($sp) -/* 3A9F4 8005F5F4 0C00B331 */ jal nuGfxTaskStart -/* 3A9F8 8005F5F8 AFA00024 */ sw $zero, 0x24($sp) -/* 3A9FC 8005F5FC 0C017CB4 */ jal nuGfxTaskAllEndWait -/* 3AA00 8005F600 00000000 */ nop -/* 3AA04 8005F604 8FBF0810 */ lw $ra, 0x810($sp) -/* 3AA08 8005F608 03E00008 */ jr $ra -/* 3AA0C 8005F60C 27BD0818 */ addiu $sp, $sp, 0x818 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/nuPiInit.s b/asm/nonmatchings/os/code_3a850_le_a40/nuPiInit.s deleted file mode 100644 index 1cc24649cd..0000000000 --- a/asm/nonmatchings/os/code_3a850_le_a40/nuPiInit.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuPiInit -/* 3A850 8005F450 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 3A854 8005F454 24040096 */ addiu $a0, $zero, 0x96 -/* 3A858 8005F458 3C05800B */ lui $a1, 0x800b -/* 3A85C 8005F45C 24A5C5D0 */ addiu $a1, $a1, -0x3a30 -/* 3A860 8005F460 3C06800B */ lui $a2, 0x800b -/* 3A864 8005F464 24C6C5E8 */ addiu $a2, $a2, -0x3a18 -/* 3A868 8005F468 AFBF0010 */ sw $ra, 0x10($sp) -/* 3A86C 8005F46C 0C018278 */ jal osCreatePiManager -/* 3A870 8005F470 24070032 */ addiu $a3, $zero, 0x32 -/* 3A874 8005F474 0C0183C4 */ jal osCartRomInit -/* 3A878 8005F478 00000000 */ nop -/* 3A87C 8005F47C 8FBF0010 */ lw $ra, 0x10($sp) -/* 3A880 8005F480 3C01800A */ lui $at, 0x800a -/* 3A884 8005F484 AC22A638 */ sw $v0, -0x59c8($at) -/* 3A888 8005F488 03E00008 */ jr $ra -/* 3A88C 8005F48C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/nonmatchings/os/code_3a850_le_a40/nuPiReadRom.s b/asm/nonmatchings/os/code_3a850_le_a40/nuPiReadRom.s deleted file mode 100644 index 83af513b5c..0000000000 --- a/asm/nonmatchings/os/code_3a850_le_a40/nuPiReadRom.s +++ /dev/null @@ -1,59 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuPiReadRom -/* 3A890 8005F490 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* 3A894 8005F494 AFB30054 */ sw $s3, 0x54($sp) -/* 3A898 8005F498 0080982D */ daddu $s3, $a0, $zero -/* 3A89C 8005F49C AFB20050 */ sw $s2, 0x50($sp) -/* 3A8A0 8005F4A0 00A0902D */ daddu $s2, $a1, $zero -/* 3A8A4 8005F4A4 AFB1004C */ sw $s1, 0x4c($sp) -/* 3A8A8 8005F4A8 00C0882D */ daddu $s1, $a2, $zero -/* 3A8AC 8005F4AC AFB00048 */ sw $s0, 0x48($sp) -/* 3A8B0 8005F4B0 27B00028 */ addiu $s0, $sp, 0x28 -/* 3A8B4 8005F4B4 0200202D */ daddu $a0, $s0, $zero -/* 3A8B8 8005F4B8 27A50040 */ addiu $a1, $sp, 0x40 -/* 3A8BC 8005F4BC AFBF0058 */ sw $ra, 0x58($sp) -/* 3A8C0 8005F4C0 0C019560 */ jal osCreateMesgQueue -/* 3A8C4 8005F4C4 24060001 */ addiu $a2, $zero, 1 -/* 3A8C8 8005F4C8 0240202D */ daddu $a0, $s2, $zero -/* 3A8CC 8005F4CC 0220282D */ daddu $a1, $s1, $zero -/* 3A8D0 8005F4D0 A3A00012 */ sb $zero, 0x12($sp) -/* 3A8D4 8005F4D4 0C0185C8 */ jal osInvalDCache -/* 3A8D8 8005F4D8 AFB00014 */ sw $s0, 0x14($sp) -/* 3A8DC 8005F4DC 0240202D */ daddu $a0, $s2, $zero -/* 3A8E0 8005F4E0 0C0185F4 */ jal osInvalICache -/* 3A8E4 8005F4E4 0220282D */ daddu $a1, $s1, $zero -/* 3A8E8 8005F4E8 12200015 */ beqz $s1, .L8005F540 -/* 3A8EC 8005F4EC 00000000 */ nop -.L8005F4F0: -/* 3A8F0 8005F4F0 2E224001 */ sltiu $v0, $s1, 0x4001 -/* 3A8F4 8005F4F4 14400002 */ bnez $v0, .L8005F500 -/* 3A8F8 8005F4F8 0220802D */ daddu $s0, $s1, $zero -/* 3A8FC 8005F4FC 24104000 */ addiu $s0, $zero, 0x4000 -.L8005F500: -/* 3A900 8005F500 27A50010 */ addiu $a1, $sp, 0x10 -/* 3A904 8005F504 3C04800A */ lui $a0, 0x800a -/* 3A908 8005F508 8C84A638 */ lw $a0, -0x59c8($a0) -/* 3A90C 8005F50C 0000302D */ daddu $a2, $zero, $zero -/* 3A910 8005F510 AFB20018 */ sw $s2, 0x18($sp) -/* 3A914 8005F514 AFB3001C */ sw $s3, 0x1c($sp) -/* 3A918 8005F518 0C018388 */ jal osEPiStartDma -/* 3A91C 8005F51C AFB00020 */ sw $s0, 0x20($sp) -/* 3A920 8005F520 27A40028 */ addiu $a0, $sp, 0x28 -/* 3A924 8005F524 27A50040 */ addiu $a1, $sp, 0x40 -/* 3A928 8005F528 0C0195BC */ jal osRecvMesg -/* 3A92C 8005F52C 24060001 */ addiu $a2, $zero, 1 -/* 3A930 8005F530 02709821 */ addu $s3, $s3, $s0 -/* 3A934 8005F534 02308823 */ subu $s1, $s1, $s0 -/* 3A938 8005F538 1620FFED */ bnez $s1, .L8005F4F0 -/* 3A93C 8005F53C 02509021 */ addu $s2, $s2, $s0 -.L8005F540: -/* 3A940 8005F540 8FBF0058 */ lw $ra, 0x58($sp) -/* 3A944 8005F544 8FB30054 */ lw $s3, 0x54($sp) -/* 3A948 8005F548 8FB20050 */ lw $s2, 0x50($sp) -/* 3A94C 8005F54C 8FB1004C */ lw $s1, 0x4c($sp) -/* 3A950 8005F550 8FB00048 */ lw $s0, 0x48($sp) -/* 3A954 8005F554 03E00008 */ jr $ra -/* 3A958 8005F558 27BD0060 */ addiu $sp, $sp, 0x60 -/* 3A95C 8005F55C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3a850_le_a40/osMotorStop.s b/asm/nonmatchings/os/code_3a850_le_a40/osMotorStop.s deleted file mode 100644 index 67e9489a58..0000000000 --- a/asm/nonmatchings/os/code_3a850_le_a40/osMotorStop.s +++ /dev/null @@ -1,141 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel osMotorStop -/* 3AD20 8005F920 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* 3AD24 8005F924 AFB20018 */ sw $s2, 0x18($sp) -/* 3AD28 8005F928 0080902D */ daddu $s2, $a0, $zero -/* 3AD2C 8005F92C 00A0302D */ daddu $a2, $a1, $zero -/* 3AD30 8005F930 AFB00010 */ sw $s0, 0x10($sp) -/* 3AD34 8005F934 AFBF0020 */ sw $ra, 0x20($sp) -/* 3AD38 8005F938 AFB3001C */ sw $s3, 0x1c($sp) -/* 3AD3C 8005F93C AFB10014 */ sw $s1, 0x14($sp) -/* 3AD40 8005F940 92430006 */ lbu $v1, 6($s2) -/* 3AD44 8005F944 24130002 */ addiu $s3, $zero, 2 -/* 3AD48 8005F948 10730069 */ beq $v1, $s3, .L8005FAF0 -/* 3AD4C 8005F94C 0000802D */ daddu $s0, $zero, $zero -/* 3AD50 8005F950 28620003 */ slti $v0, $v1, 3 -/* 3AD54 8005F954 10400005 */ beqz $v0, .L8005F96C -/* 3AD58 8005F958 24020001 */ addiu $v0, $zero, 1 -/* 3AD5C 8005F95C 1062000A */ beq $v1, $v0, .L8005F988 -/* 3AD60 8005F960 0200102D */ daddu $v0, $s0, $zero -/* 3AD64 8005F964 08017EBD */ j .L8005FAF4 -/* 3AD68 8005F968 00000000 */ nop -.L8005F96C: -/* 3AD6C 8005F96C 24020003 */ addiu $v0, $zero, 3 -/* 3AD70 8005F970 10620018 */ beq $v1, $v0, .L8005F9D4 -/* 3AD74 8005F974 24020004 */ addiu $v0, $zero, 4 -/* 3AD78 8005F978 10620048 */ beq $v1, $v0, .L8005FA9C -/* 3AD7C 8005F97C 0200102D */ daddu $v0, $s0, $zero -/* 3AD80 8005F980 08017EBD */ j .L8005FAF4 -/* 3AD84 8005F984 00000000 */ nop -.L8005F988: -/* 3AD88 8005F988 96420004 */ lhu $v0, 4($s2) -/* 3AD8C 8005F98C 1040000C */ beqz $v0, .L8005F9C0 -/* 3AD90 8005F990 00062040 */ sll $a0, $a2, 1 -/* 3AD94 8005F994 00862021 */ addu $a0, $a0, $a2 -/* 3AD98 8005F998 00042080 */ sll $a0, $a0, 2 -/* 3AD9C 8005F99C 00862021 */ addu $a0, $a0, $a2 -/* 3ADA0 8005F9A0 000420C0 */ sll $a0, $a0, 3 -/* 3ADA4 8005F9A4 3C02800E */ lui $v0, 0x800e -/* 3ADA8 8005F9A8 2442AAD8 */ addiu $v0, $v0, -0x5528 -/* 3ADAC 8005F9AC 00822021 */ addu $a0, $a0, $v0 -/* 3ADB0 8005F9B0 0C019F80 */ jal osMotorAccess -/* 3ADB4 8005F9B4 0000282D */ daddu $a1, $zero, $zero -/* 3ADB8 8005F9B8 08017E71 */ j .L8005F9C4 -/* 3ADBC 8005F9BC 0040802D */ daddu $s0, $v0, $zero -.L8005F9C0: -/* 3ADC0 8005F9C0 A2530006 */ sb $s3, 6($s2) -.L8005F9C4: -/* 3ADC4 8005F9C4 96420004 */ lhu $v0, 4($s2) -/* 3ADC8 8005F9C8 2442FFFF */ addiu $v0, $v0, -1 -/* 3ADCC 8005F9CC 08017EBC */ j .L8005FAF0 -/* 3ADD0 8005F9D0 A6420004 */ sh $v0, 4($s2) -.L8005F9D4: -/* 3ADD4 8005F9D4 96420002 */ lhu $v0, 2($s2) -/* 3ADD8 8005F9D8 1040001F */ beqz $v0, .L8005FA58 -/* 3ADDC 8005F9DC 00062040 */ sll $a0, $a2, 1 -/* 3ADE0 8005F9E0 96420004 */ lhu $v0, 4($s2) -/* 3ADE4 8005F9E4 96430000 */ lhu $v1, ($s2) -/* 3ADE8 8005F9E8 00431021 */ addu $v0, $v0, $v1 -/* 3ADEC 8005F9EC 304300FF */ andi $v1, $v0, 0xff -/* 3ADF0 8005F9F0 3042FFFF */ andi $v0, $v0, 0xffff -/* 3ADF4 8005F9F4 00021202 */ srl $v0, $v0, 8 -/* 3ADF8 8005F9F8 1040000B */ beqz $v0, .L8005FA28 -/* 3ADFC 8005F9FC A6430004 */ sh $v1, 4($s2) -/* 3AE00 8005FA00 00062040 */ sll $a0, $a2, 1 -/* 3AE04 8005FA04 00862021 */ addu $a0, $a0, $a2 -/* 3AE08 8005FA08 00042080 */ sll $a0, $a0, 2 -/* 3AE0C 8005FA0C 00862021 */ addu $a0, $a0, $a2 -/* 3AE10 8005FA10 000420C0 */ sll $a0, $a0, 3 -/* 3AE14 8005FA14 3C02800E */ lui $v0, 0x800e -/* 3AE18 8005FA18 2442AAD8 */ addiu $v0, $v0, -0x5528 -/* 3AE1C 8005FA1C 00822021 */ addu $a0, $a0, $v0 -/* 3AE20 8005FA20 08017E92 */ j .L8005FA48 -/* 3AE24 8005FA24 24050001 */ addiu $a1, $zero, 1 -.L8005FA28: -/* 3AE28 8005FA28 00862021 */ addu $a0, $a0, $a2 -/* 3AE2C 8005FA2C 00042080 */ sll $a0, $a0, 2 -/* 3AE30 8005FA30 00862021 */ addu $a0, $a0, $a2 -/* 3AE34 8005FA34 000420C0 */ sll $a0, $a0, 3 -/* 3AE38 8005FA38 3C02800E */ lui $v0, 0x800e -/* 3AE3C 8005FA3C 2442AAD8 */ addiu $v0, $v0, -0x5528 -/* 3AE40 8005FA40 00822021 */ addu $a0, $a0, $v0 -/* 3AE44 8005FA44 0000282D */ daddu $a1, $zero, $zero -.L8005FA48: -/* 3AE48 8005FA48 0C019F80 */ jal osMotorAccess -/* 3AE4C 8005FA4C 00000000 */ nop -/* 3AE50 8005FA50 08017EA3 */ j .L8005FA8C -/* 3AE54 8005FA54 0040802D */ daddu $s0, $v0, $zero -.L8005FA58: -/* 3AE58 8005FA58 00862021 */ addu $a0, $a0, $a2 -/* 3AE5C 8005FA5C 00042080 */ sll $a0, $a0, 2 -/* 3AE60 8005FA60 00862021 */ addu $a0, $a0, $a2 -/* 3AE64 8005FA64 000420C0 */ sll $a0, $a0, 3 -/* 3AE68 8005FA68 3C02800E */ lui $v0, 0x800e -/* 3AE6C 8005FA6C 2442AAD8 */ addiu $v0, $v0, -0x5528 -/* 3AE70 8005FA70 00822021 */ addu $a0, $a0, $v0 -/* 3AE74 8005FA74 0C019F80 */ jal osMotorAccess -/* 3AE78 8005FA78 0000282D */ daddu $a1, $zero, $zero -/* 3AE7C 8005FA7C 0040802D */ daddu $s0, $v0, $zero -/* 3AE80 8005FA80 24020001 */ addiu $v0, $zero, 1 -/* 3AE84 8005FA84 A2420006 */ sb $v0, 6($s2) -/* 3AE88 8005FA88 A6530004 */ sh $s3, 4($s2) -.L8005FA8C: -/* 3AE8C 8005FA8C 96420002 */ lhu $v0, 2($s2) -/* 3AE90 8005FA90 2442FFFF */ addiu $v0, $v0, -1 -/* 3AE94 8005FA94 08017EBC */ j .L8005FAF0 -/* 3AE98 8005FA98 A6420002 */ sh $v0, 2($s2) -.L8005FA9C: -/* 3AE9C 8005FA9C 3C04800E */ lui $a0, 0x800e -/* 3AEA0 8005FAA0 2484AC78 */ addiu $a0, $a0, -0x5388 -/* 3AEA4 8005FAA4 00061040 */ sll $v0, $a2, 1 -/* 3AEA8 8005FAA8 00461021 */ addu $v0, $v0, $a2 -/* 3AEAC 8005FAAC 00021080 */ sll $v0, $v0, 2 -/* 3AEB0 8005FAB0 00461021 */ addu $v0, $v0, $a2 -/* 3AEB4 8005FAB4 000210C0 */ sll $v0, $v0, 3 -/* 3AEB8 8005FAB8 3C03800E */ lui $v1, 0x800e -/* 3AEBC 8005FABC 2463AAD8 */ addiu $v1, $v1, -0x5528 -/* 3AEC0 8005FAC0 00438821 */ addu $s1, $v0, $v1 -/* 3AEC4 8005FAC4 0C019FD1 */ jal osMotorInit -/* 3AEC8 8005FAC8 0220282D */ daddu $a1, $s1, $zero -/* 3AECC 8005FACC 0040802D */ daddu $s0, $v0, $zero -/* 3AED0 8005FAD0 16000005 */ bnez $s0, .L8005FAE8 -/* 3AED4 8005FAD4 24020001 */ addiu $v0, $zero, 1 -/* 3AED8 8005FAD8 0220202D */ daddu $a0, $s1, $zero -/* 3AEDC 8005FADC 0C019F80 */ jal osMotorAccess -/* 3AEE0 8005FAE0 0000282D */ daddu $a1, $zero, $zero -/* 3AEE4 8005FAE4 24020001 */ addiu $v0, $zero, 1 -.L8005FAE8: -/* 3AEE8 8005FAE8 A2420006 */ sb $v0, 6($s2) -/* 3AEEC 8005FAEC A6530004 */ sh $s3, 4($s2) -.L8005FAF0: -/* 3AEF0 8005FAF0 0200102D */ daddu $v0, $s0, $zero -.L8005FAF4: -/* 3AEF4 8005FAF4 8FBF0020 */ lw $ra, 0x20($sp) -/* 3AEF8 8005FAF8 8FB3001C */ lw $s3, 0x1c($sp) -/* 3AEFC 8005FAFC 8FB20018 */ lw $s2, 0x18($sp) -/* 3AF00 8005FB00 8FB10014 */ lw $s1, 0x14($sp) -/* 3AF04 8005FB04 8FB00010 */ lw $s0, 0x10($sp) -/* 3AF08 8005FB08 03E00008 */ jr $ra -/* 3AF0C 8005FB0C 27BD0028 */ addiu $sp, $sp, 0x28 diff --git a/asm/nonmatchings/os/code_3b290_len_100/nuContRmbCheck.s b/asm/nonmatchings/os/code_3b290_len_100/nuContRmbCheck.s deleted file mode 100644 index 77fdf5d6fb..0000000000 --- a/asm/nonmatchings/os/code_3b290_len_100/nuContRmbCheck.s +++ /dev/null @@ -1,46 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuContRmbCheck -/* 3B2F0 8005FEF0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 3B2F4 8005FEF4 AFB00020 */ sw $s0, 0x20($sp) -/* 3B2F8 8005FEF8 0080802D */ daddu $s0, $a0, $zero -/* 3B2FC 8005FEFC 24040301 */ addiu $a0, $zero, 0x301 -/* 3B300 8005FF00 27A50010 */ addiu $a1, $sp, 0x10 -/* 3B304 8005FF04 AFBF0028 */ sw $ra, 0x28($sp) -/* 3B308 8005FF08 AFB10024 */ sw $s1, 0x24($sp) -/* 3B30C 8005FF0C 0C00B3CA */ jal nuSiSendMesg -/* 3B310 8005FF10 A3B00010 */ sb $s0, 0x10($sp) -/* 3B314 8005FF14 24040001 */ addiu $a0, $zero, 1 -/* 3B318 8005FF18 0C018250 */ jal osSetIntMask -/* 3B31C 8005FF1C 0040882D */ daddu $s1, $v0, $zero -/* 3B320 8005FF20 1620000A */ bnez $s1, .L8005FF4C -/* 3B324 8005FF24 0040202D */ daddu $a0, $v0, $zero -/* 3B328 8005FF28 00101080 */ sll $v0, $s0, 2 -/* 3B32C 8005FF2C 00501021 */ addu $v0, $v0, $s0 -/* 3B330 8005FF30 00021040 */ sll $v0, $v0, 1 -/* 3B334 8005FF34 24030002 */ addiu $v1, $zero, 2 -/* 3B338 8005FF38 3C01800B */ lui $at, 0x800b -/* 3B33C 8005FF3C 00220821 */ addu $at, $at, $v0 -/* 3B340 8005FF40 A0231D49 */ sb $v1, 0x1d49($at) -/* 3B344 8005FF44 08017FD9 */ j .L8005FF64 -/* 3B348 8005FF48 00000000 */ nop -.L8005FF4C: -/* 3B34C 8005FF4C 00101080 */ sll $v0, $s0, 2 -/* 3B350 8005FF50 00501021 */ addu $v0, $v0, $s0 -/* 3B354 8005FF54 00021040 */ sll $v0, $v0, 1 -/* 3B358 8005FF58 3C01800B */ lui $at, 0x800b -/* 3B35C 8005FF5C 00220821 */ addu $at, $at, $v0 -/* 3B360 8005FF60 A0201D49 */ sb $zero, 0x1d49($at) -.L8005FF64: -/* 3B364 8005FF64 0C018250 */ jal osSetIntMask -/* 3B368 8005FF68 00000000 */ nop -/* 3B36C 8005FF6C 0220102D */ daddu $v0, $s1, $zero -/* 3B370 8005FF70 8FBF0028 */ lw $ra, 0x28($sp) -/* 3B374 8005FF74 8FB10024 */ lw $s1, 0x24($sp) -/* 3B378 8005FF78 8FB00020 */ lw $s0, 0x20($sp) -/* 3B37C 8005FF7C 03E00008 */ jr $ra -/* 3B380 8005FF80 27BD0030 */ addiu $sp, $sp, 0x30 -/* 3B384 8005FF84 00000000 */ nop -/* 3B388 8005FF88 00000000 */ nop -/* 3B38C 8005FF8C 00000000 */ nop diff --git a/asm/nonmatchings/os/code_3b290_len_100/nuContRmbStart.s b/asm/nonmatchings/os/code_3b290_len_100/nuContRmbStart.s deleted file mode 100644 index ba192638dd..0000000000 --- a/asm/nonmatchings/os/code_3b290_len_100/nuContRmbStart.s +++ /dev/null @@ -1,29 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel nuContRmbStart -/* 3B290 8005FE90 00041080 */ sll $v0, $a0, 2 -/* 3B294 8005FE94 00441021 */ addu $v0, $v0, $a0 -/* 3B298 8005FE98 00021040 */ sll $v0, $v0, 1 -/* 3B29C 8005FE9C 3C01800B */ lui $at, 0x800b -/* 3B2A0 8005FEA0 00220821 */ addu $at, $at, $v0 -/* 3B2A4 8005FEA4 90221D47 */ lbu $v0, 0x1d47($at) -/* 3B2A8 8005FEA8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* 3B2AC 8005FEAC 30420080 */ andi $v0, $v0, 0x80 -/* 3B2B0 8005FEB0 1440000B */ bnez $v0, .L8005FEE0 -/* 3B2B4 8005FEB4 AFBF0030 */ sw $ra, 0x30($sp) -/* 3B2B8 8005FEB8 24020003 */ addiu $v0, $zero, 3 -/* 3B2BC 8005FEBC A3A20016 */ sb $v0, 0x16($sp) -/* 3B2C0 8005FEC0 27A20010 */ addiu $v0, $sp, 0x10 -/* 3B2C4 8005FEC4 A3A40020 */ sb $a0, 0x20($sp) -/* 3B2C8 8005FEC8 24040302 */ addiu $a0, $zero, 0x302 -/* 3B2CC 8005FECC A7A50010 */ sh $a1, 0x10($sp) -/* 3B2D0 8005FED0 27A50020 */ addiu $a1, $sp, 0x20 -/* 3B2D4 8005FED4 A7A60012 */ sh $a2, 0x12($sp) -/* 3B2D8 8005FED8 0C00B3CA */ jal nuSiSendMesg -/* 3B2DC 8005FEDC AFA20028 */ sw $v0, 0x28($sp) -.L8005FEE0: -/* 3B2E0 8005FEE0 8FBF0030 */ lw $ra, 0x30($sp) -/* 3B2E4 8005FEE4 03E00008 */ jr $ra -/* 3B2E8 8005FEE8 27BD0038 */ addiu $sp, $sp, 0x38 -/* 3B2EC 8005FEEC 00000000 */ nop diff --git a/asm/nonmatchings/os/nuContRmbMgr/func_8005FDE4.s b/asm/nonmatchings/os/nuContRmbMgr/func_8005FDE4.s deleted file mode 100644 index 854ee8ecaf..0000000000 --- a/asm/nonmatchings/os/nuContRmbMgr/func_8005FDE4.s +++ /dev/null @@ -1,14 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8005FDE4 -/* 3B1E4 8005FDE4 8C82000C */ lw $v0, 0xc($a0) -/* 3B1E8 8005FDE8 90430000 */ lbu $v1, ($v0) -/* 3B1EC 8005FDEC 00031080 */ sll $v0, $v1, 2 -/* 3B1F0 8005FDF0 00431021 */ addu $v0, $v0, $v1 -/* 3B1F4 8005FDF4 00021040 */ sll $v0, $v0, 1 -/* 3B1F8 8005FDF8 3C01800B */ lui $at, 0x800b -/* 3B1FC 8005FDFC 00220821 */ addu $at, $at, $v0 -/* 3B200 8005FE00 A4201D42 */ sh $zero, 0x1d42($at) -/* 3B204 8005FE04 03E00008 */ jr $ra -/* 3B208 8005FE08 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/os/nuContRmbMgr/func_8005FE0C.s b/asm/nonmatchings/os/nuContRmbMgr/func_8005FE0C.s deleted file mode 100644 index 7fd496b1d5..0000000000 --- a/asm/nonmatchings/os/nuContRmbMgr/func_8005FE0C.s +++ /dev/null @@ -1,23 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8005FE0C -/* 3B20C 8005FE0C 0000282D */ daddu $a1, $zero, $zero -/* 3B210 8005FE10 24060004 */ addiu $a2, $zero, 4 -/* 3B214 8005FE14 3C03800B */ lui $v1, 0x800b -/* 3B218 8005FE18 24631D47 */ addiu $v1, $v1, 0x1d47 -/* 3B21C 8005FE1C 00A0202D */ daddu $a0, $a1, $zero -.L8005FE20: -/* 3B220 8005FE20 3C01800B */ lui $at, 0x800b -/* 3B224 8005FE24 00240821 */ addu $at, $at, $a0 -/* 3B228 8005FE28 A0261D46 */ sb $a2, 0x1d46($at) -/* 3B22C 8005FE2C 2484000A */ addiu $a0, $a0, 0xa -/* 3B230 8005FE30 90620000 */ lbu $v0, ($v1) -/* 3B234 8005FE34 24A50001 */ addiu $a1, $a1, 1 -/* 3B238 8005FE38 34420080 */ ori $v0, $v0, 0x80 -/* 3B23C 8005FE3C A0620000 */ sb $v0, ($v1) -/* 3B240 8005FE40 2CA20004 */ sltiu $v0, $a1, 4 -/* 3B244 8005FE44 1440FFF6 */ bnez $v0, .L8005FE20 -/* 3B248 8005FE48 2463000A */ addiu $v1, $v1, 0xa -/* 3B24C 8005FE4C 03E00008 */ jr $ra -/* 3B250 8005FE50 0000102D */ daddu $v0, $zero, $zero diff --git a/asm/nonmatchings/os/nuContRmbMgr/func_8005FE54.s b/asm/nonmatchings/os/nuContRmbMgr/func_8005FE54.s deleted file mode 100644 index e822e1c720..0000000000 --- a/asm/nonmatchings/os/nuContRmbMgr/func_8005FE54.s +++ /dev/null @@ -1,20 +0,0 @@ -.set noat # allow manual use of $at -.set noreorder # don't insert nops after branches - -glabel func_8005FE54 -/* 3B254 8005FE54 0000202D */ daddu $a0, $zero, $zero -/* 3B258 8005FE58 3C03800B */ lui $v1, 0x800b -/* 3B25C 8005FE5C 24631D47 */ addiu $v1, $v1, 0x1d47 -.L8005FE60: -/* 3B260 8005FE60 90620000 */ lbu $v0, ($v1) -/* 3B264 8005FE64 24840001 */ addiu $a0, $a0, 1 -/* 3B268 8005FE68 3042007F */ andi $v0, $v0, 0x7f -/* 3B26C 8005FE6C A0620000 */ sb $v0, ($v1) -/* 3B270 8005FE70 2C820004 */ sltiu $v0, $a0, 4 -/* 3B274 8005FE74 1440FFFA */ bnez $v0, .L8005FE60 -/* 3B278 8005FE78 2463000A */ addiu $v1, $v1, 0xa -/* 3B27C 8005FE7C 03E00008 */ jr $ra -/* 3B280 8005FE80 0000102D */ daddu $v0, $zero, $zero -/* 3B284 8005FE84 00000000 */ nop -/* 3B288 8005FE88 00000000 */ nop -/* 3B28C 8005FE8C 00000000 */ nop diff --git a/coverage.py b/coverage.py index 31027187bf..d5a124f6db 100755 --- a/coverage.py +++ b/coverage.py @@ -27,11 +27,11 @@ def strip_c_comments(text): return re.sub(pattern, replacer, text) c_func_pattern = re.compile( - r"^[^\s]+\s+([^\s(]+)\(([^\n)]*)\)\s+{", + r"^(static\s+)?[^\s]+\s+([^\s(]+)\(([^\n)]*)\)\s+{", re.MULTILINE ) def funcs_in_c(text): - return (match.group(1) for match in c_func_pattern.finditer(text)) + return (match.group(2) for match in c_func_pattern.finditer(text)) asm_func_pattern = re.compile( r"INCLUDE_ASM\([^,]+, [^,]+, ([^,)]+)", @@ -57,7 +57,9 @@ matched_but_undeleted_asm = [f for f in matched if f in non_matched and not f in if __name__ == "__main__": if "--help" in argv: print("--fail-matched-undeleted exit with error code 1 if matched function(s) exist in asm/nonmatchings/") + print("--fail-unincluded exit with error code 2 if unincluded assembly files exist") print("--delete-matched delete matched function(s) from asm/nonmatchings/ without asking") + print("--delete-unincluded delete unincluded, unmatched assembly files") exit() total = len(matched) + len(non_matched) @@ -73,4 +75,16 @@ if __name__ == "__main__": f = next(NONMATCHINGS_DIR.rglob(func + ".s")) remove(f) elif len(asm) != len(non_matched): - print(f"warning: number of INCLUDE_ASM macros ({len(asm)}) != number of asm files ({len(non_matched)})") + #print(f"warning: number of INCLUDE_ASM macros ({len(asm)}) != number of asm files ({len(non_matched)})") + + if len(non_matched) > len(asm): + print(f"The following functions are unmatched but are also unINCLUDEd: {set(non_matched) - set(asm)}") + + if "--fail-unincluded" in argv: + exit(2) + elif "--delete-unincluded" in argv or input("Delete them [y/N]? ").upper() == "Y": + for func in set(non_matched) - set(asm): + f = next(NONMATCHINGS_DIR.rglob(func + ".s")) + remove(f) + else: + print(f"warning: The following .s files are INCLUDEd but don't exist: {set(asm) - set(non_matched)}")