X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=picodrive.git;a=blobdiff_plain;f=pico%2F32x%2F32x.c;h=51817c0d70ad307450f2be8a6479822c6d5a5169;hp=ab522e41a6d6840d16175e61ff5ad9d1dbd1475a;hb=e0bcb7a90d06b295b1ca989b6ad70412912cca5b;hpb=419973a6d6cb92f96a60f1d5ccda0beb8b28b15d

diff --git a/pico/32x/32x.c b/pico/32x/32x.c
index ab522e4..51817c0 100644
--- a/pico/32x/32x.c
+++ b/pico/32x/32x.c
@@ -109,6 +109,10 @@ void Pico32xStartup(void)
   p32x_pwm_ctl_changed();
   p32x_timers_recalc();
 
+  Pico32x.sh2_regs[0] = P32XS2_ADEN;
+  if (Pico.m.ncart_in)
+    Pico32x.sh2_regs[0] |= P32XS_nCART;
+
   if (!Pico.m.pal)
     Pico32x.vdp_regs[0] |= P32XV_nPAL;
 
@@ -130,28 +134,31 @@ void p32x_reset_sh2s(void)
   // 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;
+    sh2_set_gbr(0, 0x20004000);
 
-    // 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);
+    if (!(PicoAHW & PAHW_MCD)) {
+      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);
+      // VBR
+      vbr = HWSWAP(*(unsigned int *)(Pico.rom + 0x3e8));
+      sh2_set_vbr(0, vbr);
 
-    // checksum and M_OK
-    Pico32x.regs[0x28 / 2] = *(unsigned short *)(Pico.rom + 0x18e);
+      // checksum and M_OK
+      Pico32x.regs[0x28 / 2] = *(unsigned short *)(Pico.rom + 0x18e);
+    }
     // program will set M_OK
   }
 
@@ -166,7 +173,7 @@ void p32x_reset_sh2s(void)
     // program will set S_OK
   }
 
-  msh2.m68krcycles_done = ssh2.m68krcycles_done = SekCyclesDoneT();
+  msh2.m68krcycles_done = ssh2.m68krcycles_done = SekCyclesDone();
 }
 
 void Pico32xInit(void)
@@ -183,7 +190,6 @@ void PicoPower32x(void)
 
   Pico32x.regs[0] = P32XS_REN|P32XS_nRES; // verified
   Pico32x.vdp_regs[0x0a/2] = P32XV_VBLK|P32XV_PEN;
-  Pico32x.sh2_regs[0] = P32XS2_ADEN;
 }
 
 void PicoUnload32x(void)
@@ -200,8 +206,7 @@ void PicoUnload32x(void)
 void PicoReset32x(void)
 {
   if (PicoAHW & PAHW_32X) {
-    msh2.m68krcycles_done = ssh2.m68krcycles_done = SekCyclesDoneT();
-    p32x_trigger_irq(NULL, SekCyclesDoneT2(), P32XI_VRES);
+    p32x_trigger_irq(NULL, SekCyclesDone(), P32XI_VRES);
     p32x_sh2_poll_event(&msh2, SH2_IDLE_STATES, 0);
     p32x_sh2_poll_event(&ssh2, SH2_IDLE_STATES, 0);
     p32x_pwm_ctl_changed();
@@ -225,7 +230,7 @@ static void p32x_start_blank(void)
     // XXX: no proper handling of 32col mode..
     if ((Pico32x.vdp_regs[0] & P32XV_Mx) != 0 && // 32x not blanking
         (Pico.video.reg[12] & 1) && // 40col mode
-        (PicoDrawMask & PDRAW_32X_ON))
+        (!(Pico.video.debug_p & PVD_KILL_32X)))
     {
       int md_bg = Pico.video.reg[7] & 0x3f;
 
@@ -248,7 +253,7 @@ static void p32x_start_blank(void)
     Pico32xSwapDRAM(Pico32x.pending_fb ^ 1);
   }
 
-  p32x_trigger_irq(NULL, SekCyclesDoneT2(), P32XI_VINT);
+  p32x_trigger_irq(NULL, SekCyclesDone(), P32XI_VINT);
   p32x_sh2_poll_event(&msh2, SH2_STATE_VPOLL, 0);
   p32x_sh2_poll_event(&ssh2, SH2_STATE_VPOLL, 0);
 }
@@ -272,14 +277,6 @@ void p32x_schedule_hint(SH2 *sh2, int m68k_cycles)
     p32x_event_schedule(m68k_cycles, P32X_EVENT_HINT, after);
 }
 
-// compare cycles, handling overflows
-// check if a > b
-#define CYCLES_GT(a, b) \
-  ((int)((a) - (b)) > 0)
-// check if a >= b
-#define CYCLES_GE(a, b) \
-  ((int)((a) - (b)) >= 0)
-
 /* events */
 static void fillend_event(unsigned int now)
 {
@@ -296,9 +293,10 @@ static void hint_event(unsigned int now)
 
 typedef void (event_cb)(unsigned int now);
 
-unsigned int event_times[P32X_EVENT_COUNT];
+/* times are in m68k (7.6MHz) cycles */
+unsigned int p32x_event_times[P32X_EVENT_COUNT];
 static unsigned int event_time_next;
-static event_cb *event_cbs[] = {
+static event_cb *p32x_event_cbs[P32X_EVENT_COUNT] = {
   [P32X_EVENT_PWM]      = p32x_pwm_irq_event,
   [P32X_EVENT_FILLEND]  = fillend_event,
   [P32X_EVENT_HINT]     = hint_event,
@@ -311,8 +309,8 @@ void p32x_event_schedule(unsigned int now, enum p32x_event event, int after)
 
   when = (now + after) | 1;
 
-  elprintf(EL_32X, "new event #%u %u->%u", event, now, when);
-  event_times[event] = when;
+  elprintf(EL_32X, "32x: new event #%u %u->%u", event, now, when);
+  p32x_event_times[event] = when;
 
   if (event_time_next == 0 || CYCLES_GT(event_time_next, when))
     event_time_next = when;
@@ -329,7 +327,7 @@ void p32x_event_schedule_sh2(SH2 *sh2, enum p32x_event event, int after)
   sh2_end_run(sh2, left_to_next);
 }
 
-static void run_events(unsigned int until)
+static void p32x_run_events(unsigned int until)
 {
   int oldest, oldest_diff, time;
   int i, diff;
@@ -338,8 +336,8 @@ static void run_events(unsigned int until)
     oldest = -1, oldest_diff = 0x7fffffff;
 
     for (i = 0; i < P32X_EVENT_COUNT; i++) {
-      if (event_times[i]) {
-        diff = event_times[i] - until;
+      if (p32x_event_times[i]) {
+        diff = p32x_event_times[i] - until;
         if (diff < oldest_diff) {
           oldest_diff = diff;
           oldest = i;
@@ -348,13 +346,13 @@ static void run_events(unsigned int until)
     }
 
     if (oldest_diff <= 0) {
-      time = event_times[oldest];
-      event_times[oldest] = 0;
-      elprintf(EL_32X, "run event #%d %u", oldest, time);
-      event_cbs[oldest](time);
+      time = p32x_event_times[oldest];
+      p32x_event_times[oldest] = 0;
+      elprintf(EL_32X, "32x: run event #%d %u", oldest, time);
+      p32x_event_cbs[oldest](time);
     }
     else if (oldest_diff < 0x7fffffff) {
-      event_time_next = event_times[oldest];
+      event_time_next = p32x_event_times[oldest];
       break;
     }
     else {
@@ -364,7 +362,8 @@ static void run_events(unsigned int until)
   }
 
   if (oldest != -1)
-    elprintf(EL_32X, "next event #%d at %u", oldest, event_time_next);
+    elprintf(EL_32X, "32x: next event #%d at %u",
+      oldest, event_time_next);
 }
 
 static inline void run_sh2(SH2 *sh2, int m68k_cycles)
@@ -377,7 +376,7 @@ static inline void run_sh2(SH2 *sh2, int m68k_cycles)
   elprintf_sh2(sh2, EL_32X, "+run %u %d @%08x",
     sh2->m68krcycles_done, cycles, sh2->pc);
 
-  done = sh2_execute(sh2, cycles);
+  done = sh2_execute(sh2, cycles, PicoOpt & POPT_EN_DRC);
 
   sh2->m68krcycles_done += C_SH2_TO_M68K(*sh2, done);
   sh2->state &= ~SH2_STATE_RUN;
@@ -447,7 +446,7 @@ void sync_sh2s_normal(unsigned int m68k_target)
   while (CYCLES_GT(m68k_target, now))
   {
     if (event_time_next && CYCLES_GE(now, event_time_next))
-      run_events(now);
+      p32x_run_events(now);
 
     target = m68k_target;
     if (event_time_next && CYCLES_GT(target, event_time_next))
@@ -521,15 +520,21 @@ void sync_sh2s_lockstep(unsigned int m68k_target)
   }
 }
 
-#define CPUS_RUN(m68k_cycles,s68k_cycles) do { \
-  SekRunM68k(m68k_cycles); \
-  if (Pico32x.emu_flags & P32XF_Z80_32X_IO) \
-    PicoSyncZ80(SekCycleCnt); \
+#define CPUS_RUN(m68k_cycles) do { \
+  if (PicoAHW & PAHW_MCD) \
+    pcd_run_cpus(m68k_cycles); \
+  else \
+    SekRunM68k(m68k_cycles); \
+  \
+  if ((Pico32x.emu_flags & P32XF_Z80_32X_IO) && Pico.m.z80Run \
+      && !Pico.m.z80_reset && (PicoOpt & POPT_EN_Z80)) \
+    PicoSyncZ80(SekCyclesDone()); \
   if (Pico32x.emu_flags & (P32XF_68KCPOLL|P32XF_68KVPOLL)) \
-    p32x_sync_sh2s(SekCyclesDoneT2()); \
+    p32x_sync_sh2s(SekCyclesDone()); \
 } while (0)
 
 #define PICO_32X
+#define PICO_CD
 #include "../pico_cmn.c"
 
 void PicoFrame32x(void)
@@ -541,10 +546,13 @@ void PicoFrame32x(void)
     Pico32x.vdp_regs[0x0a/2] &= ~P32XV_PEN; // no palette access
 
   if (!(Pico32x.sh2_regs[0] & 0x80))
-    p32x_schedule_hint(NULL, SekCyclesDoneT2());
+    p32x_schedule_hint(NULL, SekCyclesDone());
   p32x_sh2_poll_event(&msh2, SH2_STATE_VPOLL, 0);
   p32x_sh2_poll_event(&ssh2, SH2_STATE_VPOLL, 0);
 
+  if (PicoAHW & PAHW_MCD)
+    pcd_prepare_frame();
+
   PicoFrameStart();
   PicoFrameHints();
   sh2_drc_frame();
@@ -576,11 +584,10 @@ void Pico32xStateLoaded(int is_early)
     return;
   }
 
-  SekCycleCnt = 0;
-  sh2s[0].m68krcycles_done = sh2s[1].m68krcycles_done = SekCycleCntT;
-  p32x_update_irls(NULL, SekCycleCntT);
+  sh2s[0].m68krcycles_done = sh2s[1].m68krcycles_done = SekCyclesDone();
+  p32x_update_irls(NULL, SekCyclesDone());
   p32x_pwm_state_loaded();
-  run_events(SekCycleCntT);
+  p32x_run_events(SekCyclesDone());
 }
 
 // vim:shiftwidth=2:ts=2:expandtab