X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2F32x%2F32x.c;h=ba89d9825b22f1d57b401fc542bad41144915deb;hb=6add7875b54904ff2a6c4b49a1b6e82a3c888a6d;hp=93d4e3e8992bc7643832e8762e3aac407079839d;hpb=be20816c4c487c4b114aa444b1a5819d5785b118;p=picodrive.git

diff --git a/pico/32x/32x.c b/pico/32x/32x.c
index 93d4e3e..ba89d98 100644
--- a/pico/32x/32x.c
+++ b/pico/32x/32x.c
@@ -2,6 +2,7 @@
 #include "../sound/ym2612.h"
 
 struct Pico32x Pico32x;
+SH2 sh2s[2];
 
 static void sh2_irq_cb(int id, int level)
 {
@@ -37,23 +38,72 @@ void Pico32xStartup(void)
 {
   elprintf(EL_STATUS|EL_32X, "32X startup");
 
+  // TODO: OOM handling
   PicoAHW |= PAHW_32X;
-  PicoMemSetup32x();
-
   sh2_init(&msh2, 0);
   msh2.irq_callback = sh2_irq_cb;
-  sh2_reset(&msh2);
-
   sh2_init(&ssh2, 1);
   ssh2.irq_callback = sh2_irq_cb;
-  sh2_reset(&ssh2);
+
+  PicoMemSetup32x();
 
   if (!Pico.m.pal)
     Pico32x.vdp_regs[0] |= P32XV_nPAL;
 
+  PREG8(Pico32xMem->sh2_peri_regs[0], 4) =
+  PREG8(Pico32xMem->sh2_peri_regs[1], 4) = 0x84; // SCI SSR
+
   emu_32x_startup();
 }
 
+#define HWSWAP(x) (((x) << 16) | ((x) >> 16))
+void p32x_reset_sh2s(void)
+{
+  elprintf(EL_32X, "sh2 reset");
+
+  sh2_reset(&msh2);
+  sh2_reset(&ssh2);
+
+  // if we don't have BIOS set, perform it's work here.
+  // MSH2
+  if (p32x_bios_m == NULL) {
+    unsigned int idl_src, idl_dst, idl_size; // initial data load
+    unsigned int vbr;
+
+    // initial data
+    idl_src = HWSWAP(*(unsigned int *)(Pico.rom + 0x3d4)) & ~0xf0000000;
+    idl_dst = HWSWAP(*(unsigned int *)(Pico.rom + 0x3d8)) & ~0xf0000000;
+    idl_size= HWSWAP(*(unsigned int *)(Pico.rom + 0x3dc));
+    if (idl_size > Pico.romsize || idl_src + idl_size > Pico.romsize ||
+        idl_size > 0x40000 || idl_dst + idl_size > 0x40000 || (idl_src & 3) || (idl_dst & 3)) {
+      elprintf(EL_STATUS|EL_ANOMALY, "32x: invalid initial data ptrs: %06x -> %06x, %06x",
+        idl_src, idl_dst, idl_size);
+    }
+    else
+      memcpy(Pico32xMem->sdram + idl_dst, Pico.rom + idl_src, idl_size);
+
+    // GBR/VBR
+    vbr = HWSWAP(*(unsigned int *)(Pico.rom + 0x3e8));
+    sh2_set_gbr(0, 0x20004000);
+    sh2_set_vbr(0, vbr);
+
+    // checksum and M_OK
+    Pico32x.regs[0x28 / 2] = *(unsigned short *)(Pico.rom + 0x18e);
+    // program will set M_OK
+  }
+
+  // SSH2
+  if (p32x_bios_s == NULL) {
+    unsigned int vbr;
+
+    // GBR/VBR
+    vbr = HWSWAP(*(unsigned int *)(Pico.rom + 0x3ec));
+    sh2_set_gbr(1, 0x20004000);
+    sh2_set_vbr(1, vbr);
+    // program will set S_OK
+  }
+}
+
 void Pico32xInit(void)
 {
 }
@@ -62,7 +112,7 @@ void PicoPower32x(void)
 {
   memset(&Pico32x, 0, sizeof(Pico32x));
 
-  Pico32x.regs[0] = 0x0082; // SH2 reset?
+  Pico32x.regs[0] = P32XS_REN|P32XS_nRES; // verified
   Pico32x.vdp_regs[0x0a/2] = P32XV_VBLK|P32XV_HBLK|P32XV_PEN;
   Pico32x.sh2_regs[0] = P32XS2_ADEN;
 }
@@ -72,14 +122,19 @@ void PicoUnload32x(void)
   if (Pico32xMem != NULL)
     free(Pico32xMem);
   Pico32xMem = NULL;
+  sh2_finish(&msh2);
+  sh2_finish(&ssh2);
 
   PicoAHW &= ~PAHW_32X;
 }
 
 void PicoReset32x(void)
 {
-  extern int p32x_csum_faked;
-  p32x_csum_faked = 0; // tmp
+  if (PicoAHW & PAHW_32X) {
+    Pico32x.sh2irqs |= P32XI_VRES;
+    p32x_update_irls();
+    p32x_poll_event(3, 0);
+  }
 }
 
 static void p32x_start_blank(void)
@@ -99,55 +154,66 @@ static void p32x_start_blank(void)
   p32x_poll_event(3, 1);
 }
 
-// FIXME..
-static __inline void SekRunM68k(int cyc)
+static __inline void run_m68k(int cyc)
 {
-  int cyc_do;
-  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);
-#elif defined(EMU_C68K)
-  PicoCpuCM68k.cycles=cyc_do;
+#if defined(EMU_C68K)
+  PicoCpuCM68k.cycles = cyc;
   CycloneRun(&PicoCpuCM68k);
-  SekCycleCnt+=cyc_do-PicoCpuCM68k.cycles;
+  SekCycleCnt += cyc - PicoCpuCM68k.cycles;
 #elif defined(EMU_M68K)
-  SekCycleCnt+=m68k_execute(cyc_do);
+  SekCycleCnt += m68k_execute(cyc);
 #elif defined(EMU_F68K)
-  SekCycleCnt+=fm68k_emulate(cyc_do+1, 0, 0);
+  SekCycleCnt += fm68k_emulate(cyc+1, 0, 0);
 #endif
 }
 
 // ~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) \
-  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 CPUS_RUN_SIMPLE(m68k_cycles,s68k_cycles) \
+{ \
+  int slice; \
+  SekCycleAim += m68k_cycles; \
+  while (SekCycleCnt < SekCycleAim) { \
+    slice = SekCycleCnt; \
+    run_m68k(SekCycleAim - SekCycleCnt); \
+    if (!(Pico32x.regs[0] & P32XS_nRES)) \
+      continue; /* SH2s reseting */ \
+    slice = SekCycleCnt - slice; /* real count from 68k */ \
+    if (SekCycleCnt < SekCycleAim) \
+      elprintf(EL_32X, "slice %d", slice); \
+    if (!(Pico32x.emu_flags & (P32XF_SSH2POLL|P32XF_SSH2VPOLL))) \
+      sh2_execute(&ssh2, CYCLES_M68K2SH2(slice)); \
+    if (!(Pico32x.emu_flags & (P32XF_MSH2POLL|P32XF_MSH2VPOLL))) \
+      sh2_execute(&msh2, CYCLES_M68K2SH2(slice)); \
+  } \
+}
 
-#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) { \
+    run_m68k(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; \
+  run_m68k(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"