iris: Initial cached EE implementation

Moderate gains across the board

Author: allkern

CMakeLists.txt

@@ -110,7 +110,7 @@ target_sources(iris PRIVATE
   src/dev/mtap.c
   src/dev/ps1_mcd.c
   src/dev/ps1_mcd.c
-  src/ee/ee.c
+  src/ee/ee_cached.cpp
   src/ee/bus.c
   src/ee/dmac.c
   src/ee/ee_dis.c

frontend/ui/control.cpp

@@ -8,6 +8,7 @@
 #include "res/IconsMaterialSymbols.h"
 
 #include "ee/ee_dis.h"
+#include "ee/ee_def.hpp"
 #include "iop/iop_dis.h"
 
 #define IM_RGB(r, g, b) ImVec4(((float)r / 255.0f), ((float)g / 255.0f), ((float)b / 255.0f), 1.0)

frontend/ui/memory.cpp

@@ -3,6 +3,7 @@
 #include <cctype>
 
 #include "iris.hpp"
+#include "ee/ee_def.hpp"
 
 #include "res/IconsMaterialSymbols.h"
 #include "memory_viewer.h"

frontend/ui/state.cpp

@@ -7,6 +7,7 @@
 #include "res/IconsMaterialSymbols.h"
 
 #include "ee/ee_dis.h"
+#include "ee/ee_def.hpp"
 #include "iop/iop_dis.h"
 
 #define IM_RGB(r, g, b) ImVec4(((float)r / 255.0f), ((float)g / 255.0f), ((float)b / 255.0f), 1.0)

main.cpp

@@ -9,6 +9,7 @@
 #include "elf.hpp"
 #include "config.hpp"
 #include "platform.hpp"
+#include "ee/ee_def.hpp"
 
 // ImGui includes
 #include "imgui.h"

src/ee/ee.h

@@ -130,96 +130,18 @@ union ee_fpu_reg {
     int32_t s32;
 };
 
-#ifdef _EE_USE_INTRINSICS
-#ifdef _MSC_VER
-#define EE_ALIGNED16 __declspec(align(16))
-#else
-#define EE_ALIGNED16 __attribute__((aligned(16)))
-#endif
-#else
-#define EE_ALIGNED16
-#endif
-
-struct ee_state {
-    struct ee_bus_s bus;
-
-    uint128_t r[32] EE_ALIGNED16;
-    uint128_t hi EE_ALIGNED16;
-    uint128_t lo EE_ALIGNED16;
-
-    uint64_t total_cycles;
-
-    uint32_t prev_pc;
-    uint32_t pc;
-    uint32_t next_pc;
-    uint32_t opcode;
-    uint64_t sa;
-    int branch, branch_taken, delay_slot;
-
-    struct ps2_ram* scratchpad;
-
-    int cpcond0;
-
-    union {
-        uint32_t cop0_r[32];
-    
-        struct {
-            uint32_t index;
-            uint32_t random;
-            uint32_t entrylo0;
-            uint32_t entrylo1;
-            uint32_t context;
-            uint32_t pagemask;
-            uint32_t wired;
-            uint32_t unused7;
-            uint32_t badvaddr;
-            uint32_t count;
-            uint32_t entryhi;
-            uint32_t compare;
-            uint32_t status;
-            uint32_t cause;
-            uint32_t epc;
-            uint32_t prid;
-            uint32_t config;
-            uint32_t unused16;
-            uint32_t unused17;
-            uint32_t unused18;
-            uint32_t unused19;
-            uint32_t unused20;
-            uint32_t unused21;
-            uint32_t badpaddr;
-            uint32_t debug;
-            uint32_t perf;
-            uint32_t unused25;
-            uint32_t unused26;
-            uint32_t taglo;
-            uint32_t taghi;
-            uint32_t errorepc;
-            uint32_t unused30;
-            uint32_t unused31;
-        };
-    };
-
-    union ee_fpu_reg f[32];
-    union ee_fpu_reg a;
-
-    uint32_t fcr;
-
-    struct vu_state* vu0;
-    struct vu_state* vu1;
-
-    struct ee_vtlb_entry vtlb[48];
-};
+struct ee_state;
 
 struct ee_state* ee_create(void);
 void ee_init(struct ee_state* ee, struct vu_state* vu0, struct vu_state* vu1, struct ee_bus_s bus);
-void ee_cycle(struct ee_state* ee);
 void ee_reset(struct ee_state* ee);
 void ee_destroy(struct ee_state* ee);
 void ee_set_int0(struct ee_state* ee, int v);
 void ee_set_int1(struct ee_state* ee, int v);
 void ee_set_cpcond0(struct ee_state* ee, int v);
-void ee_run_block(struct ee_state* ee, int cycles);
+uint32_t ee_get_pc(struct ee_state* ee);
+struct ps2_ram* ee_get_spr(struct ee_state* ee);
+int ee_run_block(struct ee_state* ee, int cycles);
 
 #undef EE_ALIGNED16