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

handle 32x+cd

Browse source
This commit is contained in:
notaz 2013-09-13 03:06:33 +03:00
parent 87650acd75
commit fa8fb75445
11 changed files with 191 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pico/cd/mcd.c
View file

@ -250,7 +250,7 @@ int pcd_sync_s68k(unsigned int m68k_target, int m68k_poll_sync)
static void SekSyncM68k(void);
static inline void pcd_run_cpus_normal(int m68k_cycles)
void pcd_run_cpus_normal(int m68k_cycles)
{
SekCycleAim += m68k_cycles;
if (SekShouldInterrupt() || Pico_mcd->m.m68k_poll_cnt < 12)
@ -269,7 +269,7 @@ static inline void pcd_run_cpus_normal(int m68k_cycles)
SekSyncM68k();
}
static inline void pcd_run_cpus_lockstep(int m68k_cycles)
void pcd_run_cpus_lockstep(int m68k_cycles)
{
unsigned int target = SekCycleAim + m68k_cycles;
do {

21
pico/cd/memory.c
View file

@ -28,11 +28,6 @@ MAKE_68K_WRITE32(s68k_write32, s68k_write16_map)
// provided by ASM code:
#ifdef _ASM_CD_MEMORY_C
u32 PicoReadM68k8_io(u32 a);
u32 PicoReadM68k16_io(u32 a);
void PicoWriteM68k8_io(u32 a, u32 d);
void PicoWriteM68k16_io(u32 a, u32 d);
u32 PicoReadS68k8_pr(u32 a);
u32 PicoReadS68k16_pr(u32 a);
void PicoWriteS68k8_pr(u32 a, u32 d);
@ -566,7 +561,7 @@ static void PicoWriteM68k16_ramc(u32 a, u32 d)
// IO/control/cd registers (a10000 - ...)
#ifndef _ASM_CD_MEMORY_C
static u32 PicoReadM68k8_io(u32 a)
u32 PicoRead8_mcd_io(u32 a)
{
u32 d;
if ((a & 0xff00) == 0x2000) { // a12000 - a120ff
@ -583,7 +578,7 @@ static u32 PicoReadM68k8_io(u32 a)
return PicoRead8_io(a);
}
static u32 PicoReadM68k16_io(u32 a)
u32 PicoRead16_mcd_io(u32 a)
{
u32 d;
if ((a & 0xff00) == 0x2000) {
@ -596,7 +591,7 @@ static u32 PicoReadM68k16_io(u32 a)
return PicoRead16_io(a);
}
static void PicoWriteM68k8_io(u32 a, u32 d)
void PicoWrite8_mcd_io(u32 a, u32 d)
{
if ((a & 0xff00) == 0x2000) { // a12000 - a120ff
elprintf(EL_CDREGS, "m68k_regs w8: [%02x] %02x @%06x",
@ -608,7 +603,7 @@ static void PicoWriteM68k8_io(u32 a, u32 d)
PicoWrite16_io(a, d);
}
static void PicoWriteM68k16_io(u32 a, u32 d)
void PicoWrite16_mcd_io(u32 a, u32 d)
{
if ((a & 0xff00) == 0x2000) { // a12000 - a120ff
elprintf(EL_CDREGS, "m68k_regs w16: [%02x] %04x @%06x",
@ -1057,10 +1052,10 @@ PICO_INTERNAL void PicoMemSetupCD(void)
}
// registers/IO:
cpu68k_map_set(m68k_read8_map, 0xa10000, 0xa1ffff, PicoReadM68k8_io, 1);
cpu68k_map_set(m68k_read16_map, 0xa10000, 0xa1ffff, PicoReadM68k16_io, 1);
cpu68k_map_set(m68k_write8_map, 0xa10000, 0xa1ffff, PicoWriteM68k8_io, 1);
cpu68k_map_set(m68k_write16_map, 0xa10000, 0xa1ffff, PicoWriteM68k16_io, 1);
cpu68k_map_set(m68k_read8_map, 0xa10000, 0xa1ffff, PicoRead8_mcd_io, 1);
cpu68k_map_set(m68k_read16_map, 0xa10000, 0xa1ffff, PicoRead16_mcd_io, 1);
cpu68k_map_set(m68k_write8_map, 0xa10000, 0xa1ffff, PicoWrite8_mcd_io, 1);
cpu68k_map_set(m68k_write16_map, 0xa10000, 0xa1ffff, PicoWrite16_mcd_io, 1);
// sub68k map
cpu68k_map_set(s68k_read8_map, 0x000000, 0xffffff, s68k_unmapped_read8, 1);

16
pico/cd/memory_arm.s
View file

@ -11,10 +11,10 @@
.text
.align 2
.global PicoReadM68k8_io
.global PicoReadM68k16_io
.global PicoWriteM68k8_io
.global PicoWriteM68k16_io
.global PicoRead8_mcd_io
.global PicoRead16_mcd_io
.global PicoWrite8_mcd_io
.global PicoWrite16_mcd_io
.global PicoReadS68k8_pr
.global PicoReadS68k16_pr
@ -134,7 +134,7 @@ PicoReadM68k8_cell1: @ 0x220000 - 0x23ffff, cell arranged
bx lr
PicoReadM68k8_io:
PicoRead8_mcd_io:
and r1, r0, #0xff00
cmp r1, #0x2000 @ a120xx?
bne PicoRead8_io
@ -244,7 +244,7 @@ PicoReadM68k16_cell1: @ 0x220000 - 0x23ffff, cell arranged
bx lr
PicoReadM68k16_io:
PicoRead16_mcd_io:
and r1, r0, #0xff00
cmp r1, #0x2000 @ a120xx
bne PicoRead16_io
@ -335,7 +335,7 @@ PicoWriteM68k8_cell1: @ 0x220000 - 0x23ffff, cell arranged
bx lr
PicoWriteM68k8_io:
PicoWrite8_mcd_io:
and r2, r0, #0xff00
cmp r2, #0x2000 @ a120xx?
beq m68k_reg_write8
@ -362,7 +362,7 @@ PicoWriteM68k16_cell1: @ 0x220000 - 0x23ffff, cell arranged
bx lr
PicoWriteM68k16_io:
PicoWrite16_mcd_io:
and r2, r0, #0xff00
cmp r2, #0x2000 @ a120xx?
bne PicoWrite16_io