From 356caa1ca9d0abb5bd8fdff983a7126164f46f57 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Sat, 30 Jan 2021 12:18:36 +1000 Subject: [PATCH] Decompile isspace --- src/include/lib/lib_13130.h | 2 +- src/lib/lib_13130.c | 33 ++++++--------------------------- 2 files changed, 7 insertions(+), 28 deletions(-) diff --git a/src/include/lib/lib_13130.h b/src/include/lib/lib_13130.h index 7d76d428a..416c033c0 100644 --- a/src/include/lib/lib_13130.h +++ b/src/include/lib/lib_13130.h @@ -11,7 +11,7 @@ u32 func000132c0(void); char toupper(char c); s32 isdigit(char c); s32 isalpha(char c); -u32 func000133b4(void); +s32 isspace(char c); s32 func00013408(char *arg0, s32 *arg1, s32 arg2); int sprintf(char *dest, const char *format, ...); diff --git a/src/lib/lib_13130.c b/src/lib/lib_13130.c index 1f50717a3..aa606b0ae 100644 --- a/src/lib/lib_13130.c +++ b/src/lib/lib_13130.c @@ -204,31 +204,10 @@ s32 isalpha(char c) return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'); } -GLOBAL_ASM( -glabel func000133b4 -/* 133b4: 308e00ff */ andi $t6,$a0,0xff -/* 133b8: 39c20020 */ xori $v0,$t6,0x20 -/* 133bc: 2c420001 */ sltiu $v0,$v0,0x1 -/* 133c0: 1440000f */ bnez $v0,.L00013400 -/* 133c4: afa40000 */ sw $a0,0x0($sp) -/* 133c8: 39c20009 */ xori $v0,$t6,0x9 -/* 133cc: 2c420001 */ sltiu $v0,$v0,0x1 -/* 133d0: 1440000b */ bnez $v0,.L00013400 -/* 133d4: 00000000 */ nop -/* 133d8: 39c2000a */ xori $v0,$t6,0xa -/* 133dc: 2c420001 */ sltiu $v0,$v0,0x1 -/* 133e0: 14400007 */ bnez $v0,.L00013400 -/* 133e4: 00000000 */ nop -/* 133e8: 39c2000c */ xori $v0,$t6,0xc -/* 133ec: 2c420001 */ sltiu $v0,$v0,0x1 -/* 133f0: 14400003 */ bnez $v0,.L00013400 -/* 133f4: 00000000 */ nop -/* 133f8: 39c2000b */ xori $v0,$t6,0xb -/* 133fc: 2c420001 */ sltiu $v0,$v0,0x1 -.L00013400: -/* 13400: 03e00008 */ jr $ra -/* 13404: 00000000 */ nop -); +s32 isspace(char c) +{ + return c == ' ' || c == '\t' || c == '\n' || c == '\f' || c == '\v'; +} GLOBAL_ASM( glabel func00013408 @@ -253,13 +232,13 @@ glabel func00013408 /* 1344c: 90e40000 */ lbu $a0,0x0($a3) .L00013450: /* 13450: 00e09025 */ or $s2,$a3,$zero -/* 13454: 0c004ced */ jal func000133b4 +/* 13454: 0c004ced */ jal isspace /* 13458: afa70060 */ sw $a3,0x60($sp) /* 1345c: 50400007 */ beqzl $v0,.L0001347c /* 13460: 92420000 */ lbu $v0,0x0($s2) /* 13464: 26520001 */ addiu $s2,$s2,0x1 .L00013468: -/* 13468: 0c004ced */ jal func000133b4 +/* 13468: 0c004ced */ jal isspace /* 1346c: 92440000 */ lbu $a0,0x0($s2) /* 13470: 5440fffd */ bnezl $v0,.L00013468 /* 13474: 26520001 */ addiu $s2,$s2,0x1