falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix misnamed function

This commit is contained in:
rozlette 2018-10-29 23:52:02 -05:00
parent 98cdbcf8a5
commit 563866f074
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -18,7 +18,7 @@ build/src/libultra/os/%: OPTIMIZATION := -O1
build/src/libultra/io/%: OPTIMIZATION := -O2 build/src/libultra/io/%: OPTIMIZATION := -O2
build/src/libultra/libc/%: OPTIMIZATION := -O2 build/src/libultra/libc/%: OPTIMIZATION := -O2
build/src/boot_O2_g3/%: OPTIMIZATION := -O2 -g3 build/src/boot_O2_g3/%: OPTIMIZATION := -O2 -g3
test.txt: OPTIMIZATION := -O1 -g3 test.txt: OPTIMIZATION := -O2 -g3
test.txt: MIPS_VERSION := -mips2 test.txt: MIPS_VERSION := -mips2
BASEROM_FILES := $(wildcard baserom/*) BASEROM_FILES := $(wildcard baserom/*)

2
codescript.txt
View File

@ -161,7 +161,7 @@ SECTIONS
build/asm/xldtob.o(.text) build/asm/xldtob.o(.text)
build/asm/ldiv.o(.text) build/asm/ldiv.o(.text)
build/asm/xlitob.o(.text) build/asm/xlitob.o(.text)
build/src/libultra/io/sirawread.o(.text) build/src/libultra/io/sirawwrite.o(.text)
build/src/libultra/io/spgetstat.o(.text) build/src/libultra/io/spgetstat.o(.text)
build/src/libultra/io/spsetstat.o(.text) build/src/libultra/io/spsetstat.o(.text)
. = ALIGN(0x20); /* XXX insert NOPs to pad the file */ . = ALIGN(0x20); /* XXX insert NOPs to pad the file */

2
functions.py
View File

@ -164,7 +164,7 @@ known_funcs = {
0x80094DF0:("ldiv","ldiv_t","long numer, long denom"), 0x80094DF0:("ldiv","ldiv_t","long numer, long denom"),
0x80094E74:("lldiv","lldiv_t","long long numer, long long denom"), 0x80094E74:("lldiv","lldiv_t","long long numer, long long denom"),
0x80094F80:("_Litob","void","_Pft* px, unsigned char code"), 0x80094F80:("_Litob","void","_Pft* px, unsigned char code"),
0x80095220:("__osSiRawReadIo","s32","u32 devAddr, u32* data"), 0x80095220:("__osSiRawWriteIo","s32","u32 devAddr, u32* data"),
0x80095270:("__osSpGetStatus","u32","void"), 0x80095270:("__osSpGetStatus","u32","void"),
0x80095280:("__osSpSetStatus","void","u32 data"), 0x80095280:("__osSpSetStatus","void","u32 data"),
0x800952A0:("osCreateViManager","void","OSPri pri"), 0x800952A0:("osCreateViManager","void","OSPri pri"),

2
include/functions.h
View File

@ -419,7 +419,7 @@ UNK_RET func_80094828(UNK_ARGS); // func_80094828
ldiv_t ldiv(long numer, long denom); // func_80094DF0 ldiv_t ldiv(long numer, long denom); // func_80094DF0
lldiv_t lldiv(long long numer, long long denom); // func_80094E74 lldiv_t lldiv(long long numer, long long denom); // func_80094E74
void _Litob(_Pft* px, unsigned char code); // func_80094F80 void _Litob(_Pft* px, unsigned char code); // func_80094F80
s32 __osSiRawReadIo(u32 devAddr, u32* data); // func_80095220 s32 __osSiRawWriteIo(u32 devAddr, u32* data); // func_80095220
u32 __osSpGetStatus(void); // func_80095270 u32 __osSpGetStatus(void); // func_80095270
void __osSpSetStatus(u32 data); // func_80095280 void __osSpSetStatus(u32 data); // func_80095280
void osCreateViManager(OSPri pri); // func_800952A0 void osCreateViManager(OSPri pri); // func_800952A0

2
objects.py
View File

@ -82,7 +82,7 @@ known_objects = {
0x80094f80:"xlitob", 0x80094f80:"xlitob",
0x80095270:"spgetstat", 0x80095270:"spgetstat",
0x80095280:"spsetstat", 0x80095280:"spsetstat",
0x80095220:"sirawread", 0x80095220:"sirawwrite",
0x800952A0:"vimgr", 0x800952A0:"vimgr",
0x800955B0:"vigetcurrcontext", 0x800955B0:"vigetcurrcontext",
0x800955C0:"writebackdcacheall", 0x800955C0:"writebackdcacheall",

6
src/libultra/io/sirawread.c → src/libultra/io/sirawwrite.c
View File

@ -1,12 +1,12 @@
#include <osint.h> #include <osint.h>
#include <assert.h> #include <assert.h>
s32 __osSiRawReadIo(u32 devAddr, u32* data) { s32 __osSiRawWriteIo(u32 devAddr, u32* data) {
if (__osSiDeviceBusy() != 0) { if (__osSiDeviceBusy() != 0) {
return -1; return -1;
} }
*(u32*)(devAddr | 0xA0000000) = (u32)data; *(u32*)(devAddr | 0xA0000000) = (u32)data;
return 0; return 0;
} }