merge from libretro fork

[pcsx_rearmed.git] / libpcsxcore / psxhle.c

diff --git a/libpcsxcore/psxhle.c b/libpcsxcore/psxhle.c
index 064d401..7ca81b4 100644 (file)
--- a/libpcsxcore/psxhle.c
+++ b/libpcsxcore/psxhle.c
@@ -23,6 +23,12 @@
 
 #include "psxhle.h"
 
+#if 0
+#define PSXHLE_LOG SysPrintf
+#else
+#define PSXHLE_LOG(...)
+#endif
+
 static void hleDummy() {
        psxRegs.pc = psxRegs.GPR.n.ra;
 
@@ -54,10 +60,10 @@ static void hleC0() {
 }
 
 static void hleBootstrap() { // 0xbfc00000
-       SysPrintf("hleBootstrap\n");
+       PSXHLE_LOG("hleBootstrap\n");
        CheckCdrom();
        LoadCdrom();
-       SysPrintf("CdromLabel: \"%s\": PC = %8.8lx (SP = %8.8lx)\n", CdromLabel, psxRegs.pc, psxRegs.GPR.n.sp);
+       PSXHLE_LOG("CdromLabel: \"%s\": PC = %8.8lx (SP = %8.8lx)\n", CdromLabel, psxRegs.pc, psxRegs.GPR.n.sp);
 }
 
 typedef struct {                   
@@ -77,7 +83,7 @@ typedef struct {
 static void hleExecRet() {
        EXEC *header = (EXEC*)PSXM(psxRegs.GPR.n.s0);
 
-       SysPrintf("ExecRet %x: %x\n", psxRegs.GPR.n.s0, header->ret);
+       PSXHLE_LOG("ExecRet %x: %x\n", psxRegs.GPR.n.s0, header->ret);
 
        psxRegs.GPR.n.ra = header->ret;
        psxRegs.GPR.n.sp = header->_sp;
@@ -89,7 +95,7 @@ static void hleExecRet() {
        psxRegs.pc = psxRegs.GPR.n.ra;
 }
 
-void (* const psxHLEt[])() = {
+void (* const psxHLEt[8])() = {
        hleDummy, hleA0, hleB0, hleC0,
        hleBootstrap, hleExecRet,
        hleDummy, hleDummy