More WIP linux work, upgraded libultra to include changes from BT recomp

include/recomp.h

@@ -46,8 +46,8 @@ typedef uint64_t gpr;
     //(*(uint8_t*)(rdram + ((((reg) + (offset)) ^ 3) & 0x3FFFFFF)))
 
 #define SD(val, offset, reg) { \
-    *(uint32_t*)(rdram + ((((reg) + (offset) + 4)) - 0xFFFFFFFF80000000)) = (uint32_t)((val) >> 0); \
-    *(uint32_t*)(rdram + ((((reg) + (offset) + 0)) - 0xFFFFFFFF80000000)) = (uint32_t)((val) >> 32); \
+    *(uint32_t*)(rdram + ((((reg) + (offset) + 4)) - 0xFFFFFFFF80000000)) = (uint32_t)((gpr)(val) >> 0); \
+    *(uint32_t*)(rdram + ((((reg) + (offset) + 0)) - 0xFFFFFFFF80000000)) = (uint32_t)((gpr)(val) >> 32); \
 }
 
 //#define SD(val, offset, reg) { \
@@ -239,15 +239,26 @@ typedef struct {
         r8,  r9,  r10, r11, r12, r13, r14, r15,
         r16, r17, r18, r19, r20, r21, r22, r23,
         r24, r25, r26, r27, r28, r29, r30, r31;
-    fpr f0,  f2,  f4,  f6,  f8,  f10, f12, f14,
-        f16, f18, f20, f22, f24, f26, f28, f30;
+    fpr f0,  f1,  f2,  f3,  f4,  f5,  f6,  f7,
+        f8,  f9,  f10, f11, f12, f13, f14, f15,
+        f16, f17, f18, f19, f20, f21, f22, f23,
+        f24, f25, f26, f27, f28, f29, f30, f31;
     uint64_t hi, lo;
+    uint32_t* f_odd;
+    uint32_t status_reg;
+    uint8_t mips3_float_mode;
 } recomp_context;
 
+// Checks if the target is an even float register or that mips3 float mode is enabled
+#define CHECK_FR(ctx, idx) \
+    assert(((idx) & 1) == 0 || (ctx)->mips3_float_mode)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+void cop0_status_write(recomp_context* ctx, gpr value);
+gpr cop0_status_read(recomp_context* ctx);
 void switch_error(const char* func, uint32_t vram, uint32_t jtbl);
 void do_break(uint32_t vram);
 
@@ -272,6 +283,9 @@ extern int32_t section_addresses[];
 #define RELOC_LO16(section_index, offset) \
     LO16(section_addresses[section_index] + (offset))
 
+// For Banjo-Tooie
+void recomp_syscall_handler(uint8_t* rdram, recomp_context* ctx, int32_t instruction_vram);
+
 // For the Mario Party games (not working)
 //// This has to be in this file so it can be inlined
 //struct jmp_buf_storage {

include/rsp.h

@@ -8,7 +8,8 @@ enum class RspExitReason {
     Invalid,
     Broke,
     ImemOverrun,
-    UnhandledJumpTarget
+    UnhandledJumpTarget,
+    Unsupported
 };
 
 extern uint8_t dmem[];
@@ -16,19 +17,19 @@ extern uint16_t rspReciprocals[512];
 extern uint16_t rspInverseSquareRoots[512];
 
 #define RSP_MEM_W(offset, addr) \
-    (*reinterpret_cast<uint32_t*>(dmem + (offset) + (addr)))
+    (*reinterpret_cast<uint32_t*>(dmem + (0xFFF & ((offset) + (addr)))))
 
 #define RSP_MEM_H(offset, addr) \
-    (*reinterpret_cast<int16_t*>(dmem + (((offset) + (addr)) ^ 2)))
+    (*reinterpret_cast<int16_t*>(dmem + (0xFFF & (((offset) + (addr)) ^ 2))))
 
 #define RSP_MEM_HU(offset, addr) \
-    (*reinterpret_cast<uint16_t*>(dmem + (((offset) + (addr)) ^ 2)))
+    (*reinterpret_cast<uint16_t*>(dmem + (0xFFF & (((offset) + (addr)) ^ 2))))
 
 #define RSP_MEM_B(offset, addr) \
-    (*reinterpret_cast<int8_t*>(dmem + (((offset) + (addr)) ^ 3)))
+    (*reinterpret_cast<int8_t*>(dmem + (0xFFF & (((offset) + (addr)) ^ 3))))
 
 #define RSP_MEM_BU(offset, addr) \
-    (*reinterpret_cast<uint8_t*>(dmem + (((offset) + (addr)) ^ 3)))
+    (*reinterpret_cast<uint8_t*>(dmem + (0xFFF & (((offset) + (addr)) ^ 3))))
     
 #define RSP_ADD32(a, b) \
     ((int32_t)((a) + (b)))

include/rt64_layer.h

@@ -1,11 +1,13 @@
 #ifndef __RT64_LAYER_H__
 #define __RT64_LAYER_H__
 
-typedef struct {
-    void* hWnd;
-    void* hStatusBar;
+#include "../portultra/multilibultra.hpp"
 
-    int Reserved;
+typedef struct {
+    // void* hWnd;
+    // void* hStatusBar;
+
+    // int Reserved;
 
     unsigned char* HEADER;  /* This is the rom header (first 40h bytes of the rom) */
     unsigned char* RDRAM;
@@ -40,9 +42,9 @@ typedef struct {
 
     void (*CheckInterrupts)(void);
 
-    // unsigned int version;
-    // unsigned int* SP_STATUS_REG;
-    // const unsigned int* RDRAM_SIZE;
+    unsigned int version;
+    unsigned int* SP_STATUS_REG;
+    const unsigned int* RDRAM_SIZE;
 } GFX_INFO;
 
 #ifdef _WIN32
@@ -61,7 +63,7 @@ typedef struct {
 //DLLEXPORT void (CALL *UpdateScreen)(void) = nullptr;
 //DLLEXPORT void (CALL *PumpEvents)(void) = nullptr;
 
-DLLIMPORT int InitiateGFX(GFX_INFO Gfx_Info);
+extern "C" int InitiateGFXLinux(GFX_INFO Gfx_Info, Window window, Display *display);
 DLLIMPORT void ProcessRDPList(void);
 DLLIMPORT void ProcessDList(void);
 DLLIMPORT void UpdateScreen(void);