lightrec: Move lightrec_code_inv() out of glue code

[pcsx_rearmed.git] / libpcsxcore / lightrec / plugin.c

diff --git a/libpcsxcore/lightrec/plugin.c b/libpcsxcore/lightrec/plugin.c
index d51fbc2..200ce81 100644 (file)
--- a/libpcsxcore/lightrec/plugin.c
+++ b/libpcsxcore/lightrec/plugin.c
@@ -1,4 +1,3 @@
-#include <lightrec.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -10,6 +9,7 @@
 #include <sys/mman.h>
 #endif
 
+#include "lightrec.h"
 #include "../cdrom.h"
 #include "../gpu.h"
 #include "../gte.h"
@@ -20,7 +20,7 @@
 #include "../r3000a.h"
 #include "../psxinterpreter.h"
 #include "../psxhle.h"
-#include "../new_dynarec/events.h"
+#include "../psxevents.h"
 
 #include "../frontend/main.h"
 
@@ -68,6 +68,8 @@ static bool block_stepping;
 
 extern u32 lightrec_hacks;
 
+extern void lightrec_code_inv(void *ptr, uint32_t len);
+
 enum my_cp2_opcodes {
        OP_CP2_RTPS             = 0x01,
        OP_CP2_NCLIP            = 0x06,
@@ -163,7 +165,7 @@ static void lightrec_tansition_from_pcsx(struct lightrec_state *state)
 }
 
 static void hw_write_byte(struct lightrec_state *state,
-                         u32 op, void *host, u32 mem, u8 val)
+                         u32 op, void *host, u32 mem, u32 val)
 {
        lightrec_tansition_to_pcsx(state);
 
@@ -173,7 +175,7 @@ static void hw_write_byte(struct lightrec_state *state,
 }
 
 static void hw_write_half(struct lightrec_state *state,
-                         u32 op, void *host, u32 mem, u16 val)
+                         u32 op, void *host, u32 mem, u32 val)
 {
        lightrec_tansition_to_pcsx(state);
 
@@ -335,6 +337,14 @@ static void lightrec_enable_ram(struct lightrec_state *state, bool enable)
 
 static bool lightrec_can_hw_direct(u32 kaddr, bool is_write, u8 size)
 {
+       if (is_write && size != 32) {
+               // force32 so must go through handlers
+               if (0x1f801000 <= kaddr && kaddr < 0x1f801024)
+                       return false;
+               if ((kaddr & 0x1fffff80) == 0x1f801080) // dma
+                       return false;
+       }
+
        switch (size) {
        case 8:
                switch (kaddr) {
@@ -409,29 +419,11 @@ static bool lightrec_can_hw_direct(u32 kaddr, bool is_write, u8 size)
        }
 }
 
-#if defined(HW_DOL) || defined(HW_RVL)
-static void lightrec_code_inv(void *ptr, uint32_t len)
-{
-       extern void DCFlushRange(void *ptr, u32 len);
-       extern void ICInvalidateRange(void *ptr, u32 len);
-
-       DCFlushRange(ptr, len);
-       ICInvalidateRange(ptr, len);
-}
-#elif defined(HW_WUP)
-static void lightrec_code_inv(void *ptr, uint32_t len)
-{
-       wiiu_clear_cache(ptr, (void *)((uintptr_t)ptr + len));
-}
-#endif
-
 static const struct lightrec_ops lightrec_ops = {
        .cop2_op = cop2_op,
        .enable_ram = lightrec_enable_ram,
        .hw_direct = lightrec_can_hw_direct,
-#if defined(HW_DOL) || defined(HW_RVL) || defined(HW_WUP)
-       .code_inv = lightrec_code_inv,
-#endif
+       .code_inv = LIGHTREC_CODE_INV ? lightrec_code_inv : NULL,
 };
 
 static int lightrec_plugin_init(void)
@@ -563,7 +555,8 @@ static void lightrec_plugin_execute_block(enum blockExecCaller caller)
 
 static void lightrec_plugin_clear(u32 addr, u32 size)
 {
-       if (addr == 0 && size == UINT32_MAX)
+       if ((addr == 0 && size == UINT32_MAX)
+           || (lightrec_hacks & LIGHTREC_OPT_INV_DMA_ONLY))
                lightrec_invalidate_all(lightrec_state);
        else
                /* size * 4: PCSX uses DMA units */
@@ -592,11 +585,18 @@ static void lightrec_plugin_notify(enum R3000Anote note, void *data)
 
 static void lightrec_plugin_apply_config()
 {
+       static u32 cycles_per_op_old;
        u32 cycle_mult = Config.cycle_multiplier_override && Config.cycle_multiplier == CYCLE_MULT_DEFAULT
                ? Config.cycle_multiplier_override : Config.cycle_multiplier;
-       assert(cycle_mult);
+       u32 cycles_per_op = cycle_mult * 1024 / 100;
+       assert(cycles_per_op);
 
-       lightrec_set_cycles_per_opcode(lightrec_state, cycle_mult * 1024 / 100);
+       if (cycles_per_op_old && cycles_per_op_old != cycles_per_op) {
+               SysPrintf("lightrec: reinit block cache for cycles_per_op %.2f\n",
+                       cycles_per_op / 1024.f);
+       }
+       cycles_per_op_old = cycles_per_op;
+       lightrec_set_cycles_per_opcode(lightrec_state, cycles_per_op);
 }
 
 static void lightrec_plugin_shutdown(void)