pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-09 12:32:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

si_find_label

Browse Source
This commit is contained in:
Ethan Roseman 2020-10-24 16:07:26 -04:00
parent ef18c02a4a
commit 4915acf7a2
2 changed files with 18 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
asm/nonmatchings/si/si_find_label.s
View File

@ -1,37 +0,0 @@
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
glabel si_find_label
/* ED240 802C8890 8C86000C */ lw $a2, 0xc($a0)
/* ED244 802C8894 3C02EFE8 */ lui $v0, 0xefe8
/* ED248 802C8898 34422080 */ ori $v0, $v0, 0x2080
/* ED24C 802C889C 00A2102A */ slt $v0, $a1, $v0
/* ED250 802C88A0 10400007 */ beqz $v0, .L802C88C0
/* ED254 802C88A4 0000182D */ daddu $v1, $zero, $zero
/* ED258 802C88A8 03E00008 */ jr $ra
/* ED25C 802C88AC 00A0102D */ daddu $v0, $a1, $zero
.L802C88B0:
/* ED260 802C88B0 00821021 */ addu $v0, $a0, $v0
/* ED264 802C88B4 8C460020 */ lw $a2, 0x20($v0)
/* ED268 802C88B8 080B2239 */ j .L802C88E4
/* ED26C 802C88BC 28620010 */ slti $v0, $v1, 0x10
.L802C88C0:
/* ED270 802C88C0 00831021 */ addu $v0, $a0, $v1
.L802C88C4:
/* ED274 802C88C4 80420010 */ lb $v0, 0x10($v0)
/* ED278 802C88C8 1045FFF9 */ beq $v0, $a1, .L802C88B0
/* ED27C 802C88CC 00031080 */ sll $v0, $v1, 2
/* ED280 802C88D0 24630001 */ addiu $v1, $v1, 1
/* ED284 802C88D4 28620010 */ slti $v0, $v1, 0x10
/* ED288 802C88D8 1440FFFA */ bnez $v0, .L802C88C4
/* ED28C 802C88DC 00831021 */ addu $v0, $a0, $v1
/* ED290 802C88E0 28620010 */ slti $v0, $v1, 0x10
.L802C88E4:
/* ED294 802C88E4 14400003 */ bnez $v0, .L802C88F4
/* ED298 802C88E8 00000000 */ nop
.L802C88EC:
/* ED29C 802C88EC 080B223B */ j .L802C88EC
/* ED2A0 802C88F0 00000000 */ nop
.L802C88F4:
/* ED2A4 802C88F4 03E00008 */ jr $ra
/* ED2A8 802C88F8 00C0102D */ daddu $v0, $a2, $zero

19
src/si.c
View File

@ -1380,7 +1380,24 @@ INCLUDE_ASM(f32, "si", get_float_variable, ScriptInstance* script, Bytecode var)
INCLUDE_ASM(f32, "si", set_float_variable, ScriptInstance* script, Bytecode var, f32 value);
INCLUDE_ASM(s32, "si", si_find_label, ScriptInstance* script, s32 arg1);
s32 si_find_label(ScriptInstance* script, s32 arg1) {
s32 ret = script->ptrReadPos;
s32 i;
if (arg1 < -270000000) {
return arg1;
}
for (i = 0; i < 0x10; i++) {
if (script->labelIndices[i] == arg1) {
ret = script->labelPositions[i];
break;
}
}
ASSERT(i < 0x10);
return ret;
}
INCLUDE_ASM(s32, "si", si_skip_if, ScriptInstance* script);
// Matching but needs rodata support