X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Flightrec%2Fplugin.c;h=2a46942b7327099328b52512eabe0793604cd1b4;hb=e2b16a701e0031a3b4045e9d66ede4abf143b803;hp=ec991105ac4015b8bdd72818258f8862331f7076;hpb=c174cf6a6d5d5cc92ba9b67ceb155365630aa16d;p=pcsx_rearmed.git

diff --git a/libpcsxcore/lightrec/plugin.c b/libpcsxcore/lightrec/plugin.c
index ec991105..2a46942b 100644
--- a/libpcsxcore/lightrec/plugin.c
+++ b/libpcsxcore/lightrec/plugin.c
@@ -1,10 +1,15 @@
 #include <lightrec.h>
+#include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <signal.h>
 #include <assert.h>
 
+#if P_HAVE_MMAP
+#include <sys/mman.h>
+#endif
+
 #include "../cdrom.h"
 #include "../gpu.h"
 #include "../gte.h"
@@ -50,6 +55,8 @@
 psxRegisters psxRegs;
 Rcnt rcnts[4];
 
+void* code_buffer;
+
 static struct lightrec_state *lightrec_state;
 
 static char *name = "retroarch.exe";
@@ -57,8 +64,6 @@ static char *name = "retroarch.exe";
 static bool use_lightrec_interpreter;
 static bool use_pcsx_interpreter;
 static bool block_stepping;
-static u32 cycle_mult_to_pcsx; // 22.10 fractional
-static u32 cycle_mult_from_pcsx;
 
 enum my_cp2_opcodes {
 	OP_CP2_RTPS		= 0x01,
@@ -137,15 +142,9 @@ static bool has_interrupt(void)
 		(regs->cp0[12] & regs->cp0[13] & 0x0300);
 }
 
-static u32 cycles_pcsx_to_lightrec(u32 c)
-{
-	assert((u64)c * cycle_mult_from_pcsx <= (u32)-1);
-	return c * cycle_mult_from_pcsx >> 10;
-}
-
 static void lightrec_tansition_to_pcsx(struct lightrec_state *state)
 {
-	psxRegs.cycle += lightrec_current_cycle_count(state) * cycle_mult_to_pcsx >> 10;
+	psxRegs.cycle += lightrec_current_cycle_count(state) / 1024;
 	lightrec_reset_cycle_count(state, 0);
 }
 
@@ -156,8 +155,7 @@ static void lightrec_tansition_from_pcsx(struct lightrec_state *state)
 	if (block_stepping || cycles_left <= 0 || has_interrupt())
 		lightrec_set_exit_flags(state, LIGHTREC_EXIT_CHECK_INTERRUPT);
 	else {
-		lightrec_set_target_cycle_count(state,
-			cycles_pcsx_to_lightrec(cycles_left));
+		lightrec_set_target_cycle_count(state, cycles_left * 1024);
 	}
 }
 
@@ -284,7 +282,7 @@ static struct lightrec_mem_map lightrec_map[] = {
 	[PSX_MAP_HW_REGISTERS] = {
 		/* Hardware registers */
 		.pc = 0x1f801000,
-		.length = 0x2000,
+		.length = 0x8000,
 		.ops = &hw_regs_ops,
 	},
 	[PSX_MAP_CACHE_CONTROL] = {
@@ -310,6 +308,15 @@ static struct lightrec_mem_map lightrec_map[] = {
 		.length = 0x200000,
 		.mirror_of = &lightrec_map[PSX_MAP_KERNEL_USER_RAM],
 	},
+
+	/* Mirror of the parallel port. Only used by the PS2/PS3 BIOS */
+	[PSX_MAP_PPORT_MIRROR] = {
+		.pc = 0x1fa00000,
+		.length = 0x10000,
+		.mirror_of = &lightrec_map[PSX_MAP_PARALLEL_PORT],
+	},
+
+	/* Code buffer */
 	[PSX_MAP_CODE_BUFFER] = {
 		.length = CODE_BUFFER_SIZE,
 	},
@@ -399,10 +406,29 @@ 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
 };
 
 static int lightrec_plugin_init(void)
@@ -413,13 +439,28 @@ static int lightrec_plugin_init(void)
 	lightrec_map[PSX_MAP_HW_REGISTERS].address = psxH + 0x1000;
 	lightrec_map[PSX_MAP_PARALLEL_PORT].address = psxP;
 
+	if (!LIGHTREC_CUSTOM_MAP) {
+#if P_HAVE_MMAP
+		code_buffer = mmap(0, CODE_BUFFER_SIZE,
+				   PROT_EXEC | PROT_READ | PROT_WRITE,
+				   MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+		if (code_buffer == MAP_FAILED)
+			return -ENOMEM;
+#else
+		code_buffer = malloc(CODE_BUFFER_SIZE);
+		if (!code_buffer)
+			return -ENOMEM;
+#endif
+	}
+
 	if (LIGHTREC_CUSTOM_MAP) {
 		lightrec_map[PSX_MAP_MIRROR1].address = psxM + 0x200000;
 		lightrec_map[PSX_MAP_MIRROR2].address = psxM + 0x400000;
 		lightrec_map[PSX_MAP_MIRROR3].address = psxM + 0x600000;
-		lightrec_map[PSX_MAP_CODE_BUFFER].address = code_buffer;
 	}
 
+	lightrec_map[PSX_MAP_CODE_BUFFER].address = code_buffer;
+
 	use_lightrec_interpreter = !!getenv("LIGHTREC_INTERPRETER");
 
 	lightrec_state = lightrec_init(name,
@@ -456,7 +497,7 @@ static void lightrec_plugin_execute_internal(bool block_only)
 	if (use_pcsx_interpreter) {
 		intExecuteBlock(0);
 	} else {
-		u32 cycles_lightrec = cycles_pcsx_to_lightrec(cycles_pcsx);
+		u32 cycles_lightrec = cycles_pcsx * 1024;
 		if (unlikely(use_lightrec_interpreter)) {
 			psxRegs.pc = lightrec_run_interpreter(lightrec_state,
 							      psxRegs.pc,
@@ -534,13 +575,21 @@ static void lightrec_plugin_apply_config()
 	u32 cycle_mult = Config.cycle_multiplier_override && Config.cycle_multiplier == CYCLE_MULT_DEFAULT
 		? Config.cycle_multiplier_override : Config.cycle_multiplier;
 	assert(cycle_mult);
-	cycle_mult_to_pcsx = (cycle_mult * 1024 + 199) / 200;
-	cycle_mult_from_pcsx = (200 * 1024 + cycle_mult/2) / cycle_mult;
+
+	lightrec_set_cycles_per_opcode(lightrec_state, cycle_mult * 1024 / 100);
 }
 
 static void lightrec_plugin_shutdown(void)
 {
 	lightrec_destroy(lightrec_state);
+
+	if (!LIGHTREC_CUSTOM_MAP) {
+#if P_HAVE_MMAP
+		munmap(code_buffer, CODE_BUFFER_SIZE);
+#else
+		free(code_buffer);
+#endif
+	}
 }
 
 static void lightrec_plugin_reset(void)