From 21cda43806133223a43ed52a787bccbf5dfec51a Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 20 May 2023 00:08:54 +1000 Subject: [PATCH] Use li and move pseudo instructions in ASM where possible --- src/game/portalconv.s | 10 +- src/lib/getra.s | 6 +- src/lib/modelasm.s | 126 +++++++++++++------------- src/lib/mp3/lib_46650.s | 8 +- src/lib/mp3/lib_47550.s | 24 ++--- src/lib/mp3/util.s | 28 +++--- src/lib/mtxasm.s | 28 +++--- src/lib/tlb.s | 46 +++++----- src/lib/ultra/libc/bcmp.s | 8 +- src/lib/ultra/libc/bcopy.s | 8 +- src/lib/ultra/libc/bzero.s | 4 +- src/lib/ultra/os/exceptasm.s | 114 +++++++++++------------ src/lib/ultra/os/interrupt.s | 4 +- src/lib/ultra/os/invaldcache.s | 2 +- src/lib/ultra/os/invalicache.s | 2 +- src/lib/ultra/os/maptlb.s | 14 +-- src/lib/ultra/os/probetlb.s | 4 +- src/lib/ultra/os/setintmask.s | 4 +- src/lib/ultra/os/writebackdcache.s | 2 +- src/lib/ultra/os/writebackdcacheall.s | 2 +- 20 files changed, 222 insertions(+), 222 deletions(-) diff --git a/src/game/portalconv.s b/src/game/portalconv.s index 95e0c515e..7caa0e3d6 100644 --- a/src/game/portalconv.s +++ b/src/game/portalconv.s @@ -78,9 +78,9 @@ glabel portalConvertCoordinates c.lt.s $f16, $f20 swc1 $f16, 0x8($t6) bc1t .L0f165474 - addiu $t4, $zero, 0x0 - addiu $t3, $zero, 0x1 - addiu $t4, $zero, 0x1 + li $t4, 0x0 + li $t3, 0x1 + li $t4, 0x1 .L0f165474: sw $t4, 0xc($t6) addiu $t6, $t6, -16 @@ -89,7 +89,7 @@ glabel portalConvertCoordinates beqz $t3, .L0f1655a8 nop addiu $t0, $a2, 0x270 - addiu $v0, $zero, 0x0 + li $v0, 0x0 lw $t1, 0x0($t0) lw $t2, 0x4($t0) lw $t3, 0x8($t0) @@ -164,7 +164,7 @@ glabel portalConvertCoordinates jr $ra mtc1 $t7, $f20 .L0f1655a8: - addiu $t0, $zero, 0x28 + li $t0, 0x28 sub $t0, $t0, $v0 sw $t0, 0x0($a1) jr $ra diff --git a/src/lib/getra.s b/src/lib/getra.s index 6f0f75e82..564d64e2a 100644 --- a/src/lib/getra.s +++ b/src/lib/getra.s @@ -21,11 +21,11 @@ * the instruction, then reads the value out of the stack using that offset. */ glabel getReturnAddress - or $a0, $ra, $zero - addiu $v0, $zero, -1 + move $a0, $ra + li $v0, -1 .loop: lw $t0, 0($a0) - addiu $t2, $zero, 0x27bd + li $t2, 0x27bd srl $t1, $t0, 16 beq $t1, $t2, .foundtop nop diff --git a/src/lib/modelasm.s b/src/lib/modelasm.s index 9cab337fb..c4e006d83 100644 --- a/src/lib/modelasm.s +++ b/src/lib/modelasm.s @@ -149,7 +149,7 @@ glabel modelasm00018680 sw $zero, 0x7f8($sp) lui $at, 0x3f80 mtc1 $at, $f31 - or $t0, $sp, $zero + move $t0, $sp lw $t1, 0x8($a1) lhu $t1, 0xe($t1) .L000186f8: @@ -161,7 +161,7 @@ glabel modelasm00018680 lw $a2, 0x20($a1) beqz $a2, .L000189cc nop - or $t0, $sp, $zero + move $t0, $sp addi $t1, $zero, 0x0 lui $t4, %hi(g_AnimToHeaderSlot) addiu $t4, $t4, %lo(g_AnimToHeaderSlot) @@ -201,7 +201,7 @@ glabel modelasm00018680 c.eq.s $f1, $f0 bc1t .L00018874 nop - or $t0, $sp, $zero + move $t0, $sp addiu $t0, $t0, 0x3c0 lw $t1, 0x8($a1) lhu $t1, 0xe($t1) @@ -212,7 +212,7 @@ glabel modelasm00018680 addiu $t0, $t0, 0x8 lui $at, 0x4580 mtc1 $at, $f2 - or $t0, $sp, $zero + move $t0, $sp mul.s $f0, $f0, $f2 addi $t1, $zero, 0x0 trunc.w.s $f0, $f0 @@ -255,7 +255,7 @@ glabel modelasm00018680 c.eq.s $f0, $f1 bc1t .L000189cc swc1 $f0, 0x7e0($sp) - or $t0, $sp, $zero + move $t0, $sp addiu $t0, $t0, 0x3c0 addi $t1, $zero, 0x0 lui $t4, %hi(g_AnimToHeaderSlot) @@ -298,7 +298,7 @@ glabel modelasm00018680 nop lui $at, 0x4580 mtc1 $at, $f2 - or $t0, $sp, $zero + move $t0, $sp addiu $t0, $t0, 0x3c0 mul.s $f0, $f0, $f2 addi $t1, $zero, 0x0 @@ -340,7 +340,7 @@ glabel modelasm00018680 lw $a3, 0x8($a1) lw $gp, 0x0($a3) lw $s6, 0x4($a3) - or $s7, $sp, $zero + move $s7, $sp beqz $gp, .L000195c8 addiu $v0, $v0, 0x1 .L000189e4: @@ -446,15 +446,15 @@ glabel modelasm00018680 mov.s $f17, $f1 mov.s $f18, $f2 mov.s $f19, $f3 - or $t2, $s2, $zero - or $t3, $s3, $zero + move $t2, $s2 + move $t3, $s3 jal modelasmPrepareRotMtx360 - or $t4, $s4, $zero + move $t4, $s4 jal modelasmMathPain2 nop jal modelasmMathPain1 lwc1 $f30, 0x7e0($sp) - addiu $t0, $zero, 0x1 + li $t0, 0x1 sw $t0, 0x7e4($sp) lw $t0, 0x7e8($sp) swc1 $f0, 0x7e8($sp) @@ -807,7 +807,7 @@ glabel modelasm00018680 c.le.s $f0, $f3 bc1f .L000190b0 lw $t1, 0x8($t1) - addiu $t0, $zero, 0x1 + li $t0, 0x1 sw $t0, 0x0($v0) j .L00019574 sw $t1, 0x14($gp) @@ -899,10 +899,10 @@ glabel modelasm00018680 mov.s $f17, $f1 mov.s $f18, $f2 mov.s $f19, $f3 - or $t2, $s2, $zero - or $t3, $s3, $zero + move $t2, $s2 + move $t3, $s3 jal modelasmPrepareRotMtx360 - or $t4, $s4, $zero + move $t4, $s4 jal modelasmMathPain2 nop jal modelasmMathPain1 @@ -1160,14 +1160,14 @@ glabel modelasm00018680 nop lhu $t0, 0x0($gp) andi $t0, $t0, 0xff - addiu $at, $zero, 0x17 + li $at, 0x17 bne $t0, $at, .L00019588 nop sw $t0, 0x7f8($sp) bnez $gp, .L00019588 nop .L000195c8: - addiu $v0, $zero, 0x1 + li $v0, 0x1 .L000195cc: lw $s0, 0x780($sp) lw $s1, 0x784($sp) @@ -1229,7 +1229,7 @@ glabel modelasmIterateThings1 sll $t8, $t8, 0x3 sub $v0, $v0, $t8 lbu $s8, 0x0($t6) - addiu $gp, $zero, 0x8 + li $gp, 0x8 addiu $t6, $t6, 0x1 sub $gp, $gp, $v0 j .L00019808 @@ -1242,17 +1242,17 @@ glabel modelasmIterateThings1 lbu $v1, 0x2($t2) add $s0, $zero, $v0 lbu $v1, 0x2($t2) - addiu $s3, $zero, 0x10 + li $s3, 0x10 slt $at, $v1, $s3 beqz $at, .L00019718 - addiu $s3, $zero, 0x1 + li $s3, 0x1 addiu $v0, $v1, -1 sllv $s3, $s3, $v0 and $s4, $s0, $s3 beqz $s4, .L00019718 - addiu $s4, $zero, 0x10 + li $s4, 0x10 sub $s4, $s4, $v1 - addiu $v0, $zero, 0x1 + li $v0, 0x1 sllv $v0, $v0, $s4 addiu $v0, $v0, -1 sllv $v0, $v0, $v1 @@ -1268,17 +1268,17 @@ glabel modelasmIterateThings1 lbu $v1, 0x5($t2) add $s1, $zero, $v0 lbu $v1, 0x5($t2) - addiu $s3, $zero, 0x10 + li $s3, 0x10 slt $at, $v1, $s3 beqz $at, .L0001977c - addiu $s3, $zero, 0x1 + li $s3, 0x1 addiu $v0, $v1, -1 sllv $s3, $s3, $v0 and $s4, $s1, $s3 beqz $s4, .L0001977c - addiu $s4, $zero, 0x10 + li $s4, 0x10 sub $s4, $s4, $v1 - addiu $v0, $zero, 0x1 + li $v0, 0x1 sllv $v0, $v0, $s4 addiu $v0, $v0, -1 sllv $v0, $v0, $v1 @@ -1294,17 +1294,17 @@ glabel modelasmIterateThings1 lbu $v1, 0x8($t2) add $s2, $zero, $v0 lbu $v1, 0x8($t2) - addiu $s3, $zero, 0x10 + li $s3, 0x10 slt $at, $v1, $s3 beqz $at, .L000197e0 - addiu $s3, $zero, 0x1 + li $s3, 0x1 addiu $v0, $v1, -1 sllv $s3, $s3, $v0 and $s4, $s2, $s3 beqz $s4, .L000197e0 - addiu $s4, $zero, 0x10 + li $s4, 0x10 sub $s4, $s4, $v1 - addiu $v0, $zero, 0x1 + li $v0, 0x1 sllv $v0, $v0, $s4 addiu $v0, $v0, -1 sllv $v0, $v0, $v1 @@ -1335,7 +1335,7 @@ glabel modelasmIterateThings1 sll $v1, $v1, 0x8 lbu $v0, 0x1($t2) addu $v1, $v1, $v0 - addiu $v0, $zero, 0x10 + li $v0, 0x10 addu $s0, $s0, $v1 sub $v0, $v0, $t4 sllv $s0, $s0, $v0 @@ -1347,7 +1347,7 @@ glabel modelasmIterateThings1 sll $v1, $v1, 0x8 lbu $v0, 0x4($t2) addu $v1, $v1, $v0 - addiu $v0, $zero, 0x10 + li $v0, 0x10 addu $s1, $s1, $v1 sub $v0, $v0, $t4 sllv $s1, $s1, $v0 @@ -1359,7 +1359,7 @@ glabel modelasmIterateThings1 sll $v1, $v1, 0x8 lbu $v0, 0x7($t2) addu $v1, $v1, $v0 - addiu $v0, $zero, 0x10 + li $v0, 0x10 addu $s2, $s2, $v1 sub $v0, $v0, $t4 sllv $s2, $s2, $v0 @@ -1409,7 +1409,7 @@ glabel modelasmIterateThings2 sll $t8, $t8, 0x3 sub $v0, $v0, $t8 lbu $s8, 0x0($t6) - addiu $gp, $zero, 0x8 + li $gp, 0x8 addiu $t6, $t6, 0x1 sub $gp, $gp, $v0 j .L000199b8 @@ -1432,7 +1432,7 @@ glabel modelasmIterateThings2 sll $t8, $t8, 0x3 sub $v0, $v0, $t8 lbu $s8, 0x0($t6) - addiu $gp, $zero, 0x8 + li $gp, 0x8 addiu $t6, $t6, 0x1 sub $gp, $gp, $v0 .L000199b4: @@ -1452,7 +1452,7 @@ glabel modelasmIterateThings2 sll $v1, $v1, 0x8 lbu $v0, 0x1($t2) addu $v1, $v1, $v0 - addiu $v0, $zero, 0x10 + li $v0, 0x10 addu $s0, $s0, $v1 sub $v0, $v0, $t4 sllv $s0, $s0, $v0 @@ -1464,7 +1464,7 @@ glabel modelasmIterateThings2 sll $v1, $v1, 0x8 lbu $v0, 0x4($t2) addu $v1, $v1, $v0 - addiu $v0, $zero, 0x10 + li $v0, 0x10 addu $s1, $s1, $v1 sub $v0, $v0, $t4 sllv $s1, $s1, $v0 @@ -1476,7 +1476,7 @@ glabel modelasmIterateThings2 sll $v1, $v1, 0x8 lbu $v0, 0x7($t2) addu $v1, $v1, $v0 - addiu $v0, $zero, 0x10 + li $v0, 0x10 addu $s2, $s2, $v1 sub $v0, $v0, $t4 sllv $s2, $s2, $v0 @@ -1606,7 +1606,7 @@ glabel modelasmReadFrameData slti $at, $s6, 0x4 bnez $at, .L00019c24 nop - addiu $s6, $zero, 0x4 + li $s6, 0x4 .L00019c24: andi $s8, $t6, 0x3 addiu $s8, $s8, -4 @@ -1616,7 +1616,7 @@ glabel modelasmReadFrameData slt $at, $s8, $s6 beqz $at, .L00019c48 nop - or $s6, $s8, $zero + move $s6, $s8 .L00019c48: lui $s8, %hi(var8005ef7c) addiu $s8, $s8, %lo(var8005ef7c) @@ -1627,13 +1627,13 @@ glabel modelasmReadFrameData lbu $s8, 0x0($t6) addiu $t6, $t6, 0x1 j .L00019be8 - addiu $gp, $zero, 0x8 + li $gp, 0x8 sll $s8, $s8, 0x8 lbu $s6, 0x1($t6) or $s8, $s8, $s6 addiu $t6, $t6, 0x2 j .L00019be8 - addiu $gp, $zero, 0x10 + li $gp, 0x10 sll $s8, $s8, 0x8 lbu $s6, 0x1($t6) or $s8, $s8, $s6 @@ -1642,7 +1642,7 @@ glabel modelasmReadFrameData or $s8, $s8, $s6 addiu $t6, $t6, 0x3 j .L00019be8 - addiu $gp, $zero, 0x18 + li $gp, 0x18 andi $s6, $t6, 0x3 beqz $s6, .L00019ce4 sll $s8, $s8, 0x8 @@ -1656,12 +1656,12 @@ glabel modelasmReadFrameData or $s8, $s8, $s6 addiu $t6, $t6, 0x4 j .L00019be8 - addiu $gp, $zero, 0x20 + li $gp, 0x20 .L00019ce4: lw $s8, 0x0($t6) addiu $t6, $t6, 0x4 j .L00019be8 - addiu $gp, $zero, 0x20 + li $gp, 0x20 .L00019cf4: beqz $v1, .L00019d14 sub $gp, $gp, $v1 @@ -1695,7 +1695,7 @@ glabel modelasmGetNodeRwData lw $t3, 0x10($a1) add $t2, $t2, $t1 lbu $t2, 0x0($t2) - addiu $at, $zero, 0xff + li $at, 0xff beq $t2, $at, .L00019d78 add $t2, $t4, $t2 lhu $t0, 0x0($t2) @@ -1706,10 +1706,10 @@ glabel modelasmGetNodeRwData .L00019d84: lw $t1, 0x8($gp) beqz $t1, .L00019db0 - or $gp, $t1, $zero + move $gp, $t1 lhu $t1, 0x0($gp) andi $t1, $t1, 0xff - addiu $at, $zero, 0x17 + li $at, 0x17 bne $t1, $at, .L00019d84 nop jal modelasmGetNodeRwData @@ -1750,7 +1750,7 @@ glabel modelGetNodeRwData lw $t3, 0x10($a0) add $t2, $t2, $t1 lbu $t2, 0x0($t2) - addiu $at, $zero, 0xff + li $at, 0xff beq $t2, $at, .NB0001aefc add $t2, $t4, $t2 lhu $t0, 0x0($t2) @@ -1761,10 +1761,10 @@ glabel modelGetNodeRwData .NB0001af08: lw $t1, 0x8($a1) beqz $t1, .NB0001af34 - or $a1, $t1, $zero + move $a1, $t1 lhu $t1, 0x0($a1) andi $t1, $t1, 0xff - addiu $at, $zero, 0x17 + li $at, 0x17 bne $t1, $at, .NB0001af08 sll $zero, $zero, 0x0 jal modelGetNodeRwData @@ -2048,7 +2048,7 @@ glabel modelasmMathPain4 sub.s $f20, $f20, $f26 glabel modelasmMtxMultiply - addiu $t2, $zero, 0x3 + li $t2, 0x3 .L0001a1c4: lwc1 $f0, 0x0($t0) addiu $t0, $t0, 0x4 @@ -2093,9 +2093,9 @@ glabel modelasmFindNodeMtx .L0001a25c: lh $t1, 0x0($t0) andi $t1, $t1, 0xff - addiu $t2, $zero, 0x1 + li $t2, 0x1 bne $t1, $t2, .L0001a288 - addiu $t2, $zero, 0x2 + li $t2, 0x2 lw $t2, 0x4($t0) lhu $t2, 0x2($t2) sll $t2, $t2, 0x6 @@ -2104,7 +2104,7 @@ glabel modelasmFindNodeMtx add $t0, $t1, $t2 .L0001a288: bne $t1, $t2, .L0001a2a8 - addiu $t2, $zero, 0x15 + li $t2, 0x15 lw $t2, 0x4($t0) lhu $t2, 0xe($t2) sll $t2, $t2, 0x6 @@ -2138,12 +2138,12 @@ glabel modelasmAcosOrAsin bnez $at, .L0001a308 nop b .L0001a318 - addiu $t2, $zero, 0x7fff + li $t2, 0x7fff .L0001a308: slti $at, $t2, -32767 beqz $at, .L0001a318 nop - addiu $t2, $zero, -32767 + li $t2, -32767 .L0001a318: bgez $t2, .L0001a324 add $t3, $zero, $t2 @@ -2155,9 +2155,9 @@ glabel modelasmAcosOrAsin lui $t4, %hi(var8006ae90+252) addiu $t4, $t4, %lo(var8006ae90+252) addi $t3, $t3, -32736 - addiu $t5, $zero, 0x3 + li $t5, 0x3 b .L0001a37c - addiu $t6, $zero, 0x7 + li $t6, 0x7 .L0001a348: slti $at, $t3, 0x7800 bnez $at, .L0001a36c @@ -2165,14 +2165,14 @@ glabel modelasmAcosOrAsin lui $t4, %hi(var8006ae90+124) addiu $t4, $t4, %lo(var8006ae90+124) addi $t3, $t3, -30720 - addiu $t5, $zero, 0x5 + li $t5, 0x5 b .L0001a37c - addiu $t6, $zero, 0x1f + li $t6, 0x1f .L0001a36c: lui $t4, %hi(var8006ae90) addiu $t4, $t4, %lo(var8006ae90) - addiu $t5, $zero, 0x9 - addiu $t6, $zero, 0x1ff + li $t5, 0x9 + li $t6, 0x1ff .L0001a37c: srav $s0, $t3, $t5 sll $s0, $s0, 0x1 diff --git a/src/lib/mp3/lib_46650.s b/src/lib/mp3/lib_46650.s index cfeffdb9c..544a2525d 100644 --- a/src/lib/mp3/lib_46650.s +++ b/src/lib/mp3/lib_46650.s @@ -198,7 +198,7 @@ glabel var70059df4 */ glabel func00046650 addiu $sp, $sp, -0x90 - or $t0, $sp, $zero + move $t0, $sp addiu $t1, $t0, 0x48 lwc1 $f4, 0x3c($a0) lwc1 $f6, 0x40($a0) @@ -782,10 +782,10 @@ glabel func00046650 nop swc1 $f6, 0x10($t1) swc1 $f4, 0x34($t1) - or $t0, $t1, $zero + move $t0, $t1 lw $t1, 0xa0($sp) - or $t2, $a2, $zero - or $t3, $a3, $zero + move $t2, $a2 + move $t3, $a3 andi $a1, $a1, 0x1 beqz $a1, .L000471b8 nop diff --git a/src/lib/mp3/lib_47550.s b/src/lib/mp3/lib_47550.s index c3e7b1c74..3e10a4374 100644 --- a/src/lib/mp3/lib_47550.s +++ b/src/lib/mp3/lib_47550.s @@ -7,7 +7,7 @@ glabel func00047550 addiu $sp, $sp, -0xd0 - or $t0, $sp, $zero + move $t0, $sp addiu $t1, $t0, 0xd0 .L0004755c: sw $zero, 0x0($t0) @@ -17,11 +17,11 @@ glabel func00047550 addiu $t0, $t0, 0x10 bne $t0, $t1, .L0004755c nop - or $t2, $a0, $zero - or $t3, $sp, $zero + move $t2, $a0 + move $t3, $sp addiu $t4, $t3, 0x40 - or $t6, $t4, $zero - addiu $t5, $zero, 0x3 + move $t6, $t4 + li $t5, 0x3 .L0004758c: lwc1 $f4, 0x14($t2) lwc1 $f6, 0x10($t2) @@ -293,13 +293,13 @@ glabel func00047550 addi $t5, $t5, -1 bnez $t5, .L0004758c nop - or $t0, $a2, $zero - or $t1, $a3, $zero - or $t4, $t6, $zero + move $t0, $a2 + move $t1, $a3 + move $t4, $t6 andi $a1, $a1, 0x1 beqz $a1, .L00047a24 nop - addiu $t5, $zero, 0x9 + li $t5, 0x9 .L000479e0: lwc1 $f4, 0x0($t4) lwc1 $f6, 0x0($t1) @@ -319,7 +319,7 @@ glabel func00047550 b .L00047a50 nop .L00047a24: - addiu $t5, $zero, 0x12 + li $t5, 0x12 .L00047a28: lwc1 $f4, 0x0($t4) lwc1 $f6, 0x0($t1) @@ -332,9 +332,9 @@ glabel func00047550 bnez $t5, .L00047a28 nop .L00047a50: - or $t1, $a3, $zero + move $t1, $a3 addi $t4, $t6, 0x48 - addiu $t5, $zero, 0x12 + li $t5, 0x12 .L00047a5c: lwc1 $f4, 0x0($t4) swc1 $f4, 0x0($t1) diff --git a/src/lib/mp3/util.s b/src/lib/mp3/util.s index eebaaf773..e7ecff7d4 100644 --- a/src/lib/mp3/util.s +++ b/src/lib/mp3/util.s @@ -6,7 +6,7 @@ glabel mp3util000461c0 andi $t4, $t0, 0x7 - addiu $t3, $zero, 0x8 + li $t3, 0x8 lbu $t5, 0x0($a0) lbu $t2, 0x1($a0) sll $t1, $t5, 0x8 @@ -38,9 +38,9 @@ glabel mp3util000461c0 .L00046238: add $t7, $zero, $s0 andi $t1, $t0, 0x7 - addiu $t2, $zero, 0x80 + li $t2, 0x80 srlv $t2, $t2, $t1 - addiu $t6, $zero, -1 + li $t6, -1 .L0004624c: and $t4, $t5, $t2 beqzl $t4, .L0004625c @@ -51,7 +51,7 @@ glabel mp3util000461c0 sll $t4, $t4, 0x2 bnez $t2, .L00046278 add $t7, $t7, $t4 - addiu $t2, $zero, 0x80 + li $t2, 0x80 addi $a0, $a0, 0x1 lbu $t5, 0x0($a0) .L00046278: @@ -71,7 +71,7 @@ glabel mp3util00046290 add $a0, $a0, $t2 andi $t2, $t0, 0x7 sllv $t1, $t1, $t2 - addiu $t2, $zero, 0x20 + li $t2, 0x20 sub $t2, $t2, $s1 srlv $v0, $t1, $t2 jr $ra @@ -85,7 +85,7 @@ glabel mp3utilGetBits lwr $t1, 0x3($a0) andi $t2, $t0, 0x7 sllv $t1, $t1, $t2 - addiu $t2, $zero, 0x20 + li $t2, 0x20 sub $t2, $t2, $a2 srlv $v0, $t1, $t2 add $t0, $t0, $a2 @@ -128,7 +128,7 @@ glabel mp3util000462f8 nop beqz $s1, .L00046398 add $s6, $zero, $t1 - addiu $t2, $zero, 0xf + li $t2, 0xf bne $v0, $t2, .L00046398 nop jal mp3util00046290 @@ -138,7 +138,7 @@ glabel mp3util000462f8 beqzl $v0, .L000463d8 sb $zero, 0x0($s4) lb $t1, 0x0($a0) - addiu $t3, $zero, 0x7 + li $t3, 0x7 andi $t2, $t0, 0x7 addi $t4, $t2, 0x1 srl $t4, $t4, 0x3 @@ -147,14 +147,14 @@ glabel mp3util000462f8 srlv $t1, $t1, $t2 andi $t1, $t1, 0x1 addi $t0, $t0, 0x1 - addiu $t2, $zero, 0x1 + li $t2, 0x1 beqzl $t1, .L000463d8 sb $zero, 0x0($s4) sb $t2, 0x0($s4) .L000463d8: beqz $s1, .L000463fc add $s7, $zero, $v0 - addiu $t2, $zero, 0xf + li $t2, 0xf bne $s6, $t2, .L000463fc nop jal mp3util00046290 @@ -168,7 +168,7 @@ glabel mp3util000462f8 beqzl $s6, .L00046448 sb $zero, 0x1($s4) lb $t1, 0x0($a0) - addiu $t3, $zero, 0x7 + li $t3, 0x7 andi $t2, $t0, 0x7 addi $t4, $t2, 0x1 srl $t4, $t4, 0x3 @@ -177,7 +177,7 @@ glabel mp3util000462f8 srlv $t1, $t1, $t2 andi $t1, $t1, 0x1 addi $t0, $t0, 0x1 - addiu $t2, $zero, 0x1 + li $t2, 0x1 beqzl $t1, .L00046448 sb $zero, 0x1($s4) sb $t2, 0x1($s4) @@ -256,8 +256,8 @@ glabel mp3util000464a8 sh $t5, 0x4($s3) sh $t6, 0x6($s3) jal mp3util00046290 - addiu $s1, $zero, 0x4 - addiu $s1, $zero, 0x3 + li $s1, 0x4 + li $s1, 0x3 sb $v0, 0x0($s4) beqz $t3, .L0004657c srlv $t1, $v0, $s1 diff --git a/src/lib/mtxasm.s b/src/lib/mtxasm.s index 1e10d9ccb..81cbb4611 100644 --- a/src/lib/mtxasm.s +++ b/src/lib/mtxasm.s @@ -41,7 +41,7 @@ glabel mtx4MultMtx4 mfc1 $t3, $f22 mfc1 $t4, $f23 mfc1 $t5, $f24 - addiu $t0, $zero, 0x4 + li $t0, 0x4 lwc1 $f0, 0x0($a1) lwc1 $f1, 0x4($a1) lwc1 $f2, 0x8($a1) @@ -113,7 +113,7 @@ glabel mtx4RotateVec lwc1 $f0, 0x0($a1) lwc1 $f1, 0x4($a1) lwc1 $f2, 0x8($a1) - addiu $t0, $zero, 0x3 + li $t0, 0x3 lwc1 $f3, 0x0($a0) .L00015b28: lwc1 $f4, 0x10($a0) @@ -139,7 +139,7 @@ glabel mtx4TransformVec lwc1 $f0, 0x0($a1) lwc1 $f1, 0x4($a1) lwc1 $f2, 0x8($a1) - addiu $t0, $zero, 0x3 + li $t0, 0x3 lwc1 $f3, 0x0($a0) .L00015b7c: lwc1 $f4, 0x10($a0) @@ -188,7 +188,7 @@ glabel mtx00015be4 lwc1 $f9, 0x30($a1) lwc1 $f10, 0x34($a1) lwc1 $f11, 0x38($a1) - addiu $t0, $zero, 0x3 + li $t0, 0x3 .L00015c28: lwc1 $f12, 0x0($a0) addiu $a0, $a0, 0x4 @@ -236,7 +236,7 @@ glabel mtx00015be4 mtc1 $t4, $f23 glabel mtx3Copy - addiu $t0, $zero, 0x2 + li $t0, 0x2 .L00015cdc: lw $t1, 0x0($a0) lw $t2, 0x4($a0) @@ -255,7 +255,7 @@ glabel mtx3Copy sw $t0, 0x0($a1) glabel mtx4Copy - addiu $t0, $zero, 0x4 + li $t0, 0x4 .L00015d1c: lw $t1, 0x0($a0) lw $t2, 0x4($a0) @@ -273,7 +273,7 @@ glabel mtx4Copy nop glabel mtx3ToMtx4 - addiu $t0, $zero, 0x3 + li $t0, 0x3 lui $at, 0x3f80 mtc1 $at, $f4 .L00015d60: @@ -295,7 +295,7 @@ glabel mtx3ToMtx4 swc1 $f4, 0xc($a1) glabel mtx4ToMtx3 - addiu $t0, $zero, 0x3 + li $t0, 0x3 .L00015da4: lw $t1, 0x0($a0) lw $t2, 0x4($a0) @@ -401,7 +401,7 @@ glabel mtx00015edc swc1 $f10, 0x28($a1) glabel mtx00015f04 - addiu $t0, $zero, 0x3 + li $t0, 0x3 .L00015f08: lwc1 $f4, 0x0($a1) lwc1 $f6, 0x4($a1) @@ -422,7 +422,7 @@ glabel mtx00015f04 nop glabel mtx00015f4c - addiu $t0, $zero, 0x3 + li $t0, 0x3 .L00015f50: lwc1 $f4, 0x0($a1) lwc1 $f6, 0x4($a1) @@ -440,7 +440,7 @@ glabel mtx00015f4c nop glabel mtx00015f88 - addiu $t0, $zero, 0x3 + li $t0, 0x3 .L00015f8c: lwc1 $f4, 0x0($a1) lwc1 $f6, 0x10($a1) @@ -469,7 +469,7 @@ glabel mtxGetObfuscatedRomBase sw $ra, 0x14($sp) lui $a0, %hi(__osPiAccessQueue) addiu $a0, $a0, %lo(__osPiAccessQueue) - addiu $a1, $zero, 0 + li $a1, 0 jal osRecvMesg lui $a2, 1 lui $a0, 0xa45f @@ -492,7 +492,7 @@ glabel mtxGetObfuscatedRomBase sw $v0, 0x18($sp) lui $a0, %hi(__osPiAccessQueue) addiu $a0, $a0, %lo(__osPiAccessQueue) - addiu $a1, $zero, 0 + li $a1, 0 jal osSendMesg lui $a2, 0 lw $v0, 0x18($sp) @@ -503,7 +503,7 @@ glabel mtxGetObfuscatedRomBase glabel mtxF2L lui $t2, %hi(var8005ef10) addiu $t2, $t2, %lo(var8005ef10) - addiu $t0, $zero, 0x4 + li $t0, 0x4 lui $t1, 0xffff lwc1 $f0, 0x0($t2) lwc1 $f2, 0x4($t2) diff --git a/src/lib/tlb.s b/src/lib/tlb.s index 25467e8bc..5de96e649 100644 --- a/src/lib/tlb.s +++ b/src/lib/tlb.s @@ -57,12 +57,12 @@ glabel tlbInit mtc0 $t0, C0_PAGEMASK lui $t0, 0x7000 mtc0 $t0, C0_ENTRYHI - addiu $t0, $zero, 0x1f + li $t0, 0x1f mtc0 $t0, C0_ENTRYLO0 lui $t0, 0x1 ori $t0, $t0, 0x1f mtc0 $t0, C0_ENTRYLO1 - addiu $t0, $zero, 0 + li $t0, 0 mtc0 $t0, C0_INX nop tlbwi @@ -78,15 +78,15 @@ glabel tlb000010a4 addiu $sp, $sp, -8 sw $ra, 0x0($sp) mtc0 $zero, C0_CONTEXT - addiu $t0, $zero, 0x2 + li $t0, 0x2 mtc0 $t0, C0_WIRED - addiu $t1, $zero, 0x1ff + li $t1, 0x1ff lui $at, %hi(var8008d264+0x2) sh $t1, %lo(var8008d264+0x2)($at) #if VERSION >= VERSION_NTSC_1_0 - addiu $a0, $zero, 268 + li $a0, 268 #else - addiu $a0, $zero, 266 + li $a0, 266 #endif lui $at, %hi(g_VmInitialised+0x2) sh $a0, %lo(g_VmInitialised+0x2)($at) @@ -107,7 +107,7 @@ glabel tlb000010a4 sw $v0, %lo(var8008d268)($at) lui $v0, %hi(var8008d238) addiu $v0, $v0, %lo(var8008d238) - addiu $a0, $zero, 0x21 + li $a0, 0x21 lui $at, %hi(var8008d25c) sw $v0, %lo(var8008d25c)($at) addu $v1, $v0, $a0 @@ -119,7 +119,7 @@ glabel tlb000010a4 nop glabel tlb0000113c - addiu $t0, $zero, 0xff + li $t0, 0xff lui $v0, %hi(var8008d25c) lw $v0, %lo(var8008d25c)($v0) lui $v1, %hi(var8008d260) @@ -129,13 +129,13 @@ glabel tlb0000113c bne $v0, $v1, .L00001150 addiu $v0, $v0, 1 #if VERSION >= VERSION_NTSC_1_0 - addiu $a0, $zero, 4 + li $a0, 4 #else - addiu $a0, $zero, 2 + li $a0, 2 #endif beqz $a0, .L00001178 addiu $a0, $a0, -1 - addiu $t0, $zero, 2 + li $t0, 2 sllv $t0, $t0, $a0 addiu $t0, $t0, -1 sb $t0, 0x0($v1) @@ -177,8 +177,8 @@ glabel tlbHandleMiss lw $s1, 0x8($s0) .L000011e0: bnezl $s1, .L000014c4 - addiu $t5, $zero, 0x1 - addiu $t5, $zero, 0x0 + li $t5, 0x1 + li $t5, 0x0 lui $t1, %hi(var8008d25c) lw $t1, %lo(var8008d25c)($t1) lui $t2, %hi(var8008d260) @@ -187,14 +187,14 @@ glabel tlbHandleMiss lbu $t0, 0x0($t1) beqz $t0, .L0000122c nop - addiu $t6, $zero, 0x0 - addiu $t7, $zero, 0x1 + li $t6, 0x0 + li $t7, 0x1 .L00001210: and $t8, $t0, $t7 bnez $t8, .L0000123c nop addiu $t6, $t6, 0x1 - addiu $at, $zero, 0x8 + li $at, 0x8 bne $t6, $at, .L00001210 sll $t7, $t7, 0x1 .L0000122c: @@ -233,7 +233,7 @@ glabel tlbHandleMiss lw $t2, 0x0($t0) lw $t0, 0x4($t0) subu $t0, $t0, $t2 - addiu $t1, $zero, -16 + li $t1, -16 addiu $t0, $t0, 0xf and $t6, $t0, $t1 lui $t0, 0xa460 @@ -290,7 +290,7 @@ glabel tlbHandleMiss addiu $t0, $t0, 16 bnez $s6, .L00001370 nop - addiu $t0, $zero, 0x2 + li $t0, 0x2 lui $at, 0xa460 sw $t0, 0x10($at) .L00001370: @@ -381,7 +381,7 @@ glabel tlbHandleMiss bnez $at, .L000014b4 addiu $t0, $t0, 0x10 .L000014c4: - addiu $t0, $zero, OS_PM_4K + li $t0, OS_PM_4K mtc0 $t0, C0_PAGEMASK mtc0 $s5, C0_ENTRYHI nop @@ -416,7 +416,7 @@ glabel tlbHandleMiss .L00001538: bnez $t5, .L00001568 nop - or $t0, $s5, $zero + move $t0, $s5 bnezl $t9, .L0000154c addiu $t0, $t0, 0x1000 .L0000154c: @@ -464,16 +464,16 @@ glabel tlbHandleMiss bne $t1, $gp, .L000015ac nop j .L000015ac - or $t1, $s4, $zero + move $t1, $s4 .L000015cc: subu $t0, $t1, $s4 srl $t0, $t0, 0x3 sll $t0, $t0, 0xc addu $t0, $t0, $s8 - addiu $t2, $zero, -4096 + li $t2, -4096 and $t0, $t0, $t2 mtc0 $t0, C0_ENTRYHI - addiu $t0, $zero, 0x0 + li $t0, 0x0 mtc0 $t0, C0_PAGEMASK nop nop diff --git a/src/lib/ultra/libc/bcmp.s b/src/lib/ultra/libc/bcmp.s index a2e026659..95e31fed2 100644 --- a/src/lib/ultra/libc/bcmp.s +++ b/src/lib/ultra/libc/bcmp.s @@ -14,14 +14,14 @@ glabel bcmp andi $t8, $t8, 0x3 beqz $t8, .L0004e0cc subu $a2, $a2, $t8 - or $v0, $v1, $zero + move $v0, $v1 lwl $v0, 0x0($a0) lwl $v1, 0x0($a1) addu $a0, $a0, $t8 addu $a1, $a1, $t8 bne $v0, $v1, .L0004e1a4 .L0004e0cc: - addiu $at, $zero, -4 + li $at, -4 and $a3, $a2, $at beqz $a3, .L0004e174 subu $a2, $a2, $a3 @@ -53,7 +53,7 @@ glabel bcmp bnel $a0, $a3, .L0004e120 lbu $v0, 0x0($a0) .L0004e13c: - addiu $at, $zero, -4 + li $at, -4 and $a3, $a2, $at beqz $a3, .L0004e174 subu $a2, $a2, $a3 @@ -85,4 +85,4 @@ glabel bcmp or $v0, $zero, $zero .L0004e1a4: jr $ra - addiu $v0, $zero, 0x1 + li $v0, 0x1 diff --git a/src/lib/ultra/libc/bcopy.s b/src/lib/ultra/libc/bcopy.s index a16d4c5cb..0976d90db 100644 --- a/src/lib/ultra/libc/bcopy.s +++ b/src/lib/ultra/libc/bcopy.s @@ -40,9 +40,9 @@ glabel bcopy move $v0, $a3 .L0004b1e4: beqz $v0, .L0004b248 - addiu $at, $zero, 0x1 + li $at, 0x1 beq $v0, $at, .L0004b22c - addiu $at, $zero, 0x2 + li $at, 0x2 beql $v0, $at, .L0004b218 lh $v0, 0x0($a0) lb $v0, 0x0($a0) @@ -143,9 +143,9 @@ glabel bcopy move $v0, $a3 .L0004b354: beqz $v0, .L0004b3b8 - addiu $at, $zero, 0x3 + li $at, 0x3 beq $v0, $at, .L0004b39c - addiu $at, $zero, 0x2 + li $at, 0x2 beql $v0, $at, .L0004b388 lh $v0, -0x2($a0) lb $v0, -0x1($a0) diff --git a/src/lib/ultra/libc/bzero.s b/src/lib/ultra/libc/bzero.s index 3dbd83271..9c2cc9e63 100644 --- a/src/lib/ultra/libc/bzero.s +++ b/src/lib/ultra/libc/bzero.s @@ -14,7 +14,7 @@ glabel bzero swl $zero, 0x0($a0) addu $a0, $a0, $v1 .L0004b0e0: - addiu $at, $zero, -32 + li $at, -32 and $a3, $a1, $at beqz $a3, .L0004b11c subu $a1, $a1, $a3 @@ -31,7 +31,7 @@ glabel bzero bne $a0, $a3, .L0004b0f4 sw $zero, -0x4($a0) .L0004b11c: - addiu $at, $zero, -4 + li $at, -4 and $a3, $a1, $at beqz $a3, .L0004b13c subu $a1, $a1, $a3 diff --git a/src/lib/ultra/os/exceptasm.s b/src/lib/ultra/os/exceptasm.s index 011f47993..1396402bc 100644 --- a/src/lib/ultra/os/exceptasm.s +++ b/src/lib/ultra/os/exceptasm.s @@ -79,7 +79,7 @@ glabel __osException sd $at, 0x20($k0) mfc0 $k1, C0_SR sw $k1, 0x118($k0) - addiu $at, $zero, -4 + li $at, -4 and $k1, $k1, $at mtc0 $k1, C0_SR sd $t0, 0x58($k0) @@ -135,7 +135,7 @@ glabel __osException lui $t0, %hi(__osGlobalIntMask) addiu $t0, $t0, %lo(__osGlobalIntMask) lw $t0, 0x0($t0) - addiu $at, $zero, -1 + li $at, -1 xor $t2, $t0, $at lui $at, 0xffff andi $t2, $t2, 0xff00 @@ -157,7 +157,7 @@ glabel __osException addiu $t0, $t0, %lo(__osGlobalIntMask) lw $t0, 0x0($t0) lw $t4, 0x128($k0) - addiu $at, $zero, -1 + li $at, -1 srl $t0, $t0, 0x10 xor $t0, $t0, $at andi $t0, $t0, 0x3f @@ -208,22 +208,22 @@ glabel __osException .L00003704: mfc0 $t0, C0_CAUSE sw $t0, 0x120($k0) - addiu $t1, $zero, 0x2 + li $t1, 0x2 sh $t1, 0x10($k0) andi $t1, $t0, 0x7c - addiu $t2, $zero, 0x8 + li $t2, 0x8 beq $t1, $t2, .L000039e8 nop - addiu $t2, $zero, 0xc + li $t2, 0xc beq $t1, $t2, .L000039f8 nop - addiu $t2, $zero, 0x24 + li $t2, 0x24 beql $t1, $t2, .L00003a04 - addiu $t1, $zero, 0x1 - addiu $t2, $zero, 0x2c + li $t1, 0x1 + li $t2, 0x2c beq $t1, $t2, .L00003b6c nop - addiu $t2, $zero, 0x0 + li $t2, 0x0 bne $t1, $t2, L00003a88 nop and $s0, $k1, $t0 @@ -245,18 +245,18 @@ glabel __osException jr $t2 nop .L00003790: - addiu $at, $zero, -8193 + li $at, -8193 b .L00003758 and $s0, $s0, $at .L0000379c: - addiu $at, $zero, -16385 + li $at, -16385 b .L00003758 and $s0, $s0, $at .L000037a8: mfc0 $t1, C0_COMPARE mtc0 $t1, C0_COMPARE jal send_mesg - addiu $a0, $zero, 0x18 + li $a0, 0x18 lui $at, 0xffff ori $at, $at, 0x7fff b .L00003758 @@ -265,7 +265,7 @@ glabel __osException lui $t1, %hi(__osHwIntTable) addiu $t1, $t1, %lo(__osHwIntTable) lw $t2, 0x8($t1) - addiu $at, $zero, -2049 + li $at, -2049 and $s0, $s0, $at beqz $t2, .L000037fc addi $t1, $t1, 0x8 @@ -277,7 +277,7 @@ glabel __osException nop .L000037fc: jal send_mesg - addiu $a0, $zero, 0x10 + li $a0, 0x10 b .L0000375c andi $t1, $s0, 0xff00 .L0000380c: @@ -300,16 +300,16 @@ glabel __osException beqz $t4, .L0000386c sw $t1, 0x10($at) jal send_mesg - addiu $a0, $zero, 0x20 + li $a0, 0x20 beqzl $s1, .L00003944 - addiu $at, $zero, -1025 + li $at, -1025 b .L00003880 andi $t1, $s1, 0x8 .L0000386c: jal send_mesg - addiu $a0, $zero, 0x58 + li $a0, 0x58 beqzl $s1, .L00003944 - addiu $at, $zero, -1025 + li $at, -1025 andi $t1, $s1, 0x8 .L00003880: beqz $t1, .L000038a0 @@ -317,21 +317,21 @@ glabel __osException andi $s1, $s1, 0x37 sw $zero, 0x10($at) jal send_mesg - addiu $a0, $zero, 0x38 + li $a0, 0x38 beqzl $s1, .L00003944 - addiu $at, $zero, -1025 + li $at, -1025 .L000038a0: andi $t1, $s1, 0x4 beqzl $t1, .L000038d0 andi $t1, $s1, 0x2 - addiu $t1, $zero, 0x1 + li $t1, 0x1 lui $at, 0xa450 andi $s1, $s1, 0x3b sw $t1, 0xc($at) jal send_mesg - addiu $a0, $zero, 0x30 + li $a0, 0x30 beqzl $s1, .L00003944 - addiu $at, $zero, -1025 + li $at, -1025 andi $t1, $s1, 0x2 .L000038d0: beqz $t1, .L000038f0 @@ -339,76 +339,76 @@ glabel __osException andi $s1, $s1, 0x3d sw $zero, 0x18($at) jal send_mesg - addiu $a0, $zero, 0x28 + li $a0, 0x28 beqzl $s1, .L00003944 - addiu $at, $zero, -1025 + li $at, -1025 .L000038f0: andi $t1, $s1, 0x10 beqzl $t1, .L00003920 andi $t1, $s1, 0x20 - addiu $t1, $zero, 0x2 + li $t1, 0x2 lui $at, 0xa460 andi $s1, $s1, 0x2f sw $t1, 0x10($at) jal send_mesg - addiu $a0, $zero, 0x40 + li $a0, 0x40 beqzl $s1, .L00003944 - addiu $at, $zero, -1025 + li $at, -1025 andi $t1, $s1, 0x20 .L00003920: beqzl $t1, .L00003944 - addiu $at, $zero, -1025 - addiu $t1, $zero, 0x800 + li $at, -1025 + li $t1, 0x800 lui $at, 0xa430 andi $s1, $s1, 0x1f sw $t1, 0x0($at) jal send_mesg - addiu $a0, $zero, 0x48 - addiu $at, $zero, -1025 + li $a0, 0x48 + li $at, -1025 .L00003944: b .L00003758 and $s0, $s0, $at .L0000394c: lw $k1, 0x118($k0) - addiu $at, $zero, -4097 + li $at, -4097 lui $t1, %hi(_osShutdown) and $k1, $k1, $at sw $k1, 0x118($k0) addiu $t1, $t1, %lo(_osShutdown) lw $t2, 0x0($t1) beqz $t2, .L00003978 - addiu $at, $zero, -4097 + li $at, -4097 b .L00003a3c and $s0, $s0, $at .L00003978: - addiu $t2, $zero, 0x1 + li $t2, 0x1 sw $t2, 0x0($t1) jal send_mesg - addiu $a0, $zero, 0x70 + li $a0, 0x70 lui $t2, %hi(__osRunQueue) lw $t2, %lo(__osRunQueue)($t2) - addiu $at, $zero, -4097 + li $at, -4097 and $s0, $s0, $at lw $k1, 0x118($t2) and $k1, $k1, $at b .L00003a3c sw $k1, 0x118($t2) .L000039a8: - addiu $at, $zero, -513 + li $at, -513 and $t0, $t0, $at mtc0 $t0, C0_CAUSE jal send_mesg - addiu $a0, $zero, 0x8 - addiu $at, $zero, -513 + li $a0, 0x8 + li $at, -513 b .L00003758 and $s0, $s0, $at .L000039c8: - addiu $at, $zero, -257 + li $at, -257 and $t0, $t0, $at mtc0 $t0, C0_CAUSE jal send_mesg - addiu $a0, $zero, 0x0 - addiu $at, $zero, -257 + li $a0, 0x0 + li $at, -257 b .L00003758 and $s0, $s0, $at .L000039e8: @@ -419,20 +419,20 @@ glabel __osException .L000039f8: j L00003a88 nop - addiu $t1, $zero, 0x1 + li $t1, 0x1 .L00003a04: sh $t1, 0x12($k0) lw $t1, 0x11c($k0) - addiu $at, $zero, 0x6 + li $at, 0x6 lw $t1, 0x0($t1) srl $t1, $t1, 0x10 andi $t1, $t1, 0xff beq $t1, $at, L00003a88 - addiu $at, $zero, 0x7 + li $at, 0x7 beq $t1, $at, L00003a88 nop jal send_mesg - addiu $a0, $zero, 0x50 + li $a0, 0x50 b .L00003a3c nop .L00003a3c: @@ -460,14 +460,14 @@ glabel __osException glabel L00003a88 lui $at, %hi(__osFaultedThread) sw $k0, %lo(__osFaultedThread)($at) - addiu $t1, $zero, 0x1 + li $t1, 0x1 sh $t1, 0x10($k0) - addiu $t1, $zero, 0x2 + li $t1, 0x2 sh $t1, 0x12($k0) mfc0 $t2, C0_BADVADDR sw $t2, 0x124($k0) jal send_mesg - addiu $a0, $zero, 0x60 + li $a0, 0x60 j .L00003d10 nop @@ -491,7 +491,7 @@ glabel send_mesg nop break 0x7 .L00003b00: - addiu $at, $zero, -1 + li $at, -1 bne $t4, $at, .L00003b18 lui $at, 0x8000 bne $t5, $at, .L00003b18 @@ -524,12 +524,12 @@ glabel send_mesg lui $at, 0x3000 and $t1, $t0, $at srl $t1, $t1, 0x1c - addiu $t2, $zero, 0x1 + li $t2, 0x1 bne $t1, $t2, L00003a88 nop lw $k1, 0x118($k0) lui $at, 0x2000 - addiu $t1, $zero, 0x1 + li $t1, 0x1 or $k1, $k1, $at sw $t1, 0x18($k0) b .L00003a70 @@ -578,7 +578,7 @@ glabel __osEnqueueAndYield lui $t0, %hi(__osGlobalIntMask) addiu $t0, $t0, %lo(__osGlobalIntMask) lw $t0, 0x0($t0) - addiu $at, $zero, -1 + li $at, -1 xor $t0, $t0, $at lui $at, 0xffff andi $t0, $t0, 0xff00 @@ -596,7 +596,7 @@ glabel __osEnqueueAndYield addiu $k0, $k0, %lo(__osGlobalIntMask) lw $k0, 0x0($k0) lw $t0, 0x128($a1) - addiu $at, $zero, -1 + li $at, -1 srl $k0, $k0, 0x10 xor $k0, $k0, $at andi $k0, $k0, 0x3f @@ -646,7 +646,7 @@ glabel __osDispatchThread addiu $a0, $a0, %lo(__osRunQueue) lui $at, %hi(__osRunningThread) sw $v0, %lo(__osRunningThread)($at) - addiu $t0, $zero, 0x4 + li $t0, 0x4 sh $t0, 0x10($v0) move $k0, $v0 lui $t0, %hi(__osGlobalIntMask) diff --git a/src/lib/ultra/os/interrupt.s b/src/lib/ultra/os/interrupt.s index bf5448e2b..a7c74177b 100644 --- a/src/lib/ultra/os/interrupt.s +++ b/src/lib/ultra/os/interrupt.s @@ -11,7 +11,7 @@ glabel __osDisableInt lw $t3, 0x0($t2) andi $t3, $t3, 0xff00 mfc0 $t0, $12 - addiu $at, $zero, -2 + li $at, -2 and $t1, $t0, $at mtc0 $t1, $12 andi $v0, $t0, 0x1 @@ -27,7 +27,7 @@ glabel __osDisableInt ori $at, $at, 0xff and $t1, $t1, $at or $t1, $t1, $t2 - addiu $at, $zero, -2 + li $at, -2 and $t1, $t1, $at mtc0 $t1, $12 nop diff --git a/src/lib/ultra/os/invaldcache.s b/src/lib/ultra/os/invaldcache.s index 5e1ee023f..da850e659 100644 --- a/src/lib/ultra/os/invaldcache.s +++ b/src/lib/ultra/os/invaldcache.s @@ -7,7 +7,7 @@ glabel osInvalDCache blez $a1, .L0004e500 nop - addiu $t3, $zero, 0x2000 + li $t3, 0x2000 sltu $at, $a1, $t3 beqz $at, .L0004e508 nop diff --git a/src/lib/ultra/os/invalicache.s b/src/lib/ultra/os/invalicache.s index a99d40138..bc54228cb 100644 --- a/src/lib/ultra/os/invalicache.s +++ b/src/lib/ultra/os/invalicache.s @@ -7,7 +7,7 @@ glabel osInvalICache blez $a1, .L00048198 nop - addiu $t3, $zero, 0x4000 + li $t3, 0x4000 sltu $at, $a1, $t3 beqz $at, .L000481a0 nop diff --git a/src/lib/ultra/os/maptlb.s b/src/lib/ultra/os/maptlb.s index 99f7663bd..35163edac 100644 --- a/src/lib/ultra/os/maptlb.s +++ b/src/lib/ultra/os/maptlb.s @@ -10,17 +10,17 @@ glabel osMapTLB mtc0 $a0, C0_INX mtc0 $a1, C0_PAGEMASK lw $t1, 0x14($sp) - addiu $at, $zero, -1 + li $at, -1 beq $t1, $at, .L0004e1d8 - addiu $t4, $zero, 0x1 - addiu $t2, $zero, 0x1e + li $t4, 0x1 + li $t2, 0x1e b .L0004e1dc or $a2, $a2, $t1 .L0004e1d8: - addiu $t2, $zero, 0x1f + li $t2, 0x1f .L0004e1dc: mtc0 $a2, C0_ENTRYHI - addiu $at, $zero, -1 + li $at, -1 beq $a3, $at, .L0004e200 nop srl $t3, $a3, 0x6 @@ -32,7 +32,7 @@ glabel osMapTLB mtc0 $t4, C0_ENTRYLO0 .L0004e204: lw $t3, 0x10($sp) - addiu $at, $zero, -1 + li $at, -1 beq $t3, $at, .L0004e228 nop srl $t3, $t3, 0x6 @@ -42,7 +42,7 @@ glabel osMapTLB nop .L0004e228: mtc0 $t4, C0_ENTRYLO1 - addiu $at, $zero, -1 + li $at, -1 bne $a3, $at, .L0004e240 nop lui $t3, 0x8000 diff --git a/src/lib/ultra/os/probetlb.s b/src/lib/ultra/os/probetlb.s index 8de4c6913..11ebe836e 100644 --- a/src/lib/ultra/os/probetlb.s +++ b/src/lib/ultra/os/probetlb.s @@ -8,7 +8,7 @@ glabel __osProbeTLB mfc0 $t0, C0_ENTRYHI andi $t1, $t0, 0xff - addiu $at, $zero, -8192 + li $at, -8192 and $t2, $a0, $at or $t1, $t1, $t2 mtc0 $t1, C0_ENTRYHI @@ -51,7 +51,7 @@ glabel __osProbeTLB b .L00051d3c nop .L00051d38: - addiu $v0, $zero, -1 + li $v0, -1 .L00051d3c: mtc0 $t0, C0_ENTRYHI jr $ra diff --git a/src/lib/ultra/os/setintmask.s b/src/lib/ultra/os/setintmask.s index e5ea979f6..3c385c40a 100644 --- a/src/lib/ultra/os/setintmask.s +++ b/src/lib/ultra/os/setintmask.s @@ -11,7 +11,7 @@ glabel osSetIntMask lui $t0, %hi(__osGlobalIntMask) addiu $t0, $t0, %lo(__osGlobalIntMask) lw $t3, 0x0($t0) - addiu $at, $zero, -1 + li $at, -1 xor $t0, $t3, $at andi $t0, $t0, 0xff00 or $v0, $v0, $t0 @@ -19,7 +19,7 @@ glabel osSetIntMask lw $t2, 0xc($t2) beqz $t2, .L00048694 srl $t1, $t3, 0x10 - addiu $at, $zero, -1 + li $at, -1 xor $t1, $t1, $at andi $t1, $t1, 0x3f or $t2, $t2, $t1 diff --git a/src/lib/ultra/os/writebackdcache.s b/src/lib/ultra/os/writebackdcache.s index 9f0c09d2c..5e3b1c330 100644 --- a/src/lib/ultra/os/writebackdcache.s +++ b/src/lib/ultra/os/writebackdcache.s @@ -7,7 +7,7 @@ glabel osWritebackDCache blez $a1, .L0004adc8 nop - addiu $t3, $zero, 0x2000 + li $t3, 0x2000 sltu $at, $a1, $t3 beqz $at, .L0004add0 nop diff --git a/src/lib/ultra/os/writebackdcacheall.s b/src/lib/ultra/os/writebackdcacheall.s index 2c0c5b7b4..9aee5ec1f 100644 --- a/src/lib/ultra/os/writebackdcacheall.s +++ b/src/lib/ultra/os/writebackdcacheall.s @@ -8,7 +8,7 @@ glabel osWritebackDCacheAll lui $t0, 0x8000 - addiu $t2, $zero, 0x2000 + li $t2, 0x2000 addu $t1, $t0, $t2 addiu $t1, $t1, -16 .L00048130: