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

32x: some hacks..

Browse source
This commit is contained in:
notaz 2013-08-18 02:43:52 +03:00
parent 77e58d93fe
commit 419973a6d6
3 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -523,6 +523,8 @@ void sync_sh2s_lockstep(unsigned int m68k_target)
#define CPUS_RUN(m68k_cycles,s68k_cycles) do { \ #define CPUS_RUN(m68k_cycles,s68k_cycles) do { \
SekRunM68k(m68k_cycles); \ SekRunM68k(m68k_cycles); \
if (Pico32x.emu_flags & P32XF_Z80_32X_IO) \
PicoSyncZ80(SekCycleCnt); \
if (Pico32x.emu_flags & (P32XF_68KCPOLL|P32XF_68KVPOLL)) \ if (Pico32x.emu_flags & (P32XF_68KCPOLL|P32XF_68KVPOLL)) \
p32x_sync_sh2s(SekCyclesDoneT2()); \ p32x_sync_sh2s(SekCyclesDoneT2()); \
} while (0) } while (0)

22
pico/32x/memory.c
View file

@ -195,8 +195,10 @@ static u32 p32x_reg_read16(u32 a)
m68k_poll.cnt = 0; m68k_poll.cnt = 0;
dr2 = SekDar(2); dr2 = SekDar(2);
if (cycles - msh2.m68krcycles_done > 500) if (cycles - msh2.m68krcycles_done > 244
|| (Pico32x.comm_dirty_68k & comreg))
p32x_sync_sh2s(cycles); p32x_sync_sh2s(cycles);
if (Pico32x.comm_dirty_sh2 & comreg) if (Pico32x.comm_dirty_sh2 & comreg)
Pico32x.comm_dirty_sh2 &= ~comreg; Pico32x.comm_dirty_sh2 &= ~comreg;
else if (m68k_poll_detect(a, cycles, P32XF_68KCPOLL)) { else if (m68k_poll_detect(a, cycles, P32XF_68KCPOLL)) {
@ -1523,6 +1525,21 @@ void REGPARM(3) p32x_sh2_write32(u32 a, u32 d, SH2 *sh2)
// ----------------------------------------------------------------- // -----------------------------------------------------------------
static void z80_md_bank_write_32x(unsigned int a, unsigned char d)
{
unsigned int addr68k;
addr68k = Pico.m.z80_bank68k << 15;
addr68k += a & 0x7fff;
if ((addr68k & 0xfff000) == 0xa15000)
Pico32x.emu_flags |= P32XF_Z80_32X_IO;
elprintf(EL_Z80BNK, "z80->68k w8 [%06x] %02x", addr68k, d);
m68k_write8(addr68k, d);
}
// -----------------------------------------------------------------
static const u16 msh2_code[] = { static const u16 msh2_code[] = {
// trap instructions // trap instructions
0xaffe, // bra <self> 0xaffe, // bra <self>
@ -1779,6 +1796,9 @@ void PicoMemSetup32x(void)
sh2_drc_mem_setup(&msh2); sh2_drc_mem_setup(&msh2);
sh2_drc_mem_setup(&ssh2); sh2_drc_mem_setup(&ssh2);
// z80 hack
z80_map_set(z80_write_map, 0x8000, 0xffff, z80_md_bank_write_32x, 1);
} }
void Pico32xMemStateLoaded(void) void Pico32xMemStateLoaded(void)

1
pico/pico_int.h
View file

@ -484,6 +484,7 @@ typedef struct
#define P32XF_68KCPOLL (1 << 0) #define P32XF_68KCPOLL (1 << 0)
#define P32XF_68KVPOLL (1 << 1) #define P32XF_68KVPOLL (1 << 1)
#define P32XF_Z80_32X_IO (1 << 7) // z80 does 32x io
#define P32XI_VRES (1 << 14/2) // IRL/2 #define P32XI_VRES (1 << 14/2) // IRL/2
#define P32XI_VINT (1 << 12/2) #define P32XI_VINT (1 << 12/2)