Attempt to get it working with MSVC

Author: kode54

ai/ai_controller.h

@@ -25,6 +25,8 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include "osal/preproc.h"
+
 struct r4300_core;
 struct ri_controller;
 struct vi_controller;
@@ -63,7 +65,7 @@ struct ai_controller
     struct vi_controller* vi;
 };
 
-static inline uint32_t ai_reg(uint32_t address)
+static osal_inline uint32_t ai_reg(uint32_t address)
 {
     return (address & 0xffff) >> 2;
 }

api/callbacks.c

@@ -63,7 +63,11 @@ void DebugMessage(usf_state_t * state, int level, const char *message, ...)
     state->error_message[ len++ ] = '\n';
 
   va_start(args, message);
+#if _MSC_VER >= 1300
+  vsprintf_s(state->error_message + len, 16384 - len, message, args);
+#else
   vsprintf(state->error_message + len, message, args);
+#endif
   va_end(args);
 
   state->last_error = state->error_message;

main/main.c

@@ -134,7 +134,7 @@ m64p_error main_start(usf_state_t * state)
     to_little_endian_buffer(&RDRAMSize, 4, 1);
 
     /* take the r4300 emulator mode from the config file at this point and cache it in a global variable */
-    state->r4300emu = 0;
+    state->r4300emu = 2;
 
     /* set some other core parameters based on the config file values */
     state->no_compiled_jump = 0;

main/savestates.c

@@ -347,7 +347,9 @@ static int savestates_load_pj64(usf_state_t * state, unsigned char * ptr, unsign
     char buffer[1024];
     unsigned int vi_timer, SaveRDRAMSize;
     int i;
+#ifdef DYNAREC
     unsigned long long dummy;
+#endif
 
     unsigned char header[8];
 
@@ -611,9 +613,13 @@ static int savestates_load_pj64(usf_state_t * state, unsigned char * ptr, unsign
         for (i = 0; i < 0x100000; i++)
             state->invalid_code[i] = 1;
     }
+#ifdef DYNAREC
     *(void **)&state->return_address = (void *)&dummy;
+#endif
     generic_jump_to(state, state->last_addr);
-    *(void **)&state->return_address = (void *)0;
+#ifdef DYNAREC
+	*(void **)&state->return_address = (void *)0;
+#endif
 #endif
 
     // assert(savestateData+savestateSize == curr)

memory/memory.c

@@ -59,15 +59,17 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include "osal/preproc.h"
+
 typedef int (*readfn)(void*,uint32_t,uint32_t*);
 typedef int (*writefn)(void*,uint32_t,uint32_t,uint32_t);
 
-static inline unsigned int bshift(uint32_t address)
+static osal_inline unsigned int bshift(uint32_t address)
 {
     return ((address & 3) ^ 3) << 3;
 }
 
-static inline unsigned int hshift(uint32_t address)
+static osal_inline unsigned int hshift(uint32_t address)
 {
     return ((address & 2) ^ 2) << 3;
 }

memory/memory.h

@@ -58,7 +58,9 @@
 
 #endif
 
-static inline void masked_write(uint32_t* dst, uint32_t value, uint32_t mask)
+#include "osal/preproc.h"
+
+static osal_inline void masked_write(uint32_t* dst, uint32_t value, uint32_t mask)
 {
     *dst = (*dst & ~mask) | (value & mask);
 }

pi/cart_rom.h

@@ -25,6 +25,8 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include "osal/preproc.h"
+
 struct cart_rom
 {
     uint8_t* rom;
@@ -33,7 +35,7 @@ struct cart_rom
     uint32_t last_write;
 };
 
-static inline uint32_t rom_address(uint32_t address)
+static osal_inline uint32_t rom_address(uint32_t address)
 {
     return (address & 0x03fffffc);
 }

pi/pi_controller.h

@@ -58,7 +58,9 @@ struct pi_controller
     struct ri_controller* ri;
 };
 
-static inline uint32_t pi_reg(uint32_t address)
+#include "osal/preproc.h"
+
+static osal_inline uint32_t pi_reg(uint32_t address)
 {
     return (address & 0xffff) >> 2;
 }

prj/msvc/.gitignore

@@ -0,0 +1,3 @@
+Debug
+Release
+*.user