libultra symbols

linker_scripts/us/symbol_addrs.txt

@@ -1,3 +1,34 @@
 bootproc = 0x80004DA8;
 D_800C90F0 = 0x800C90F0;
-D_800D934C = 0x800D934C; // force_migration:True
+D_800D934C = 0x800D934C; // force_migration:True
+osContInit = 0x8001FFC0;
+osRecvMesg = 0x800205E0;
+osSendMesg = 0x80020720;
+osContStartQuery = 0x80020870;
+osContGetQuery = 0x800208F4;
+guPerspectiveF = 0x80020F40;
+guPerspective = 0x80021170;
+guLookAtF =  0x800211D0;
+guLookAt = 0x80021488;
+guOrthoF = 0x80021500;
+guOrtho = 0x80021654;
+osInvalICache = 0x800216C0;
+osInvalDCache = 0x80021740;
+osPiStartDma = 0x800217F0;
+osViBlack = 0x80021900;
+osWritebackDCacheAll = 0x80021970;
+osViSwapBuffer = 0x800219A0;
+osViRepeatLine = 0x800219F0;
+osViSetMode = 0x80021AC0;
+osViSetSpecialFeatures = 0x80021B30;
+osCreateMesgQueue = 0x80021CF0;
+osSetEventMesg = 0x80021D20;
+osViSetEvent = 0x80021D90;
+osSpTaskYielded = 0x80021E00;
+osSpTaskYield = 0x80021E80;
+osDpSetStatus = 0x80022190;
+osCreateThread = 0x800221A0;
+osStartThread = 0x800222F0;
+osCreateViManager = 0x80022440;
+osSetThreadPri = 0x80022A80; 
+osGetTime = 0x80023000;

src/libultra/2BDF0.c

@@ -6,23 +6,7 @@
 
 #pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/2BDF0/func_8002B28C.s")
 
-// Matches with IDO 5.3/7.1 -O1 -g0
-#ifdef NON_MATCHING
-void func_8002B2C0(s32* arg0, s32* arg1, s32 arg2, u32 arg3) {
-    s32 pad;
-
-    arg3 = arg2;
-    arg2--;
-
-    while (arg3 > 0) {
-        arg3 = arg2;
-        arg2--;
-        *arg0++ = *arg1++;
-    }
-}
-#else
 #pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/2BDF0/func_8002B2C0.s")
-#endif
 
 #pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/2BDF0/func_8002B2F4.s")
 

src/libultra/2C700.c

@@ -1,9 +1,5 @@
 #include "common.h"
 
-// One -01 -g0, likely part of libultra
-
-s32 func_8002DE78(s32, s32, s32);
-
 #pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/2C700/func_8002BB00.s")
 
 #pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/2C700/func_8002BB7C.s")
@@ -26,31 +22,4 @@ s32 func_8002DE78(s32, s32, s32);
 
 #pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/2C700/func_8002C698.s")
 
-typedef struct {
-    char pad_0[0x4];
-    u8 unk4;
-} Unkstruct_func_8002C6B8_1;
-
-typedef struct {
-    char pad_0[0x4];
-    s8 unk4;
-    char pad_5;
-    s16 unk6;
-    char pad_[0x4];
-    s32 unk12;
-} Unkstruct_func_8002C6B8_2;
-
-// matches with -O1 -g0 IDO 5.3/7.1
-#ifdef NON_MATCHING
-s32 func_8002C6B8(Unkstruct_func_8002C6B8_1* arg0) {
-    Unkstruct_func_8002C6B8_2 temp;
-
-    temp.unk4 = arg0->unk4;
-    temp.unk12 = 0;
-    temp.unk6 = 0;
-    func_8002DE78(&temp, 16, 1);
-    return 0;
-}
-#else
 #pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/2C700/func_8002C6B8.s")
-#endif

src/libultra/gu/lookat.c

@@ -1,5 +1,5 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/gu/lookat/func_800211D0.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/gu/lookat/guLookAtF.s")
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/gu/lookat/func_80021488.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/gu/lookat/guLookAt.s")

src/libultra/gu/ortho.c

@@ -1,5 +1,5 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/gu/ortho/func_80021500.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/gu/ortho/guOrthoF.s")
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/gu/ortho/func_80021654.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/gu/ortho/guOrtho.s")

src/libultra/io/contquery.c

@@ -1,5 +1,5 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/contquery/func_80020870.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/contquery/osContStartQuery.s")
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/contquery/func_800208F4.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/contquery/osContGetQuery.s")

src/libultra/io/controller.c

@@ -1,6 +1,6 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/controller/func_8001FFC0.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/controller/osContInit.s")
 
 #pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/controller/func_800201B8.s")
 

src/libultra/io/dpsetstat.c

@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/dpsetstat/func_80022190.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/dpsetstat/osDpSetStatus.s")

src/libultra/io/pidma.c

@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/pidma/func_800217F0.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/pidma/osPiStartDma.s")

src/libultra/io/sptaskyield.c

@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/sptaskyield/func_80021E80.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/sptaskyield/osSpTaskYield.s")

src/libultra/io/sptaskyielded.c

@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/sptaskyielded/func_80021E00.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/sptaskyielded/osSpTaskYielded.s")

src/libultra/io/viblack.c

@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/viblack/func_80021900.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/viblack/osViBlack.s")

src/libultra/io/vimgr.c

@@ -1,5 +1,5 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/vimgr/func_80022440.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/vimgr/osCreateViManager.s")
 
 #pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/vimgr/func_800225C8.s")

src/libultra/io/virepeatline.c

@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/virepeatline/func_800219F0.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/virepeatline/osViRepeatLine.s")

src/libultra/io/visetevent.c

@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/visetevent/func_80021D90.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/visetevent/osViSetEvent.s")

src/libultra/io/visetmode.c

@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/visetmode/func_80021AC0.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/visetmode/osViSetMode.s")

src/libultra/io/visetspecial.c

@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/visetspecial/func_80021B30.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/visetspecial/osViSetSpecialFeatures.s")

src/libultra/io/viswapbuf.c

@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/viswapbuf/func_800219A0.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/io/viswapbuf/osViSwapBuffer.s")

src/libultra/os/createmesgqueue.c

@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/createmesgqueue/func_80021CF0.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/createmesgqueue/osCreateMesgQueue.s")

src/libultra/os/createthread.c

@@ -1,3 +1,3 @@
 #include "common.h"
 
-#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/createthread/func_800221A0.s")
+#pragma GLOBAL_ASM("asm/us/nonmatchings/libultra/os/createthread/osCreateThread.s")