drc: don't leave until we really need to

[pcsx_rearmed.git] / libpcsxcore / new_dynarec / emu_if.c

diff --git a/libpcsxcore/new_dynarec/emu_if.c b/libpcsxcore/new_dynarec/emu_if.c
index 9b16537..a37f7a2 100644 (file)
--- a/libpcsxcore/new_dynarec/emu_if.c
+++ b/libpcsxcore/new_dynarec/emu_if.c
@@ -109,19 +109,20 @@ void gen_interupt()
                next_interupt, next_interupt - psxRegs.cycle);
 }
 
                next_interupt, next_interupt - psxRegs.cycle);
 }
 

-void MTC0_()
-{
-       extern void psxMTC0();
+// from interpreter
+extern void MTC0(int reg, u32 val);

 
 

-       evprintf("ari64 MTC0 %08x %08x %u\n", psxRegs.code, psxRegs.pc, psxRegs.cycle);
-       psxMTC0();
-       gen_interupt(); /* FIXME: checking pending irqs should be enough */
+void pcsx_mtc0(u32 reg)
+{
+       evprintf("MTC0 %d #%x @%08x %u\n", reg, readmem_word, psxRegs.pc, psxRegs.cycle);
+       MTC0(reg, readmem_word);
+       gen_interupt();

 }
 
 }
 

-void check_interupt()
+void pcsx_mtc0_ds(u32 reg)

 {
 {

-       /* FIXME (also asm) */
-       printf("ari64_check_interupt\n");
+       evprintf("MTC0 %d #%x @%08x %u\n", reg, readmem_word, psxRegs.pc, psxRegs.cycle);
+       MTC0(reg, readmem_word);

 }
 
 void new_dyna_save(void)
 }
 
 void new_dyna_save(void)


@@ -174,7 +175,9 @@ static void ari64_reset()
        pending_exception = 1;
 }
 
        pending_exception = 1;
 }
 

-static void ari64_execute()
+// execute until predefined leave points
+// (HLE softcall exit and BIOS fastboot end)
+static void ari64_execute_until()

 {
        schedule_timeslice();
 
 {
        schedule_timeslice();
 


@@ -187,10 +190,20 @@ static void ari64_execute()
                psxRegs.cycle, next_interupt, next_interupt - psxRegs.cycle);
 }
 
                psxRegs.cycle, next_interupt, next_interupt - psxRegs.cycle);
 }
 

+static void ari64_execute()
+{
+       while (!stop) {
+               ari64_execute_until();
+               evprintf("drc left @%08x\n", psxRegs.pc);
+       }
+}
+

 static void ari64_clear(u32 addr, u32 size)
 {
        u32 start, end;
 
 static void ari64_clear(u32 addr, u32 size)
 {
        u32 start, end;
 

+       size *= 4; /* PCSX uses DMA units */
+

        evprintf("ari64_clear %08x %04x\n", addr, size);
 
        /* check for RAM mirrors */
        evprintf("ari64_clear %08x %04x\n", addr, size);
 
        /* check for RAM mirrors */


@@ -226,7 +239,7 @@ R3000Acpu psxRec = {
        ari64_reset,
 #if defined(__arm__)
        ari64_execute,
        ari64_reset,
 #if defined(__arm__)
        ari64_execute,

-       ari64_execute,
+       ari64_execute_until,

 #else
        intExecuteT,
        intExecuteBlockT,
 #else
        intExecuteT,
        intExecuteBlockT,