Match kdebugserver

Author: Francessco121

splat.yaml

@@ -329,7 +329,7 @@ segments:
     - [0x98B70, .data, libultra/io/piacs]
     - [0x98B80, .data, libultra/os/rdbsend]
     - [0x98B90, data, libultra/vi/vimodes]
-    - [0x98C80, data, libultra/debug/kdebugserver]
+    - [0x98C80, .data, libultra/debug/kdebugserver]
     - [0x98C90, .data, libultra/libc/xprintf]
     - [0x98CE0, .data, libultra/rmon/rmoncmds]
     - [0x98DC0, .data, libultra/libc/xlitob]

src/libultra/debug/kdebugserver.c

@@ -1,11 +1,91 @@
-#include "common.h"
+// @DECOMP_OPT_FLAGS=-O1
+#include "PR/os_internal.h"
+#include "PR/rcp.h"
+#include "PR/rdb.h"
+#include "bss.h"
 
-#pragma GLOBAL_ASM("asm/nonmatchings/libultra/debug/kdebugserver/string_to_u32.s")
+extern OSThread *__osRunningThread;
+extern u32 __osRdb_IP6_Empty;
 
-#pragma GLOBAL_ASM("asm/nonmatchings/libultra/debug/kdebugserver/send_packet.s")
+BSS_STATIC u8 kdebugserver_buffer[12]; // original name: buffer
+static u32 numChars = 0;
 
-#pragma GLOBAL_ASM("asm/nonmatchings/libultra/debug/kdebugserver/clear_IP6.s")
+static u32 string_to_u32(u8* s) {
+    u32 k;
 
-#pragma GLOBAL_ASM("asm/nonmatchings/libultra/debug/kdebugserver/send.s")
+    k = ((s[0] & 0xFF) << 0x18);
+    k |= ((s[1] & 0xFF) << 0x10);
+    k |= ((s[2] & 0xFF) << 0x8);
+    k |= (s[3] & 0xFF);
 
-#pragma GLOBAL_ASM("asm/nonmatchings/libultra/debug/kdebugserver/kdebugserver.s")
+    return k;
+}
+
+static void send_packet(u8* s, u32 n) {
+    rdbPacket packet;
+    u32 i;
+
+    packet.type = 0xC;
+    packet.length = n;
+
+    for (i = 0; i < n; i++) {
+        packet.buf[i] = s[i];
+    }
+    *(vu32*)RDB_BASE_REG = *(u32*)&packet;
+}
+
+static void clear_IP6(void) {
+    while (!(__osGetCause() & CAUSE_IP6)) {
+        ;
+    }
+    *(vu32*)RDB_READ_INTR_REG = 0;
+
+    while (__osGetCause() & CAUSE_IP6) {
+        ;
+    }
+}
+
+static void send(u8* s, u32 n) {
+    u32 ct;
+    u32 i = 0;
+    u32 getLastIP6;
+
+    if (!__osRdb_IP6_Empty) {
+        clear_IP6();
+        getLastIP6 = FALSE;
+    } else {
+        getLastIP6 = TRUE;
+    }
+    while (n != 0) {
+        ct = (n < 3) ? n : 3;
+        send_packet(s + i, ct);
+        n -= ct;
+        i += ct;
+        if (n != 0) {
+            clear_IP6();
+        }
+    }
+    if (getLastIP6) {
+        clear_IP6();
+    }
+}
+
+void kdebugserver(rdbPacket packet) {
+    u32 i;
+    u32 length;
+    u8* addr;
+
+    for (i = 0; i < 3; i++) {
+        kdebugserver_buffer[numChars++] = packet.buf[i];
+    }
+
+    if (kdebugserver_buffer[0] == 2) {
+        send((char*)&__osRunningThread->context, sizeof(__OSThreadContext));
+        numChars = 0;
+    } else if (numChars >= 9 && kdebugserver_buffer[0] == 1) {
+        addr = string_to_u32(&kdebugserver_buffer[1]);
+        length = string_to_u32(&kdebugserver_buffer[5]);
+        send(addr, length);
+        numChars = 0;
+    }
+}

symbol_addrs.txt

@@ -678,7 +678,6 @@ __osRdb_IP6_Empty = 0x80097f80; // size:0x4
 osViModePalLan1 = 0x80097f90; // size:0x50
 osViModeMpalLan1 = 0x80097fe0; // size:0x50
 osViModeNtscLan1 = 0x80098030; // size:0x50
-kdebugserver_data_0000 = 0x80098080; // size:0x4
 xprintf_data_0000 = 0x80098090;
 xprintf_data_0024 = 0x800980b4;
 dispatchTable = 0x800980e0; // size:0xe0

undefined_syms.txt

@@ -24,6 +24,7 @@ __osBaseTimer = 0x800cee90;
 piThreadStack = 0x800CD840;
 piRamRomThreadStack = 0x800CE9F0;
 gMapStreamMapIDTable = 0x800b972c;
+kdebugserver_buffer = 0x800cf110;
 
 __fstAddress = 0xA4970;
 __file1Address = 0xA4AA0;