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: sh2 irqs (irls), preliminary DMAC implementation

Browse source 
git-svn-id: file:///home/notaz/opt/svn/PicoDrive@786 be3aeb3a-fb24-0410-a615-afba39da0efa
This commit is contained in:
notaz 2009-09-20 18:13:06 +00:00
parent bca23c1c79
commit 4ea707e1e3
6 changed files with 335 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,6 +3,35 @@
struct Pico32x Pico32x;
static void sh2_irq_cb(int level)
{
// diagnostic for now
elprintf(EL_32X, "sh2 ack %d @ %08x", level, ash2_pc());
}
void p32x_update_irls(void)
{
int irqs, mlvl = 0, slvl = 0;
// msh2
irqs = (Pico32x.sh2irqs | Pico32x.sh2irqi[0]) & ((Pico32x.sh2irq_mask[0] << 3) | P32XI_VRES);
while ((irqs >>= 1))
mlvl++;
mlvl *= 2;
// ssh2
irqs = (Pico32x.sh2irqs | Pico32x.sh2irqi[1]) & ((Pico32x.sh2irq_mask[1] << 3) | P32XI_VRES);
while ((irqs >>= 1))
slvl++;
slvl *= 2;
elprintf(EL_32X, "update_irls: m %d, s %d", mlvl, slvl);
sh2_irl_irq(&msh2, mlvl);
if (mlvl)
p32x_poll_event(0);
sh2_irl_irq(&ssh2, slvl);
}
void Pico32xStartup(void)
{
elprintf(EL_STATUS|EL_32X, "32X startup");
@ -11,9 +40,11 @@ void Pico32xStartup(void)
PicoMemSetup32x();
sh2_init(&msh2);
msh2.irq_callback = sh2_irq_cb;
sh2_reset(&msh2);
sh2_init(&ssh2);
ssh2.irq_callback = sh2_irq_cb;
sh2_reset(&ssh2);
if (!Pico.m.pal)
@ -54,20 +85,27 @@ static void p32x_start_blank(void)
// enter vblank
Pico32x.vdp_regs[0x0a/2] |= P32XV_VBLK|P32XV_PEN;
// swap waits until vblank
// FB swap waits until vblank
if ((Pico32x.vdp_regs[0x0a/2] ^ Pico32x.pending_fb) & P32XV_FS) {
Pico32x.vdp_regs[0x0a/2] &= ~P32XV_FS;
Pico32x.vdp_regs[0x0a/2] |= Pico32x.pending_fb;
Pico32xSwapDRAM(Pico32x.pending_fb ^ 1);
}
p32x_poll_event(1);
}
// FIXME..
static __inline void SekRunM68k(int cyc)
{
int cyc_do;
SekCycleAim+=cyc;
if ((cyc_do=SekCycleAim-SekCycleCnt) <= 0) return;
SekCycleAim += cyc;
if (Pico32x.emu_flags & P32XF_68KPOLL) {
SekCycleCnt = SekCycleAim;
return;
}
if ((cyc_do = SekCycleAim - SekCycleCnt) <= 0)
return;
#if defined(EMU_CORE_DEBUG)
// this means we do run-compare
SekCycleCnt+=CM_compareRun(cyc_do, 0);
@ -88,16 +126,27 @@ static __inline void SekRunM68k(int cyc)
#define PICO_32X
#define RUN_SH2S \
if (!(Pico32x.emu_flags & P32XF_MSH2POLL)) \
if (!(Pico32x.emu_flags & (P32XF_MSH2POLL|P32XF_MSH2VPOLL))) \
sh2_execute(&msh2, SH2_LINE_CYCLES);
#include "../pico_cmn.c"
void PicoFrame32x(void)
{
Pico32x.vdp_regs[0x0a/2] &= ~P32XV_VBLK; // get out of vblank
if ((Pico32x.vdp_regs[0] & 3 ) != 0) // no forced blanking
Pico32x.vdp_regs[0x0a/2] &= ~(P32XV_VBLK|P32XV_PEN); // get out of vblank
Pico32x.vdp_regs[0x0a/2] &= ~P32XV_PEN; // no pal access
p32x_poll_event(1);
PicoFrameStart();
PicoFrameHints();
// hack
if (Pico.m.frame_count == 83) {
Pico32xMem->sdram[0x3610 ^ 1] = 'R';
Pico32xMem->sdram[0x3611 ^ 1] = 'E';
Pico32xMem->sdram[0x3612 ^ 1] = 'D';
Pico32xMem->sdram[0x3613 ^ 1] = 'Y';
}
}