RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 07:17:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

32x: improved lockstep mode, allows compatibility over 50%

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@797 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2009-09-30 15:42:32 +00:00
parent 2ea2cbfe8b
commit c987bb5c36
7 changed files with 55 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

29
pico/32x/32x.c
View file

@ -127,27 +127,38 @@ static __inline void SekRunM68k(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) * 9 / 4)
#define CYCLES_M68K2SH2(x) ((x) * 6 / 4)
#define PICO_32X
#define RUN_SH2S_SIMPLE(m68k_cycles) \
#define CPUS_RUN_SIMPLE(m68k_cycles,s68k_cycles) \
SekRunM68k(m68k_cycles); \
if (!(Pico32x.emu_flags & (P32XF_MSH2POLL|P32XF_MSH2VPOLL))) \
sh2_execute(&msh2, CYCLES_M68K2SH2(m68k_cycles)); \
if (!(Pico32x.emu_flags & (P32XF_SSH2POLL|P32XF_SSH2VPOLL))) \
sh2_execute(&ssh2, CYCLES_M68K2SH2(m68k_cycles))
#define STEP 66
#define RUN_SH2S_LOCKSTEP(m68k_cycles) \
#define STEP_68K 24
#define CPUS_RUN_LOCKSTEP(m68k_cycles,s68k_cycles) \
{ \
int i; \
for (i = 0; i < CYCLES_M68K2SH2(m68k_cycles); i+= STEP) { \
sh2_execute(&msh2, STEP); \
sh2_execute(&ssh2, STEP); \
for (i = 0; i <= (m68k_cycles) - STEP_68K; i += STEP_68K) { \
SekRunM68k(STEP_68K); \
if (!(Pico32x.emu_flags & (P32XF_MSH2POLL|P32XF_MSH2VPOLL))) \
sh2_execute(&msh2, CYCLES_M68K2SH2(STEP_68K)); \
if (!(Pico32x.emu_flags & (P32XF_SSH2POLL|P32XF_SSH2VPOLL))) \
sh2_execute(&ssh2, CYCLES_M68K2SH2(STEP_68K)); \
} \
/* last step */ \
i = (m68k_cycles) - i; \
SekRunM68k(i); \
if (!(Pico32x.emu_flags & (P32XF_MSH2POLL|P32XF_MSH2VPOLL))) \
sh2_execute(&msh2, CYCLES_M68K2SH2(i)); \
if (!(Pico32x.emu_flags & (P32XF_SSH2POLL|P32XF_SSH2VPOLL))) \
sh2_execute(&ssh2, CYCLES_M68K2SH2(i)); \
}
#define RUN_SH2S RUN_SH2S_SIMPLE
//#define RUN_SH2S RUN_SH2S_LOCKSTEP
//#define CPUS_RUN CPUS_RUN_SIMPLE
#define CPUS_RUN CPUS_RUN_LOCKSTEP
#include "../pico_cmn.c"

4
pico/32x/draw.c
View file

@ -42,6 +42,10 @@ void FinalizeLine32xRGB555(int sh, int line)
if ((Pico32x.vdp_regs[0] & P32XV_Mx) == 0)
return; // blanking
// XXX: how is 32col mode hadled by real hardware?
if (!(Pico.video.reg[12] & 1))
return;
if (!(PicoDrawMask & PDRAW_32X_ON))
return;

22
pico/32x/memory.c
View file

@ -1,6 +1,13 @@
#include "../pico_int.h"
#include "../memory.h"
#if 1
#undef ash2_end_run
#undef SekEndRun
#define ash2_end_run(x)
#define SekEndRun(x)
#endif
static const char str_mars[] = "MARS";
struct Pico32xMem *Pico32xMem;
@ -35,9 +42,10 @@ static int p32x_poll_detect(struct poll_det *pd, u32 a, u32 cycles, int is_vdp)
Pico32x.emu_flags |= flag;
}
}
else
else {
pd->cnt = 0;
pd->addr = a;
pd->addr = a;
}
pd->cycles = cycles;
return ret;
@ -348,7 +356,9 @@ static u32 p32x_sh2reg_read16(u32 a, int cpuid)
switch (a) {
case 0x00: // adapter/irq ctl
return (r[0] & P32XS_FM) | Pico32x.sh2_regs[0] | Pico32x.sh2irq_mask[cpuid];
case 0x04: // H count
case 0x04: // H count (often as comm too)
if (p32x_poll_detect(&sh2_poll[cpuid], a, ash2_cycles_done(), 0))
ash2_end_run(8);
return Pico32x.sh2_regs[4 / 2];
case 0x10: // DREQ len
return r[a / 2];
@ -387,6 +397,7 @@ static void p32x_sh2reg_write8(u32 a, u32 d, int cpuid)
return;
case 5: // H count
Pico32x.sh2_regs[4 / 2] = d & 0xff;
p32x_poll_undetect(&sh2_poll[cpuid ^ 1], 0);
return;
}
@ -730,7 +741,8 @@ u32 p32x_sh2_read8(u32 a, int id)
if ((a & ~0xfff) == 0xc0000000)
return Pico32xMem->data_array[id][(a & 0xfff) ^ 1];
if ((a & 0xdffe0000) == 0x04000000) {
if ((a & 0xdffc0000) == 0x04000000) {
/* XXX: overwrite readable as normal? */
u8 *dram = (u8 *)Pico32xMem->dram[(Pico32x.vdp_regs[0x0a/2] & P32XV_FS) ^ 1];
return dram[(a & 0x1ffff) ^ 1];
}
@ -846,8 +858,8 @@ void p32x_sh2_write8(u32 a, u32 d, int id)
if (!(a & 0x20000) || d) {
dram = (u8 *)Pico32xMem->dram[(Pico32x.vdp_regs[0x0a/2] & P32XV_FS) ^ 1];
dram[(a & 0x1ffff) ^ 1] = d;
return;
}
return;
}
if ((a & ~0xfff) == 0xc0000000) {