Reset_CD();
LC89510_Reset();
gfx_cd_reset();
-#ifdef _ASM_CD_MEMORY_C
PicoMemResetCD(1);
+#ifdef _ASM_CD_MEMORY_C
//PicoMemResetCDdecode(1); // don't have to call this in 2M mode
#endif
SRam.data = NULL;
if (PicoOpt&0x8000)
SRam.data = calloc(1, 0x12000);
+ SRam.start = SRam.end = 0; // unused
return 0;
}
{
int cyc_do;
SekCycleAim+=cyc;
- if((cyc_do=SekCycleAim-SekCycleCnt) < 0) return;
-#if defined(EMU_C68K)
- PicoCpu.cycles=cyc_do;
- CycloneRun(&PicoCpu);
- SekCycleCnt+=cyc_do-PicoCpu.cycles;
+ if ((cyc_do=SekCycleAim-SekCycleCnt) <= 0) return;
+#if defined(EMU_CORE_DEBUG)
+ SekCycleCnt+=CM_compareRun(cyc_do, 0);
+#elif defined(EMU_C68K)
+ PicoCpuCM68k.cycles=cyc_do;
+ CycloneRun(&PicoCpuCM68k);
+ SekCycleCnt+=cyc_do-PicoCpuCM68k.cycles;
#elif defined(EMU_M68K)
- m68k_set_context(&PicoM68kCPU);
+ m68k_set_context(&PicoCpuMM68k);
SekCycleCnt+=m68k_execute(cyc_do);
+#elif defined(EMU_F68K)
+ g_m68kcontext=&PicoCpuFM68k;
+ SekCycleCnt+=fm68k_emulate(cyc_do, 0);
#endif
}
{
int cyc_do;
SekCycleAimS68k+=cyc;
- if((cyc_do=SekCycleAimS68k-SekCycleCntS68k) < 0) return;
-#if defined(EMU_C68K)
- PicoCpuS68k.cycles=cyc_do;
- CycloneRun(&PicoCpuS68k);
- SekCycleCntS68k+=cyc_do-PicoCpuS68k.cycles;
+ if ((cyc_do=SekCycleAimS68k-SekCycleCntS68k) <= 0) return;
+#if defined(EMU_CORE_DEBUG)
+ SekCycleCntS68k+=CM_compareRun(cyc_do, 1);
+#elif defined(EMU_C68K)
+ PicoCpuCS68k.cycles=cyc_do;
+ CycloneRun(&PicoCpuCS68k);
+ SekCycleCntS68k+=cyc_do-PicoCpuCS68k.cycles;
#elif defined(EMU_M68K)
- m68k_set_context(&PicoS68kCPU);
+ m68k_set_context(&PicoCpuMS68k);
SekCycleCntS68k+=m68k_execute(cyc_do);
+#elif defined(EMU_F68K)
+ g_m68kcontext=&PicoCpuFS68k;
+ SekCycleCntS68k+=fm68k_emulate(cyc_do, 0);
#endif
}
#define PS_STEP_M68K ((488<<16)/20) // ~24
//#define PS_STEP_S68K 13
-#ifdef _ASM_CD_PICO_C
-void SekRunPS(int cyc_m68k, int cyc_s68k);
+#if defined(_ASM_CD_PICO_C)
+extern void SekRunPS(int cyc_m68k, int cyc_s68k);
+#elif defined(EMU_F68K)
+static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
+{
+ SekCycleAim+=cyc_m68k;
+ SekCycleAimS68k+=cyc_s68k;
+ fm68k_emulate(0, 1);
+}
#else
static __inline void SekRunPS(int cyc_m68k, int cyc_s68k)
{
int cycn, cycn_s68k, cyc_do;
- int ex;
SekCycleAim+=cyc_m68k;
SekCycleAimS68k+=cyc_s68k;
/* loop 488 downto 0 in steps of PS_STEP */
for (cycn = (488<<16)-PS_STEP_M68K; cycn >= 0; cycn -= PS_STEP_M68K)
{
- ex = 0;
cycn_s68k = (cycn + cycn/2 + cycn/8) >> 16;
if ((cyc_do = SekCycleAim-SekCycleCnt-(cycn>>16)) > 0) {
#if defined(EMU_C68K)
- PicoCpu.cycles = cyc_do;
- CycloneRun(&PicoCpu);
- SekCycleCnt += cyc_do - PicoCpu.cycles;
+ PicoCpuCM68k.cycles = cyc_do;
+ CycloneRun(&PicoCpuCM68k);
+ SekCycleCnt += cyc_do - PicoCpuCM68k.cycles;
#elif defined(EMU_M68K)
- m68k_set_context(&PicoM68kCPU);
- SekCycleCnt += (ex = m68k_execute(cyc_do));
+ m68k_set_context(&PicoCpuMM68k);
+ SekCycleCnt += m68k_execute(cyc_do);
+#elif defined(EMU_F68K)
+ g_m68kcontext = &PicoCpuFM68k;
+ SekCycleCnt += fm68k_emulate(cyc_do, 0);
#endif
}
if ((cyc_do = SekCycleAimS68k-SekCycleCntS68k-cycn_s68k) > 0) {
#if defined(EMU_C68K)
- PicoCpuS68k.cycles = cyc_do;
- CycloneRun(&PicoCpuS68k);
- SekCycleCntS68k += cyc_do - PicoCpuS68k.cycles;
+ PicoCpuCS68k.cycles = cyc_do;
+ CycloneRun(&PicoCpuCS68k);
+ SekCycleCntS68k += cyc_do - PicoCpuCS68k.cycles;
#elif defined(EMU_M68K)
- m68k_set_context(&PicoS68kCPU);
- SekCycleCntS68k += (ex = m68k_execute(cyc_do));
+ m68k_set_context(&PicoCpuMS68k);
+ SekCycleCntS68k += m68k_execute(cyc_do);
+#elif defined(EMU_F68K)
+ g_m68kcontext = &PicoCpuFS68k;
+ SekCycleCntS68k += fm68k_emulate(cyc_do, 0);
#endif
}
}
static __inline void getSamples(int y)
{
- int len = sound_render(0, PsndLen);
+ int len = PsndRender(0, PsndLen);
if (PicoWriteSound) PicoWriteSound(len);
// clear sound buffer
- sound_clear();
+ PsndClear();
}