#include "../psxmem.h"
#include "../r3000a.h"
#include "../psxinterpreter.h"
-#include "../new_dynarec/events.h"
+#include "../psxhle.h"
+#include "../psxevents.h"
#include "../frontend/main.h"
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;
+
+extern u32 lightrec_hacks;
enum my_cp2_opcodes {
OP_CP2_RTPS = 0x01,
(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);
}
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);
}
}
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);
}
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);
[PSX_MAP_HW_REGISTERS] = {
/* Hardware registers */
.pc = 0x1f801000,
- .length = 0x2000,
+ .length = 0x8000,
.ops = &hw_regs_ops,
},
[PSX_MAP_CACHE_CONTROL] = {
.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,
},
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) {
return 0;
}
+static void lightrec_plugin_sync_regs_to_pcsx(bool need_cp2);
+static void lightrec_plugin_sync_regs_from_pcsx(bool need_cp2);
+
static void lightrec_plugin_execute_internal(bool block_only)
{
struct lightrec_registers *regs;
regs = lightrec_get_registers(lightrec_state);
gen_interupt((psxCP0Regs *)regs->cp0);
+ if (!block_only && stop)
+ return;
+
cycles_pcsx = next_interupt - psxRegs.cycle;
assert((s32)cycles_pcsx > 0);
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,
}
if (flags & LIGHTREC_EXIT_SYSCALL)
- psxException(0x20, 0, (psxCP0Regs *)regs->cp0);
+ psxException(R3000E_Syscall << 2, 0, (psxCP0Regs *)regs->cp0);
+ if (flags & LIGHTREC_EXIT_BREAK)
+ psxException(R3000E_Bp << 2, 0, (psxCP0Regs *)regs->cp0);
+ else if (flags & LIGHTREC_EXIT_UNKNOWN_OP) {
+ u32 op = intFakeFetch(psxRegs.pc);
+ u32 hlec = op & 0x03ffffff;
+ if ((op >> 26) == 0x3b && hlec < ARRAY_SIZE(psxHLEt) && Config.HLE) {
+ lightrec_plugin_sync_regs_to_pcsx(0);
+ psxHLEt[hlec]();
+ lightrec_plugin_sync_regs_from_pcsx(0);
+ }
+ else
+ psxException(R3000E_RI << 2, 0, (psxCP0Regs *)regs->cp0);
+ }
}
if ((regs->cp0[13] & regs->cp0[12] & 0x300) && (regs->cp0[12] & 0x1)) {
static void lightrec_plugin_execute(void)
{
- extern int stop;
-
while (!stop)
lightrec_plugin_execute_internal(false);
}
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 */
lightrec_invalidate(lightrec_state, addr, size * 4);
}
-static void lightrec_plugin_sync_regs_to_pcsx(void);
-static void lightrec_plugin_sync_regs_from_pcsx(void);
-
static void lightrec_plugin_notify(enum R3000Anote note, void *data)
{
switch (note)
/* not used, lightrec calls lightrec_enable_ram() instead */
break;
case R3000ACPU_NOTIFY_BEFORE_SAVE:
- lightrec_plugin_sync_regs_to_pcsx();
+ /* non-null 'data' means this is HLE related sync */
+ lightrec_plugin_sync_regs_to_pcsx(data == NULL);
break;
case R3000ACPU_NOTIFY_AFTER_LOAD:
- lightrec_plugin_sync_regs_from_pcsx();
+ lightrec_plugin_sync_regs_from_pcsx(data == NULL);
+ if (data == NULL)
+ lightrec_invalidate_all(lightrec_state);
break;
}
}
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)
regs->cp0[12] = 0x10900000; // COP0 enabled | BEV = 1 | TS = 1
regs->cp0[15] = 0x00000002; // PRevID = Revision ID, same as R3000A
+
+ lightrec_set_unsafe_opt_flags(lightrec_state, lightrec_hacks);
}
-static void lightrec_plugin_sync_regs_from_pcsx(void)
+static void lightrec_plugin_sync_regs_from_pcsx(bool need_cp2)
{
struct lightrec_registers *regs;
regs = lightrec_get_registers(lightrec_state);
- memcpy(regs->cp2d, &psxRegs.CP2, sizeof(regs->cp2d) + sizeof(regs->cp2c));
- memcpy(regs->cp0, &psxRegs.CP0, sizeof(regs->cp0));
memcpy(regs->gpr, &psxRegs.GPR, sizeof(regs->gpr));
-
- lightrec_invalidate_all(lightrec_state);
+ memcpy(regs->cp0, &psxRegs.CP0, sizeof(regs->cp0));
+ if (need_cp2)
+ memcpy(regs->cp2d, &psxRegs.CP2, sizeof(regs->cp2d) + sizeof(regs->cp2c));
}
-static void lightrec_plugin_sync_regs_to_pcsx(void)
+static void lightrec_plugin_sync_regs_to_pcsx(bool need_cp2)
{
struct lightrec_registers *regs;
regs = lightrec_get_registers(lightrec_state);
- memcpy(&psxRegs.CP2, regs->cp2d, sizeof(regs->cp2d) + sizeof(regs->cp2c));
- memcpy(&psxRegs.CP0, regs->cp0, sizeof(regs->cp0));
memcpy(&psxRegs.GPR, regs->gpr, sizeof(regs->gpr));
+ memcpy(&psxRegs.CP0, regs->cp0, sizeof(regs->cp0));
+ if (need_cp2)
+ memcpy(&psxRegs.CP2, regs->cp2d, sizeof(regs->cp2d) + sizeof(regs->cp2c));
}
R3000Acpu psxRec =
notaz.gp2x.de / pcsx_rearmed.git / blobdiff