From 073c5e8d67439a571c5d5bc9d04cf08ac20ec208 Mon Sep 17 00:00:00 2001 From: Ryan Dwyer Date: Tue, 16 Mar 2021 21:21:47 +1000 Subject: [PATCH] Convert some libultra .c files to .s --- src/lib/ultra/gu/sqrtf.c | 7 ------- src/lib/ultra/gu/sqrtf.s | 7 +++++++ src/lib/ultra/os/getcause.c | 9 --------- src/lib/ultra/os/getcause.s | 7 +++++++ src/lib/ultra/os/getcount.c | 9 --------- src/lib/ultra/os/getcount.s | 7 +++++++ src/lib/ultra/os/getfpccsr.c | 8 -------- src/lib/ultra/os/getfpccsr.s | 7 +++++++ src/lib/ultra/os/getsr.c | 9 --------- src/lib/ultra/os/getsr.s | 7 +++++++ src/lib/ultra/os/setcompare.c | 9 --------- src/lib/ultra/os/setcompare.s | 9 +++++++++ src/lib/ultra/os/setfpccsr.c | 10 ---------- src/lib/ultra/os/setfpccsr.s | 11 +++++++++++ src/lib/ultra/os/setsr.c | 10 ---------- src/lib/ultra/os/setsr.s | 10 ++++++++++ 16 files changed, 65 insertions(+), 71 deletions(-) delete mode 100644 src/lib/ultra/gu/sqrtf.c create mode 100644 src/lib/ultra/gu/sqrtf.s delete mode 100644 src/lib/ultra/os/getcause.c create mode 100644 src/lib/ultra/os/getcause.s delete mode 100644 src/lib/ultra/os/getcount.c create mode 100644 src/lib/ultra/os/getcount.s delete mode 100644 src/lib/ultra/os/getfpccsr.c create mode 100644 src/lib/ultra/os/getfpccsr.s delete mode 100644 src/lib/ultra/os/getsr.c create mode 100644 src/lib/ultra/os/getsr.s delete mode 100644 src/lib/ultra/os/setcompare.c create mode 100644 src/lib/ultra/os/setcompare.s delete mode 100644 src/lib/ultra/os/setfpccsr.c create mode 100644 src/lib/ultra/os/setfpccsr.s delete mode 100644 src/lib/ultra/os/setsr.c create mode 100644 src/lib/ultra/os/setsr.s diff --git a/src/lib/ultra/gu/sqrtf.c b/src/lib/ultra/gu/sqrtf.c deleted file mode 100644 index 7686fdd5f..000000000 --- a/src/lib/ultra/gu/sqrtf.c +++ /dev/null @@ -1,7 +0,0 @@ -#include - -GLOBAL_ASM( -glabel sqrtf -/* 4a5d0: 03e00008 */ jr $ra -/* 4a5d4: 46006004 */ sqrt.s $f0,$f12 -); diff --git a/src/lib/ultra/gu/sqrtf.s b/src/lib/ultra/gu/sqrtf.s new file mode 100644 index 000000000..458ecb434 --- /dev/null +++ b/src/lib/ultra/gu/sqrtf.s @@ -0,0 +1,7 @@ +#include "asm_helper.h" + +.text +LEAF(sqrtf) + sqrt.s $f0, $f12 + jr ra +END(sqrtf) diff --git a/src/lib/ultra/os/getcause.c b/src/lib/ultra/os/getcause.c deleted file mode 100644 index 3b4382570..000000000 --- a/src/lib/ultra/os/getcause.c +++ /dev/null @@ -1,9 +0,0 @@ -#include -#include "data.h" - -GLOBAL_ASM( -glabel __osGetCause -/* 4b160: 40026800 */ mfc0 $v0,$13 -/* 4b164: 03e00008 */ jr $ra -/* 4b168: 00000000 */ nop -); diff --git a/src/lib/ultra/os/getcause.s b/src/lib/ultra/os/getcause.s new file mode 100644 index 000000000..4ec0035f3 --- /dev/null +++ b/src/lib/ultra/os/getcause.s @@ -0,0 +1,7 @@ +#include "asm_helper.h" + +.text +LEAF(__osGetCause) + STAY2(mfc0 v0, C0_CAUSE) + jr ra +END(__osGetCause) diff --git a/src/lib/ultra/os/getcount.c b/src/lib/ultra/os/getcount.c deleted file mode 100644 index 29d58684f..000000000 --- a/src/lib/ultra/os/getcount.c +++ /dev/null @@ -1,9 +0,0 @@ -#include -#include "data.h" - -GLOBAL_ASM( -glabel osGetCount -/* 48510: 40024800 */ mfc0 $v0,$9 -/* 48514: 03e00008 */ jr $ra -/* 48518: 00000000 */ nop -); diff --git a/src/lib/ultra/os/getcount.s b/src/lib/ultra/os/getcount.s new file mode 100644 index 000000000..1158334fb --- /dev/null +++ b/src/lib/ultra/os/getcount.s @@ -0,0 +1,7 @@ +#include "asm_helper.h" + +.text +LEAF(osGetCount) + STAY2(mfc0 v0, C0_COUNT) + jr ra +END(osGetCount) diff --git a/src/lib/ultra/os/getfpccsr.c b/src/lib/ultra/os/getfpccsr.c deleted file mode 100644 index 7a42c1e28..000000000 --- a/src/lib/ultra/os/getfpccsr.c +++ /dev/null @@ -1,8 +0,0 @@ -#include - -GLOBAL_ASM( -glabel __osGetFpcCsr -/* 481d0: 4442f800 */ cfc1 $v0,$31 -/* 481d4: 03e00008 */ jr $ra -/* 481d8: 00000000 */ nop -); diff --git a/src/lib/ultra/os/getfpccsr.s b/src/lib/ultra/os/getfpccsr.s new file mode 100644 index 000000000..7fd81e912 --- /dev/null +++ b/src/lib/ultra/os/getfpccsr.s @@ -0,0 +1,7 @@ +#include "asm_helper.h" + +.text +LEAF(__osGetFpcCsr) + STAY2(cfc1 v0, $31) + jr ra +END(__osGetFpcCsr) diff --git a/src/lib/ultra/os/getsr.c b/src/lib/ultra/os/getsr.c deleted file mode 100644 index 44f31dcae..000000000 --- a/src/lib/ultra/os/getsr.c +++ /dev/null @@ -1,9 +0,0 @@ -#include -#include "data.h" - -GLOBAL_ASM( -glabel __osGetSR -/* 4acd0: 40026000 */ mfc0 $v0,$12 -/* 4acd4: 03e00008 */ jr $ra -/* 4acd8: 00000000 */ nop -); diff --git a/src/lib/ultra/os/getsr.s b/src/lib/ultra/os/getsr.s new file mode 100644 index 000000000..4f3fa41b5 --- /dev/null +++ b/src/lib/ultra/os/getsr.s @@ -0,0 +1,7 @@ +#include "asm_helper.h" + +.text +LEAF(__osGetSR) + STAY2(mfc0 v0, C0_SR) + jr ra +END(__osGetSR) diff --git a/src/lib/ultra/os/setcompare.c b/src/lib/ultra/os/setcompare.c deleted file mode 100644 index 851e08966..000000000 --- a/src/lib/ultra/os/setcompare.c +++ /dev/null @@ -1,9 +0,0 @@ -#include -#include "data.h" - -GLOBAL_ASM( -glabel __osSetCompare -/* 51880: 40845800 */ mtc0 $a0,$11 -/* 51884: 03e00008 */ jr $ra -/* 51888: 00000000 */ nop -); diff --git a/src/lib/ultra/os/setcompare.s b/src/lib/ultra/os/setcompare.s new file mode 100644 index 000000000..5408cd044 --- /dev/null +++ b/src/lib/ultra/os/setcompare.s @@ -0,0 +1,9 @@ +#include "asm_helper.h" + +.set noreorder +.text +LEAF(__osSetCompare) + mtc0 a0, C0_COMPARE + jr ra + nop +END(__osSetCompare) diff --git a/src/lib/ultra/os/setfpccsr.c b/src/lib/ultra/os/setfpccsr.c deleted file mode 100644 index ddedccfa5..000000000 --- a/src/lib/ultra/os/setfpccsr.c +++ /dev/null @@ -1,10 +0,0 @@ -#include -#include "data.h" - -GLOBAL_ASM( -glabel __osSetFpcCsr -/* 481e0: 4442f800 */ cfc1 $v0,$31 -/* 481e4: 44c4f800 */ ctc1 $a0,$31 -/* 481e8: 03e00008 */ jr $ra -/* 481ec: 00000000 */ nop -); diff --git a/src/lib/ultra/os/setfpccsr.s b/src/lib/ultra/os/setfpccsr.s new file mode 100644 index 000000000..8d02b9c8f --- /dev/null +++ b/src/lib/ultra/os/setfpccsr.s @@ -0,0 +1,11 @@ +#include "asm_helper.h" + +.set noreorder +.text + +LEAF(__osSetFpcCsr) + cfc1 v0, $31 + ctc1 a0, $31 + jr ra + nop +END(__osSetFpcCsr) diff --git a/src/lib/ultra/os/setsr.c b/src/lib/ultra/os/setsr.c deleted file mode 100644 index 16abfe8eb..000000000 --- a/src/lib/ultra/os/setsr.c +++ /dev/null @@ -1,10 +0,0 @@ -#include -#include "data.h" - -GLOBAL_ASM( -glabel __osSetSR -/* 4acc0: 40846000 */ mtc0 $a0,$12 -/* 4acc4: 00000000 */ nop -/* 4acc8: 03e00008 */ jr $ra -/* 4accc: 00000000 */ nop -); diff --git a/src/lib/ultra/os/setsr.s b/src/lib/ultra/os/setsr.s new file mode 100644 index 000000000..63cc3d73b --- /dev/null +++ b/src/lib/ultra/os/setsr.s @@ -0,0 +1,10 @@ +#include "asm_helper.h" + +.set noreorder +.text +LEAF(__osSetSR) + mtc0 a0, C0_SR + nop + jr ra + nop +END(__osSetSR)