Match syncprintf.c

Author: Francessco121

include/libc/xstdio.h

@@ -28,7 +28,7 @@ typedef struct {
 #define FLAGS_MINUS 4
 #define FLAGS_HASH 8
 #define FLAGS_ZERO 16
-typedef char *outfun(char*,const char*,size_t);
+typedef void *outfun(void*,const char*,size_t);
 
 int _Printf(outfun prout, char *arg, const char *fmt, va_list args);
 void _Litob(_Pft *args, char type);

splat.yaml

@@ -324,7 +324,7 @@ segments:
     - [0x98AF0, data, libultra/os/exceptasm]
     - [0x98B30, .data, libultra/os/writehost]
     - [0x98B40, .data, libultra/os/readhost]
-    - [0x98B50, data, libultra/libc/syncprintf]
+    - [0x98B50, .data, libultra/libc/syncprintf]
     - [0x98B60, .data, libultra/io/contramread]
     - [0x98B70, .data, libultra/io/piacs]
     - [0x98B80, .data, libultra/os/rdbsend]

src/libultra/libc/syncprintf.c

@@ -1,11 +1,106 @@
-#include "common.h"
+// @DECOMP_OPT_FLAGS=-O3
+#include <PR/os.h>
+#include <PR/os_internal.h>
+#include <PR/rdb.h>
+#include <PR/rcp.h>
+#include "libc/xstdio.h"
+#include "libc/stdarg.h"
 
-#pragma GLOBAL_ASM("asm/nonmatchings/libultra/libc/syncprintf/rmonPrintf.s")
+extern s32 __kmc_pt_mode;
 
-#pragma GLOBAL_ASM("asm/nonmatchings/libultra/libc/syncprintf/proutSyncPrintf.s")
+static void* proutSyncPrintf(void* str, const char* buf, size_t n) {
+    u32 sent = 0;
 
-#pragma GLOBAL_ASM("asm/nonmatchings/libultra/libc/syncprintf/rmonPutchar.s")
+    while (sent < n) {
+        sent += __osRdbSend((u8*)(buf + sent), n - sent, RDB_TYPE_GtoH_PRINT);
+    }
+    return (void*)1;
+}
 
-#pragma GLOBAL_ASM("asm/nonmatchings/libultra/libc/syncprintf/kmc_proutSyncPrintf.s")
+static volatile unsigned int* stat = (unsigned*)0xbff08004;
+static volatile unsigned int* wport = (unsigned*)0xbff08000;
+static volatile unsigned int* piok = (unsigned*)PHYS_TO_K1(PI_STATUS_REG);
 
-#pragma GLOBAL_ASM("asm/nonmatchings/libultra/libc/syncprintf/osSyncPrintf.s")
+static void rmonPutchar(char c) {
+    while (*piok & (PI_STATUS_DMA_BUSY | PI_STATUS_IO_BUSY)) {
+    }
+
+    while (!(*stat & 4)) {
+    }
+    
+    *wport = c;
+}
+
+static void* kmc_proutSyncPrintf(void* str, const char* buf, int n) {
+    int i;
+    char c;
+    char* p;
+    char* q;
+    char xbuf[128];
+    static int column = 0;
+
+    p = xbuf;
+
+    for (i = 0; i < n; i++) {
+        c = *buf++;
+
+        switch (c) {
+            case '\n':
+                *p++ = '\n';
+                column = 0;
+                break;
+            case '\t':
+                do {
+                    *p++ = ' ';
+                } while (++column % 8);
+                break;
+            default:
+                column++;
+                *p++ = c;
+                break;
+        }
+
+        if (c == '\n' || (p - xbuf) > 100) {
+            rmonPutchar((p - xbuf) - 1);
+
+            q = xbuf;
+            while (q != p) {
+                rmonPutchar(*q++);
+            }
+            p = xbuf;
+        }
+    }
+    if (p != xbuf) {
+        rmonPutchar((p - xbuf) - 1);
+
+        q = xbuf;
+        while (q != p) {
+            rmonPutchar(*q++);
+        }
+    }
+    return (void*)1;
+}
+
+void osSyncPrintf(const char* fmt, ...) {
+    int ans;
+    va_list ap;
+
+    va_start(ap, fmt);
+    if (__kmc_pt_mode) {
+        ans = _Printf((outfun*)kmc_proutSyncPrintf, NULL, fmt, ap);
+    } else {
+        ans = _Printf(proutSyncPrintf, NULL, fmt, ap);
+    }
+    va_end(ap);
+}
+
+void rmonPrintf(const char* fmt, ...) {
+    int ans;
+    va_list ap;
+
+    va_start(ap, fmt);
+    if (__kmc_pt_mode) {
+        ans = _Printf((outfun*)kmc_proutSyncPrintf, NULL, fmt, ap);
+    }
+    va_end(ap);
+}

src/libultra/os/initialize.c

@@ -24,7 +24,7 @@ OSTime osClockRate = OS_CLOCK_RATE;
 s32 osViClock = VI_NTSC_CLOCK;
 u32 __osShutdown = 0;
 u32 __OSGlobalIntMask = OS_IM_ALL;
-s32 gP64Enabled;
+s32 __kmc_pt_mode;
 
 void __createSpeedParam();
 
@@ -99,7 +99,7 @@ void osInitialize() {
 
     // partner-64 stuff
     // note: not 100% sure what the below is doing, some comments may be wrong
-    if (gP64Enabled == 0) {
+    if (__kmc_pt_mode == 0) {
         p64Status = (u32 *)0xBFF08004;
         p64Struct = (u32 *)0xBFF00000;
 
@@ -126,7 +126,7 @@ void osInitialize() {
         osInvalICache((void *)E_VEC, 0x24);
 
         // mark partner mode as enabled
-        gP64Enabled = 1;
+        __kmc_pt_mode = 1;
 
         // check some status bit
         if ((*p64Status & 0x10) == 0) {

symbol_addrs.txt

@@ -704,7 +704,7 @@ Nan = 0x800a29b8; // size:0x4
 inf = 0x800a29bc; // size:0x4
 xldtob_rodata_0058 = 0x800a29c8; // size:0x8
 player_bss_0048 = 0x800a7d40;
-gP64Enabled = 0x800cd320; // size:0x4
+__kmc_pt_mode = 0x800cd320; // size:0x4
 __osEventStateTab = 0x800cd330; // size:0xc0
 __osContPifRam = 0x800cd3f0; // size:0x40
 __osContLastCmd = 0x800cd430; // size:0x1
@@ -775,7 +775,6 @@ al_syn_dma = 0x80012084; // type:func
 osViModeTable = 0x80096cd0; // size:0x1180
 __osCleanupThread_80080df0 = 0x80080df0; // type:func
 gIdleThread = 0x800a5dc0; // size:0x1b0
-pi_status_pointer = 0x80097f58; // size:0x4
 __CallBackDmaNew = 0x80001778; // type:func
 NOTosSetTime = 0x8003f4a8; // type:func
 gFramebufferCurrent = 0x800bccac; // size:0x4