X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2F32x%2F32x.c;h=59aa142409f745981bb9b4ce0525bd0bc9f27aed;hb=fb7a7fea8735400818773dd47f1e6913bd1ceecf;hp=e7779b9fcf68c7950d33f9e637356208c2216b4f;hpb=1f1ff763e661bab664151c4821c65dad35777976;p=picodrive.git diff --git a/pico/32x/32x.c b/pico/32x/32x.c index e7779b9..59aa142 100644 --- a/pico/32x/32x.c +++ b/pico/32x/32x.c @@ -194,6 +194,7 @@ static __inline void run_m68k(int cyc) { pprof_start(m68k); +p32x_poll_event(3, 0); #if defined(EMU_C68K) PicoCpuCM68k.cycles = cyc; CycloneRun(&PicoCpuCM68k); @@ -210,7 +211,8 @@ static __inline void run_m68k(int cyc) // ~1463.8, but due to cache misses and slow mem // it's much lower than that //#define SH2_LINE_CYCLES 735 -#define CYCLES_M68K2SH2(x) ((x) * 6 / 4) +#define CYCLES_M68K2MSH2(x) (((x) * p32x_msh2_multiplier) >> 10) +#define CYCLES_M68K2SSH2(x) (((x) * p32x_ssh2_multiplier) >> 10) #define PICO_32X #define CPUS_RUN_SIMPLE(m68k_cycles,s68k_cycles) \ @@ -227,12 +229,12 @@ static __inline void run_m68k(int cyc) elprintf(EL_32X, "slice %d", slice); \ if (!(Pico32x.emu_flags & (P32XF_SSH2POLL|P32XF_SSH2VPOLL))) { \ pprof_start(ssh2); \ - sh2_execute(&ssh2, CYCLES_M68K2SH2(slice)); \ + sh2_execute(&ssh2, CYCLES_M68K2SSH2(slice)); \ pprof_end(ssh2); \ } \ if (!(Pico32x.emu_flags & (P32XF_MSH2POLL|P32XF_MSH2VPOLL))) { \ pprof_start(msh2); \ - sh2_execute(&msh2, CYCLES_M68K2SH2(slice)); \ + sh2_execute(&msh2, CYCLES_M68K2MSH2(slice)); \ pprof_end(msh2); \ } \ pprof_start(dummy); \