X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2F32x%2Fmemory.c;h=ff3c5a419b7e8ec5d2f432983b49d756bc5a3ea8;hb=5e128c6d279ac90f7b6078740ab1d0ba516969b9;hp=a897529cd78cb9e6ca52d59b120ea625f696012e;hpb=266c6afa84bde8d77a54d61ced8f227480247e24;p=picodrive.git

diff --git a/pico/32x/memory.c b/pico/32x/memory.c
index a897529..ff3c5a4 100644
--- a/pico/32x/memory.c
+++ b/pico/32x/memory.c
@@ -10,17 +10,19 @@ static void bank_switch(int b);
 #define MSB8(x) ((x) >> 8)
 
 // poll detection
+#define POLL_THRESHOLD 6
+
 struct poll_det {
-	int addr, pc, cnt;
+	int addr, pc, cnt, flag;
 };
-static struct poll_det m68k_poll;
-static struct poll_det msh2_poll;
-
-#define POLL_THRESHOLD 6
+static struct poll_det m68k_poll, sh2_poll[2];
 
-static int poll_detect(struct poll_det *pd, u32 a, u32 pc, int flag)
+static int p32x_poll_detect(struct poll_det *pd, u32 a, u32 pc, int is_vdp)
 {
-  int ret = 0;
+  int ret = 0, flag = pd->flag;
+
+  if (is_vdp)
+    flag <<= 3;
 
   if (a - 2 <= pd->addr && pd->addr <= a + 2 && pd->pc == pc) {
     pd->cnt++;
@@ -41,9 +43,11 @@ static int poll_detect(struct poll_det *pd, u32 a, u32 pc, int flag)
   return ret;
 }
 
-static int poll_undetect(struct poll_det *pd, int flag)
+static int p32x_poll_undetect(struct poll_det *pd, int is_vdp)
 {
-  int ret = 0;
+  int ret = 0, flag = pd->flag;
+  if (is_vdp)
+    flag <<= 3;
   if (pd->cnt > POLL_THRESHOLD)
     ret = 1;
   pd->addr = pd->cnt = 0;
@@ -51,6 +55,12 @@ static int poll_undetect(struct poll_det *pd, int flag)
   return ret;
 }
 
+void p32x_poll_event(int is_vdp)
+{
+  p32x_poll_undetect(&sh2_poll[0], is_vdp);
+  p32x_poll_undetect(&sh2_poll[1], is_vdp);
+}
+
 // SH2 faking
 //#define FAKE_SH2
 int p32x_csum_faked;
@@ -80,19 +90,62 @@ static u32 sh2_comm_faker(u32 a)
 }
 #endif
 
+// DMAC handling
+static struct {
+  unsigned int sar0, dar0, tcr0; // src addr, dst addr, transfer count
+  unsigned int chcr0; // chan ctl
+  unsigned int sar1, dar1, tcr1; // same for chan 1
+  unsigned int chcr1;
+  int pad[4];
+  unsigned int dmaor;
+} * dmac0;
+
+static void dma_68k2sh2_do(void)
+{
+  unsigned short *dreqlen = &Pico32x.regs[0x10 / 2];
+  int i;
+
+  if (dmac0->tcr0 != *dreqlen)
+    elprintf(EL_32X|EL_ANOMALY, "tcr0 and dreq len differ: %d != %d", dmac0->tcr0, *dreqlen);
+
+  for (i = 0; i < Pico32x.dmac_ptr && dmac0->tcr0 > 0; i++) {
+    extern void p32x_sh2_write16(u32 a, u32 d, int id);
+      elprintf(EL_32X|EL_ANOMALY, "dmaw [%08x] %04x, left %d", dmac0->dar0, Pico32x.dmac_fifo[i], *dreqlen);
+    p32x_sh2_write16(dmac0->dar0, Pico32x.dmac_fifo[i], 0);
+    dmac0->dar0 += 2;
+    dmac0->tcr0--;
+    (*dreqlen)--;
+  }
+
+  Pico32x.dmac_ptr = 0; // HACK
+  Pico32x.regs[6 / 2] &= ~P32XS_FULL;
+  if (*dreqlen == 0)
+    Pico32x.regs[6 / 2] &= ~P32XS_68S; // transfer complete
+  if (dmac0->tcr0 == 0)
+    dmac0->chcr0 |= 2; // DMA has ended normally
+  p32x_poll_undetect(&m68k_poll, 0);
+}
+
+// ------------------------------------------------------------------
+// 68k regs
+
 static u32 p32x_reg_read16(u32 a)
 {
   a &= 0x3e;
 
-#ifdef FAKE_SH2
+#if 0
   if ((a & 0x30) == 0x20)
     return sh2_comm_faker(a);
 #else
-  if (poll_detect(&m68k_poll, a, SekPc, P32XF_68KPOLL)) {
-    SekSetStop(1);
+  if (p32x_poll_detect(&m68k_poll, a, SekPc, 0)) {
     SekEndRun(16);
   }
 #endif
+#ifdef FAKE_SH2
+  // fake only slave for now
+  if (a == 0x24 || a == 0x26)
+    return sh2_comm_faker(a);
+#endif
 
   return Pico32x.regs[a / 2];
 }
@@ -112,16 +165,29 @@ static void p32x_reg_write8(u32 a, u32 d)
     return;
 
   switch (a) {
-    case 0:
+    case 0: // adapter ctl
       r[0] = (r[0] & 0x83) | ((d << 8) & P32XS_FM);
       break;
-    case 5:
+    case 3: // irq ctl
+      if ((d & 1) && !(Pico32x.sh2irqi[0] & P32XI_CMD)) {
+        Pico32x.sh2irqi[0] |= P32XI_CMD;
+        p32x_update_irls();
+      }
+      if ((d & 2) && !(Pico32x.sh2irqi[1] & P32XI_CMD)) {
+        Pico32x.sh2irqi[1] |= P32XI_CMD;
+        p32x_update_irls();
+      }
+      break;
+    case 5: // bank
       d &= 7;
-      if (r[4/2] != d) {
-        r[4/2] = d;
+      if (r[4 / 2] != d) {
+        r[4 / 2] = d;
         bank_switch(d);
       }
       break;
+    case 7: // DREQ ctl
+      r[6 / 2] = (r[6 / 2] & P32XS_FULL) | (d & (P32XS_68S|P32XS_RV));
+      break;
   }
 }
 
@@ -130,21 +196,49 @@ static void p32x_reg_write16(u32 a, u32 d)
   u16 *r = Pico32x.regs;
   a &= 0x3e;
 
+  // for write loops with FIFO checks..
+  m68k_poll.cnt = 0;
+
   switch (a) {
-    case 0:
+    case 0x00: // adapter ctl
       r[0] = (r[0] & 0x83) | (d & P32XS_FM);
       return;
+    case 0x10: // DREQ len
+      r[a / 2] = d & ~3;
+      return;
+    case 0x12: // FIFO reg
+      if (!(r[6 / 2] & P32XS_68S)) {
+        elprintf(EL_32X|EL_ANOMALY, "DREQ FIFO w16 without 68S?");
+	return;
+      }
+      if (Pico32x.dmac_ptr < DMAC_FIFO_LEN) {
+        Pico32x.dmac_fifo[Pico32x.dmac_ptr++] = d;
+        if ((Pico32x.dmac_ptr & 3) == 0 && (dmac0->chcr0 & 3) == 1 && (dmac0->dmaor & 1))
+          dma_68k2sh2_do();
+        if (Pico32x.dmac_ptr == DMAC_FIFO_LEN)
+          r[6 / 2] |= P32XS_FULL;
+      }
+      break;
   }
 
-  if ((a & 0x30) == 0x20) {
+  // DREQ src, dst
+  if      ((a & 0x38) == 0x08) {
     r[a / 2] = d;
-    poll_undetect(&msh2_poll, P32XF_MSH2POLL);
+    return;
+  }
+  // comm port
+  else if ((a & 0x30) == 0x20 && r[a / 2] != d) {
+    r[a / 2] = d;
+    if (p32x_poll_undetect(&sh2_poll[0], 0) || p32x_poll_undetect(&sh2_poll[1], 0))
+      // if some SH2 is busy waiting, it needs to see the result ASAP
+      SekEndRun(16);
     return;
   }
 
   p32x_reg_write8(a + 1, d);
 }
 
+// ------------------------------------------------------------------
 // VDP regs
 static u32 p32x_vdp_read16(u32 a)
 {
@@ -158,15 +252,12 @@ static void p32x_vdp_write8(u32 a, u32 d)
   u16 *r = Pico32x.vdp_regs;
   a &= 0x0f;
 
+  // for FEN checks between writes
+  sh2_poll[0].cnt = 0;
+
   // TODO: verify what's writeable
   switch (a) {
     case 0x01:
-      if (((r[0] & 3) == 0) != ((d & 3) == 0)) { // forced blanking changed
-        if (Pico.video.status & 8)
-          r[0x0a/2] |=  P32XV_VBLK;
-        else
-          r[0x0a/2] &= ~P32XV_VBLK;
-      }
       // priority inversion is handled in palette
       if ((r[0] ^ d) & P32XV_PRI)
         Pico32x.dirty_pal = 1;
@@ -176,7 +267,7 @@ static void p32x_vdp_write8(u32 a, u32 d)
       d &= 1;
       Pico32x.pending_fb = d;
       // if we are blanking and FS bit is changing
-      if ((r[0x0a/2] & P32XV_VBLK) && ((r[0x0a/2] ^ d) & P32XV_FS)) {
+      if (((r[0x0a/2] & P32XV_VBLK) || (r[0] & P32XV_Mx) == 0) && ((r[0x0a/2] ^ d) & P32XV_FS)) {
         r[0x0a/2] ^= 1;
 	Pico32xSwapDRAM(d ^ 1);
         elprintf(EL_32X, "VDP FS: %d", r[0x0a/2] & P32XV_FS);
@@ -190,43 +281,95 @@ static void p32x_vdp_write16(u32 a, u32 d)
   p32x_vdp_write8(a | 1, d);
 }
 
+// ------------------------------------------------------------------
 // SH2 regs
-static u32 p32x_sh2reg_read16(u32 a)
-{
-  a &= 0xff; // ?
 
-  if (poll_detect(&msh2_poll, a, ash2_pc(), P32XF_MSH2POLL))
-    ash2_end_run(8);
+static u32 p32x_sh2reg_read16(u32 a, int cpuid)
+{
+  u16 *r = Pico32x.regs;
+  a &= 0xfe; // ?
 
-  if (a == 0) {
-    return (Pico32x.regs[0] & P32XS_FM) | P32XS2_ADEN;
+  switch (a) {
+    case 0x00: // adapter/irq ctl
+      return (r[0] & P32XS_FM) | P32XS2_ADEN | Pico32x.sh2irq_mask[cpuid];
+    case 0x10: // DREQ len
+      return r[a / 2];
   }
-  if ((a & 0x30) == 0x20)
-    return Pico32x.regs[a / 2];
+
+  // DREQ src, dst; comm port
+  if ((a & 0x38) == 0x08 || (a & 0x30) == 0x20)
+    return r[a / 2];
 
   return 0;
 }
 
-static void p32x_sh2reg_write8(u32 a, u32 d)
+static void p32x_sh2reg_write8(u32 a, u32 d, int cpuid)
 {
+  a &= 0xff;
+  if (a == 1) {
+    Pico32x.sh2irq_mask[cpuid] = d & 0x0f;
+    p32x_update_irls();
+  }
 }
 
-static void p32x_sh2reg_write16(u32 a, u32 d)
+static void p32x_sh2reg_write16(u32 a, u32 d, int cpuid)
 {
-  a &= 0xff;
+  a &= 0xfe;
 
-  if ((a & 0x30) == 0x20) {
-    Pico32x.regs[a/2] = d;
-    if (poll_undetect(&m68k_poll, P32XF_68KPOLL))
-      // dangerous, but let's just assume 68k program
-      // didn't issue STOP itself.
-      SekSetStop(0);
+  if ((a & 0x30) == 0x20 && Pico32x.regs[a/2] != d) {
+    Pico32x.regs[a / 2] = d;
+    p32x_poll_undetect(&m68k_poll, 0);
+    p32x_poll_undetect(&sh2_poll[cpuid ^ 1], 0);
     return;
   }
 
-  p32x_sh2reg_write8(a | 1, d);
+  switch (a) {
+    case 0x14: Pico32x.sh2irqs &= ~P32XI_VRES; goto irls;
+    case 0x16: Pico32x.sh2irqs &= ~P32XI_VINT; goto irls;
+    case 0x18: Pico32x.sh2irqs &= ~P32XI_HINT; goto irls;
+    case 0x1a: Pico32x.sh2irqi[cpuid] &= ~P32XI_CMD; goto irls;
+    case 0x1c: Pico32x.sh2irqs &= ~P32XI_PWM;  goto irls;
+  }
+
+  p32x_sh2reg_write8(a | 1, d, cpuid);
+  return;
+
+irls:
+  p32x_update_irls();
+}
+
+static u32 sh2_peripheral_read(u32 a, int id)
+{
+  u32 d;
+  a &= 0x1fc;
+  d = Pico32xMem->sh2_peri_regs[0][a / 4];
+
+  elprintf(EL_32X, "%csh2 peri r32 [%08x] %08x @%06x", id ? 's' : 'm', a, d, sh2_pc(id));
+  return d;
+}
+
+static void sh2_peripheral_write(u32 a, u32 d, int id)
+{
+  unsigned int *r = Pico32xMem->sh2_peri_regs[0];
+  elprintf(EL_32X, "%csh2 peri w32 [%08x] %08x @%06x", id ? 's' : 'm', a, d, sh2_pc(id));
+
+  a &= 0x1fc;
+  r[a / 4] = d;
+
+  if ((a == 0x1b0 || a == 0x18c) && (dmac0->chcr0 & 3) == 1 && (dmac0->dmaor & 1)) {
+    elprintf(EL_32X, "sh2 DMA %08x -> %08x, cnt %d, chcr %04x @%06x",
+      dmac0->sar0, dmac0->dar0, dmac0->tcr0, dmac0->chcr0, sh2_pc(id));
+    dmac0->tcr0 &= 0xffffff;
+    // DREQ is only sent after first 4 words are written.
+    // we do multiple of 4 words to avoid messing up alignment
+    if (dmac0->sar0 == 0x20004012 && Pico32x.dmac_ptr && (Pico32x.dmac_ptr & 3) == 0) {
+      elprintf(EL_32X, "68k -> sh2 DMA");
+      dma_68k2sh2_do();
+    }
+  }
 }
 
+// ------------------------------------------------------------------
 // default 32x handlers
 u32 PicoRead8_32x(u32 a)
 {
@@ -416,11 +559,15 @@ static void bank_switch(int b)
 //                              SH2  
 // -----------------------------------------------------------------
 
-u32 pico32x_read8(u32 a)
+u32 p32x_sh2_read8(u32 a, int id)
 {
+  int pd_vdp = 0;
   u32 d = 0;
-  if (a < sizeof(Pico32xMem->sh2_rom_m))
+
+  if (id == 0 && a < sizeof(Pico32xMem->sh2_rom_m))
     return Pico32xMem->sh2_rom_m[a ^ 1];
+  if (id == 1 && a < sizeof(Pico32xMem->sh2_rom_s))
+    return Pico32xMem->sh2_rom_s[a ^ 1];
 
   if ((a & 0x0ffc0000) == 0x06000000)
     return Pico32xMem->sdram[(a & 0x3ffff) ^ 1];
@@ -429,14 +576,18 @@ u32 pico32x_read8(u32 a)
     if ((a & 0x003fffff) < Pico.romsize)
       return Pico.rom[(a & 0x3fffff) ^ 1];
 
+  if ((a & ~0xfff) == 0xc0000000)
+    return Pico32xMem->data_array[id][(a & 0xfff) ^ 1];
+
   if ((a & 0x0fffff00) == 0x4000) {
-    d = p32x_sh2reg_read16(a);
-    goto out_16to8;
+    d = p32x_sh2reg_read16(a, id);
+    goto out_pd;
   }
 
   if ((a & 0x0fffff00) == 0x4100) {
     d = p32x_vdp_read16(a);
-    goto out_16to8;
+    pd_vdp = 1;
+    goto out_pd;
   }
 
   if ((a & 0x0fffff00) == 0x4200) {
@@ -444,24 +595,34 @@ u32 pico32x_read8(u32 a)
     goto out_16to8;
   }
 
-  elprintf(EL_UIO, "sh2 unmapped r8  [%08x]       %02x @%06x", a, d, ash2_pc());
+  elprintf(EL_UIO, "%csh2 unmapped r8  [%08x]       %02x @%06x",
+    id ? 's' : 'm', a, d, sh2_pc(id));
   return d;
 
+out_pd:
+  if (p32x_poll_detect(&sh2_poll[id], a, sh2_pc(id), pd_vdp))
+    ash2_end_run(8);
+
 out_16to8:
   if (a & 1)
     d &= 0xff;
   else
     d >>= 8;
 
-  elprintf(EL_32X, "sh2 r8  [%08x]       %02x @%06x", a, d, ash2_pc());
+  elprintf(EL_32X, "%csh2 r8  [%08x]       %02x @%06x",
+    id ? 's' : 'm', a, d, sh2_pc(id));
   return d;
 }
 
-u32 pico32x_read16(u32 a)
+u32 p32x_sh2_read16(u32 a, int id)
 {
+  int pd_vdp = 0;
   u32 d = 0;
-  if (a < sizeof(Pico32xMem->sh2_rom_m))
+
+  if (id == 0 && a < sizeof(Pico32xMem->sh2_rom_m))
     return *(u16 *)(Pico32xMem->sh2_rom_m + a);
+  if (id == 1 && a < sizeof(Pico32xMem->sh2_rom_s))
+    return *(u16 *)(Pico32xMem->sh2_rom_s + a);
 
   if ((a & 0x0ffc0000) == 0x06000000)
     return ((u16 *)Pico32xMem->sdram)[(a & 0x3ffff) / 2];
@@ -470,14 +631,18 @@ u32 pico32x_read16(u32 a)
     if ((a & 0x003fffff) < Pico.romsize)
       return ((u16 *)Pico.rom)[(a & 0x3fffff) / 2];
 
+  if ((a & ~0xfff) == 0xc0000000)
+    return ((u16 *)Pico32xMem->data_array[id])[(a & 0xfff) / 2];
+
   if ((a & 0x0fffff00) == 0x4000) {
-    d = p32x_sh2reg_read16(a);
-    goto out;
+    d = p32x_sh2reg_read16(a, id);
+    goto out_pd;
   }
 
   if ((a & 0x0fffff00) == 0x4100) {
     d = p32x_vdp_read16(a);
-    goto out;
+    pd_vdp = 1;
+    goto out_pd;
   }
 
   if ((a & 0x0fffff00) == 0x4200) {
@@ -485,24 +650,34 @@ u32 pico32x_read16(u32 a)
     goto out;
   }
 
-  elprintf(EL_UIO, "sh2 unmapped r16 [%08x]     %04x @%06x", a, d, ash2_pc());
+  elprintf(EL_UIO, "%csh2 unmapped r16 [%08x]     %04x @%06x",
+    id ? 's' : 'm', a, d, sh2_pc(id));
   return d;
 
+out_pd:
+  if (p32x_poll_detect(&sh2_poll[id], a, sh2_pc(id), pd_vdp))
+    ash2_end_run(8);
+
 out:
-  elprintf(EL_32X, "sh2 r16 [%08x]     %04x @%06x", a, d, ash2_pc());
+  elprintf(EL_32X, "%csh2 r16 [%08x]     %04x @%06x",
+    id ? 's' : 'm', a, d, sh2_pc(id));
   return d;
 }
 
-u32 pico32x_read32(u32 a)
+u32 p32x_sh2_read32(u32 a, int id)
 {
+  if ((a & 0xfffffe00) == 0xfffffe00)
+    return sh2_peripheral_read(a, id);
+
 //  elprintf(EL_UIO, "sh2 r32 [%08x] %08x @%06x", a, d, ash2_pc());
-  return (pico32x_read16(a) << 16) | pico32x_read16(a + 2);
+  return (p32x_sh2_read16(a, id) << 16) | p32x_sh2_read16(a + 2, id);
 }
 
-void pico32x_write8(u32 a, u32 d)
+void p32x_sh2_write8(u32 a, u32 d, int id)
 {
   if ((a & 0x0ffffc00) == 0x4000)
-    elprintf(EL_32X, "sh2 w8  [%08x]       %02x @%06x", a, d & 0xff, ash2_pc());
+    elprintf(EL_32X, "%csh2 w8  [%08x]       %02x @%06x",
+      id ? 's' : 'm', a, d & 0xff, sh2_pc(id));
 
   if ((a & 0x0ffc0000) == 0x06000000) {
     Pico32xMem->sdram[(a & 0x3ffff) ^ 1] = d;
@@ -515,29 +690,41 @@ void pico32x_write8(u32 a, u32 d)
     return;
   }
 
+  if ((a & ~0xfff) == 0xc0000000) {
+    Pico32xMem->data_array[id][(a & 0xfff) ^ 1] = d;
+    return;
+  }
+
   if ((a & 0x0fffff00) == 0x4100) {
     p32x_vdp_write8(a, d);
     return;
   }
 
   if ((a & 0x0fffff00) == 0x4000) {
-    p32x_sh2reg_write8(a, d);
+    p32x_sh2reg_write8(a, d, id);
     return;
   }
 
-  elprintf(EL_UIO, "sh2 unmapped w8  [%08x]       %02x @%06x", a, d & 0xff, ash2_pc());
+  elprintf(EL_UIO, "%csh2 unmapped w8  [%08x]       %02x @%06x",
+    id ? 's' : 'm', a, d & 0xff, sh2_pc(id));
 }
 
-void pico32x_write16(u32 a, u32 d)
+void p32x_sh2_write16(u32 a, u32 d, int id)
 {
   if ((a & 0x0ffffc00) == 0x4000)
-    elprintf(EL_32X, "sh2 w16 [%08x]     %04x @%06x", a, d & 0xffff, ash2_pc());
+    elprintf(EL_32X, "%csh2 w16 [%08x]     %04x @%06x",
+      id ? 's' : 'm', a, d & 0xffff, sh2_pc(id));
 
   if ((a & 0x0ffc0000) == 0x06000000) {
     ((u16 *)Pico32xMem->sdram)[(a & 0x3ffff) / 2] = d;
     return;
   }
 
+  if ((a & ~0xfff) == 0xc0000000) {
+    ((u16 *)Pico32xMem->data_array[id])[(a & 0xfff) / 2] = d;
+    return;
+  }
+
   if ((a & 0x0ffe0000) == 0x04000000) {
     Pico32xMem->dram[(Pico32x.vdp_regs[0x0a/2] & P32XV_FS) ^ 1][(a & 0x1ffff) / 2] = d;
     return;
@@ -555,18 +742,23 @@ void pico32x_write16(u32 a, u32 d)
   }
 
   if ((a & 0x0fffff00) == 0x4000) {
-    p32x_sh2reg_write16(a, d);
+    p32x_sh2reg_write16(a, d, id);
     return;
   }
 
-  elprintf(EL_UIO, "sh2 unmapped w16 [%08x]     %04x @%06x", a, d & 0xffff, ash2_pc());
+  elprintf(EL_UIO, "%csh2 unmapped w16 [%08x]     %04x @%06x",
+    id ? 's' : 'm', a, d & 0xffff, sh2_pc(id));
 }
 
-void pico32x_write32(u32 a, u32 d)
+void p32x_sh2_write32(u32 a, u32 d, int id)
 {
-//  elprintf(EL_UIO, "sh2 w32 [%08x] %08x @%06x", a, d, ash2_pc());
-  pico32x_write16(a, d >> 16);
-  pico32x_write16(a + 2, d);
+  if ((a & 0xfffffe00) == 0xfffffe00) {
+    sh2_peripheral_write(a, d, id);
+    return;
+  }
+
+  p32x_sh2_write16(a, d >> 16, id);
+  p32x_sh2_write16(a + 2, d, id);
 }
 
 #define HWSWAP(x) (((x) << 16) | ((x) >> 16))
@@ -583,6 +775,8 @@ void PicoMemSetup32x(void)
     return;
   }
 
+  dmac0 = (void *)&Pico32xMem->sh2_peri_regs[0][0x180 / 4];
+
   // generate 68k ROM
   ps = (unsigned short *)Pico32xMem->m68k_rom;
   pl = (unsigned int *)Pico32xMem->m68k_rom;
@@ -610,16 +804,29 @@ void PicoMemSetup32x(void)
     FILE *f = fopen("32X_M_BIOS.BIN", "rb");
     int i;
     if (f == NULL) {
-      printf("missing BIOS\n");
+      printf("missing 32X_M_BIOS.BIN\n");
       exit(1);
     }
     fread(Pico32xMem->sh2_rom_m, 1, sizeof(Pico32xMem->sh2_rom_m), f);
     fclose(f);
+    f = fopen("32X_S_BIOS.BIN", "rb");
+    if (f == NULL) {
+      printf("missing 32X_S_BIOS.BIN\n");
+      exit(1);
+    }
+    fread(Pico32xMem->sh2_rom_s, 1, sizeof(Pico32xMem->sh2_rom_s), f);
+    fclose(f);
+    // byteswap
     for (i = 0; i < sizeof(Pico32xMem->sh2_rom_m); i += 2) {
       int t = Pico32xMem->sh2_rom_m[i];
       Pico32xMem->sh2_rom_m[i] = Pico32xMem->sh2_rom_m[i + 1];
       Pico32xMem->sh2_rom_m[i + 1] = t;
     }
+    for (i = 0; i < sizeof(Pico32xMem->sh2_rom_s); i += 2) {
+      int t = Pico32xMem->sh2_rom_s[i];
+      Pico32xMem->sh2_rom_s[i] = Pico32xMem->sh2_rom_s[i + 1];
+      Pico32xMem->sh2_rom_s[i + 1] = t;
+    }
   }
 
   // cartridge area becomes unmapped
@@ -646,5 +853,10 @@ void PicoMemSetup32x(void)
 
   // 32X ROM (banked)
   bank_switch(0);
+
+  // setup poll detector
+  m68k_poll.flag = P32XF_68KPOLL;
+  sh2_poll[0].flag = P32XF_MSH2POLL;
+  sh2_poll[1].flag = P32XF_SSH2POLL;
 }