diff options
| author | Tharo <17233964+Thar0@users.noreply.github.com> | 2024-12-28 20:18:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-28 15:18:45 -0500 |
| commit | 7e082f0c4f6b34820b4dbf6285d05adf423c091b (patch) | |
| tree | 5b2f1d322eafd4afd6b30109eab12ae36d2b72bf /src/boot | |
| parent | ba6a83533ac3dcbd6c0c70c9857572ed1ef1d009 (diff) | |
Use IDO for assembling handwritten asm files in src (#2390)
* as0
* Fix ASOPTFLAGS for src/libc, remove unnecessary noreorder region in kanread
* Suggested changes
* Use %half to load the boot bss size for matching
Co-authored-by: cadmic <cadmic24@gmail.com>
* Wrap all of __osProbeTLB in noreorder
---------
Co-authored-by: cadmic <cadmic24@gmail.com>
Diffstat (limited to 'src/boot')
| -rw-r--r-- | src/boot/mio0.s | 92 |
1 files changed, 46 insertions, 46 deletions
diff --git a/src/boot/mio0.s b/src/boot/mio0.s index a3fb8eba2..a6c2eee6b 100644 --- a/src/boot/mio0.s +++ b/src/boot/mio0.s @@ -1,10 +1,7 @@ #include "ultra64/asm.h" +#include "ultra64/regdef.h" -.set noreorder - -.section .text - -.balign 16 +.text /** * void Mio0_Decompress(void* src, void* dst); @@ -12,53 +9,56 @@ * Decompress Mio0 chunk */ LEAF(Mio0_Decompress) - lw $a3, 8($a0) // compressed offset - lw $t9, 0xC($a0) // uncompressed offset - lw $t8, 4($a0) // decompressed length - add $a3, $a3, $a0 // compressed start - add $t9, $t9, $a0 // uncompressed start - move $a2, $zero // 0 - addi $a0, $a0, 0x10 // move past header - add $t8, $t8, $a1 // dst + decompressed length = end + lw a3, 0x08(a0) /* compressed offset */ + lw t9, 0x0C(a0) /* uncompressed offset */ + lw t8, 0x04(a0) /* decompressed length */ + add a3, a3, a0 /* compressed start */ + add t9, t9, a0 /* uncompressed start */ + move a2, zero /* 0 */ + addi a0, a0, 0x10 /* move past header */ + add t8, t8, a1 /* dst + decompressed length = end */ mainloop: - bnez $a2, 1f - nop - lw $t0, ($a0) - li $a2, 32 - addi $a0, $a0, 4 + bnez a2, 1f + + lw t0, (a0) + li a2, 32 + addi a0, a0, 4 1: - slt $t1, $t0, $zero - beqz $t1, read_comp - nop - lb $t2, ($t9) // read 1 byte from uncompressed data - addi $t9, $t9, 1 // advance uncompressed start - addi $a1, $a1, 1 + slt t1, t0, zero + beqz t1, read_comp + + lb t2, (t9) /* read 1 byte from uncompressed data */ + sb t2, (a1) /* store uncompressed byte */ + addi t9, t9, 1 /* advance uncompressed start */ + addi a1, a1, 1 b next_iter - sb $t2, -1($a1) // store uncompressed byte + read_comp: - lhu $t2, ($a3) // read 2 bytes from compressed data - addi $a3, $a3, 2 // advance compressed start - srl $t3, $t2, 0xC - andi $t2, $t2, 0xFFF - beqz $t3, 3f - sub $t1, $a1, $t2 - addi $t3, $t3, 2 + lhu t2, (a3) /* read 2 bytes from compressed data */ + addi a3, a3, 2 /* advance compressed start */ + srl t3, t2, 0xC + andi t2, t2, 0xFFF + sub t1, a1, t2 + beqz t3, 3f + + addi t3, t3, 2 2: - lb $t2, -1($t1) - addi $t3, $t3, -1 - addi $t1, $t1, 1 - addi $a1, $a1, 1 - bnez $t3, 2b - sb $t2, -1($a1) + lb t2, -1(t1) + addi t3, t3, -1 + addi t1, t1, 1 + sb t2, (a1) + addi a1, a1, 1 + bnez t3, 2b + next_iter: - sll $t0, $t0, 1 - bne $a1, $t8, mainloop // continue until decompressed length is reached - addi $a2, $a2, -1 - jr $ra - nop + sll t0, t0, 1 + addi a2, a2, -1 + bne a1, t8, mainloop /* continue until decompressed length is reached */ + + jr ra 3: - lbu $t3, ($t9) - addi $t9, $t9, 1 + lbu t3, (t9) + addi t9, t9, 1 + addi t3, t3, 0x12 b 2b - addi $t3, $t3, 0x12 END(Mio0_Decompress) |