psxinterpreter: use cycle_multiplier also

[pcsx_rearmed.git] / libpcsxcore / psxcommon.h

diff --git a/libpcsxcore/psxcommon.h b/libpcsxcore/psxcommon.h
index 9f5444e..382d919 100644 (file)
--- a/libpcsxcore/psxcommon.h
+++ b/libpcsxcore/psxcommon.h
@@ -31,6 +31,17 @@ extern "C" {
 
 #include "config.h"
 
+// XXX: don't care but maybe fix it someday
+#if defined(__GNUC__) && __GNUC__ >= 8
+#pragma GCC diagnostic ignored "-Wformat-truncation"
+#pragma GCC diagnostic ignored "-Wformat-overflow"
+#pragma GCC diagnostic ignored "-Wstringop-truncation"
+#endif
+// devkitpro has uint32_t as long, unfortunately
+#ifdef _3DS
+#pragma GCC diagnostic ignored "-Wformat"
+#endif
+
 // System includes
 #include <stdio.h>
 #include <string.h>
@@ -99,6 +110,8 @@ extern int Log;
 
 void __Log(char *fmt, ...);
 
+#define CYCLE_MULT_DEFAULT 175
+
 typedef struct {
        char Gpu[MAXPATHLEN];
        char Spu[MAXPATHLEN];
@@ -106,7 +119,7 @@ typedef struct {
        char Pad1[MAXPATHLEN];
        char Pad2[MAXPATHLEN];
        char Net[MAXPATHLEN];
-    char Sio1[MAXPATHLEN];
+       char Sio1[MAXPATHLEN];
        char Mcd1[MAXPATHLEN];
        char Mcd2[MAXPATHLEN];
        char Bios[MAXPATHLEN];
@@ -114,17 +127,18 @@ typedef struct {
        char PluginsDir[MAXPATHLEN];
        char PatchesDir[MAXPATHLEN];
        boolean Xa;
-       boolean Sio;
        boolean Mdec;
        boolean PsxAuto;
        boolean Cdda;
+       boolean CHD_Precache; /* loads disk image into memory, works with CHD only. */
        boolean HLE;
        boolean Debug;
        boolean PsxOut;
-       boolean SpuIrq;
-       boolean RCntFix;
        boolean UseNet;
-       boolean VSyncWA;
+       boolean icache_emulation;
+       boolean DisableStalls;
+       int cycle_multiplier; // 100 for 1.0
+       int cycle_multiplier_override;
        u8 Cpu; // CPU_DYNAREC or CPU_INTERPRETER
        u8 PsxType; // PSX_TYPE_NTSC or PSX_TYPE_PAL
 #ifdef _WIN32
@@ -149,10 +163,6 @@ extern struct PcsxSaveFuncs SaveFuncs;
        if (Mode == 0) SaveFuncs.read(f, ptr, size); \
 }
 
-// Make the timing events trigger faster as we are currently assuming everything
-// takes one cycle, which is not the case on real hardware.
-// FIXME: Count the proper cycle and get rid of this
-#define BIAS   2
 #define PSXCLK 33868800        /* 33.8688 MHz */
 
 enum {