X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPico.c;h=f1ee4550137881229d48977a8a90cc1b37ba7325;hb=5f9a0d16309e732ad09b4f5827422cf658bed8c2;hp=58c1a354638654bf7c68acdb4e55ff62903224f2;hpb=b6d7ac70909e29ba8f40d6eaee53dd5b1bb71e52;p=picodrive.git

diff --git a/Pico/Pico.c b/Pico/Pico.c
index 58c1a35..f1ee455 100644
--- a/Pico/Pico.c
+++ b/Pico/Pico.c
@@ -1,7 +1,7 @@
-// This is part of Pico Library
+// PicoDrive
 
 // (c) Copyright 2004 Dave, All rights reserved.
-// (c) Copyright 2006 notaz, All rights reserved.
+// (c) Copyright 2006-2008 notaz, All rights reserved.
 // Free for non-commercial use.
 
 // For commercial use, separate licencing terms must be obtained.
@@ -16,6 +16,7 @@ int PicoOpt = 0;
 int PicoSkipFrame = 0; // skip rendering frame?
 int emustatus = 0;     // rapid_ym2612, multi_ym_updates
 int PicoPad[2];        // Joypads, format is SACB RLDU
+int PicoPadInt[2];     // internal copy
 int PicoAHW = 0;       // active addon hardware: scd_active, 32x_active, svp_active, pico_active
 int PicoRegionOverride = 0; // override the region detection 0: Auto, 1: Japan NTSC, 2: Japan PAL, 4: US, 8: Europe
 int PicoAutoRgnOrder = 0;
@@ -23,14 +24,15 @@ struct PicoSRAM SRam = {0,};
 
 void (*PicoWriteSound)(int len) = NULL; // called at the best time to send sound buffer (PsndOut) to hardware
 void (*PicoResetHook)(void) = NULL;
-void (*PicoLineHook)(int count) = NULL;
+void (*PicoLineHook)(void) = NULL;
 
 // to be called once on emu init
-int PicoInit(void)
+void PicoInit(void)
 {
   // Blank space for state:
   memset(&Pico,0,sizeof(Pico));
   memset(&PicoPad,0,sizeof(PicoPad));
+  memset(&PicoPadInt,0,sizeof(PicoPadInt));
 
   // Init CPUs:
   SekInit();
@@ -40,8 +42,6 @@ int PicoInit(void)
   PicoSVPInit();
 
   SRam.data=0;
-
-  return 0;
 }
 
 // to be called once on emu exit
@@ -147,6 +147,7 @@ int PicoReset(void)
 
   PicoMemReset();
   SekReset();
+  memset(&PicoPadInt,0,sizeof(PicoPadInt));
   // s68k doesn't have the TAS quirk, so we just globally set normal TAS handler in MCD mode (used by Batman games).
   SekSetRealTAS(PicoAHW & PAHW_MCD);
   SekCycleCntT=0;
@@ -220,7 +221,8 @@ PICO_INTERNAL int CheckDMA(void)
   if(Pico.video.reg[12] & 1) dma_op |= 4; // 40 cell mode?
   if(!(Pico.video.status&8)&&(Pico.video.reg[1]&0x40)) dma_op|=8; // active display?
   xfers_can = dma_timings[dma_op];
-  if(xfers <= xfers_can) {
+  if(xfers <= xfers_can)
+  {
     if(dma_op&2) Pico.video.status&=~2; // dma no longer busy
     else {
       burn = xfers * dma_bsycles[dma_op] >> 8; // have to be approximate because can't afford division..
@@ -251,40 +253,10 @@ static __inline void SekRunM68k(int cyc)
 #elif defined(EMU_M68K)
   SekCycleCnt+=m68k_execute(cyc_do);
 #elif defined(EMU_F68K)
-  SekCycleCnt+=fm68k_emulate(cyc_do+1, 0);
+  SekCycleCnt+=fm68k_emulate(cyc_do+1, 0, 0);
 #endif
 }
 
-static __inline void SekStep(void)
-{
-  // this is required for timing sensitive stuff to work
-  int realaim=SekCycleAim; SekCycleAim=SekCycleCnt+1;
-#if defined(EMU_CORE_DEBUG)
-  SekCycleCnt+=CM_compareRun(1, 0);
-#elif defined(EMU_C68K)
-  PicoCpuCM68k.cycles=1;
-  CycloneRun(&PicoCpuCM68k);
-  SekCycleCnt+=1-PicoCpuCM68k.cycles;
-#elif defined(EMU_M68K)
-  SekCycleCnt+=m68k_execute(1);
-#elif defined(EMU_F68K)
-  SekCycleCnt+=fm68k_emulate(1, 0);
-#endif
-  SekCycleAim=realaim;
-}
-
-static int CheckIdle(void)
-{
-  int i, state[0x24];
-
-  // See if the state is the same after 2 steps:
-  SekState(state); SekStep(); SekStep(); SekState(state+0x12);
-  for (i = 0x11; i >= 0; i--)
-    if (state[i] != state[i+0x12]) return 0;
-
-  return 1;
-}
-
 
 // to be called on 224 or line_sample scanlines only
 static __inline void getSamples(int y)
@@ -339,216 +311,27 @@ PICO_INTERNAL void PicoSyncZ80(int m68k_cycles_done)
 }
 
 
-// Simple frame without H-Ints
-static int PicoFrameSimple(void)
-{
-  struct PicoVideo *pv=&Pico.video;
-  int y=0,lines_step=0,sects,line_last;
-  int cycles_68k_vblock,cycles_68k_block;
-
-  // split to 16 run calls for active scan, for vblank split to 2 (ntsc), 3 (pal 240), 4 (pal 224)
-  if (Pico.m.pal)
-  {
-    if(pv->reg[1]&8) { // 240 lines
-      cycles_68k_block  = 7308;
-      cycles_68k_vblock = 11694;
-      lines_step = 15;
-    } else {
-      cycles_68k_block  = 6821;
-      cycles_68k_vblock = 10719;
-      lines_step = 14;
-    }
-    line_last = 312-1;
-  } else {
-    // M68k cycles/frame: 127840.71
-    cycles_68k_block  = 6841; // (488*224+148)/16.0, -4
-    cycles_68k_vblock = 9164; // (38*488-148-68)/2.0, 0
-    lines_step = 14;
-    line_last = 262-1;
-  }
-
-  // a hack for VR, to get it running in fast mode
-  if (PicoAHW & PAHW_SVP)
-    Pico.ram[0xd864^1] = 0x1a;
-
-  // we don't emulate DMA timing in this mode
-  if (Pico.m.dma_xfers) {
-    Pico.m.dma_xfers=0;
-    Pico.video.status&=~2;
-  }
-
-  // VDP FIFO too
-  pv->lwrite_cnt = 0;
-  Pico.video.status|=0x200;
-
-  Pico.m.scanline=-1;
-  PsndDacLine = 0;
-
-  SekCyclesReset();
-  z80_resetCycles();
-
-  // 6 button pad: let's just say it timed out now
-  Pico.m.padTHPhase[0]=Pico.m.padTHPhase[1]=0;
-
-  // ---- Active Scan ----
-  pv->status&=~0x88; // clear V-Int, come out of vblank
-
-  // Run in sections:
-  for (sects=16; sects; sects--)
-  {
-    if (CheckIdle()) break;
-
-    SekRunM68k(cycles_68k_block);
-    if (PicoLineHook) PicoLineHook(lines_step);
-  }
-
-  // do remaining sections without 68k
-  if (sects) {
-    SekCycleCnt += sects * cycles_68k_block;
-    SekCycleAim += sects * cycles_68k_block;
-
-    if (PicoLineHook) PicoLineHook(sects*lines_step);
-  }
-
-  // another hack for VR (it needs hints to work)
-  if (PicoAHW & PAHW_SVP) {
-    Pico.ram[0xd864^1] = 1;
-    pv->pending_ints|=0x10;
-    if (pv->reg[0]&0x10) SekInterrupt(4);
-    SekRunM68k(160);
-  }
-
-  // render screen
-  if (!PicoSkipFrame)
-  {
-    if (!(PicoOpt&POPT_ALT_RENDERER))
-    {
-      // Draw the screen
-#if 0
-#if CAN_HANDLE_240_LINES
-      if (pv->reg[1]&8) {
-        for (y=0;y<240;y++) PicoLine(y);
-      } else {
-        for (y=0;y<224;y++) PicoLine(y);
-      }
-#else
-      for (y=0;y<224;y++) PicoLine(y);
-#endif
-#endif
-    }
-    else PicoFrameFull();
-#ifdef DRAW_FINISH_FUNC
-    DRAW_FINISH_FUNC();
-#endif
-  }
-
-  // a gap between flags set and vint
-  pv->pending_ints|=0x20;
-  pv->status|=8; // go into vblank
-  SekRunM68k(68+4);
-
-  if (Pico.m.z80Run && (PicoOpt&POPT_EN_Z80))
-    PicoSyncZ80(SekCycleCnt);
-
-  // render sound
-  if (PsndOut)
-  {
-    int len;
-    if (ym2612.dacen && PsndDacLine <= lines_step*16)
-      PsndDoDAC(lines_step*16);
-    len = PsndRender(0, PsndLen);
-    if (PicoWriteSound) PicoWriteSound(len);
-    // clear sound buffer
-    PsndClear();
-  }
-
-  // ---- V-Blanking period ----
-  // fix line counts
-  if(Pico.m.pal) {
-    if(pv->reg[1]&8) { // 240 lines
-      sects = 3;
-      lines_step = 24;
-    } else {
-      sects = 4;
-      lines_step = 22;
-    }
-  } else {
-    sects = 2;
-    lines_step = 19;
-  }
-
-  if (pv->reg[1]&0x20) SekInterrupt(6); // Set IRQ
-  if (Pico.m.z80Run && (PicoOpt&POPT_EN_Z80))
-    z80_int();
-
-  while (1)
-  {
-    SekRunM68k(cycles_68k_vblock);
-    if (PicoLineHook) PicoLineHook(lines_step);
-
-    sects--;
-    if (sects == 0) break;
-    if (CheckIdle()) break;
-  }
-
-  if (sects) {
-    SekCycleCnt += sects * cycles_68k_vblock;
-    SekCycleAim += sects * cycles_68k_vblock;
-    if (PicoLineHook) PicoLineHook(sects*lines_step);
-  }
-
-  // must sync z80 before return, and extend last DAC sample
-  if (Pico.m.z80Run && (PicoOpt&POPT_EN_Z80))
-    PicoSyncZ80(SekCycleCnt);
-  if (PsndOut && ym2612.dacen && PsndDacLine <= line_last)
-    PsndDoDAC(line_last);
-
-  timers_cycle();
-
-  return 0;
-}
-
-int idle_hit_counter = 0;
-
-int PicoFrame(void)
+void PicoFrame(void)
 {
-  int acc;
-
-  if ((Pico.m.frame_count&0x3f) == 0) {
-    elprintf(EL_STATUS, "ihits: %i", idle_hit_counter);
-    idle_hit_counter = 0;
-  }
-
   Pico.m.frame_count++;
 
   if (PicoAHW & PAHW_MCD) {
     PicoFrameMCD();
-    return 0;
+    return;
   }
 
-  // be accurate if we are asked for this
-  if (PicoOpt&POPT_ACC_TIMING) acc=1;
-  // don't be accurate in alternative render mode, as hint effects will not be rendered anyway
-  else if (PicoOpt&POPT_ALT_RENDERER) acc = 0;
-  else acc=Pico.video.reg[0]&0x10; // be accurate if hints are used
-
   //if(Pico.video.reg[12]&0x2) Pico.video.status ^= 0x10; // change odd bit in interlace mode
 
   if (!(PicoOpt&POPT_ALT_RENDERER))
     PicoFrameStart();
 
-  if (acc)
-       PicoFrameHints();
-  else PicoFrameSimple();
-
-  return 0;
+  PicoFrameHints();
 }
 
 void PicoFrameDrawOnly(void)
 {
-  int y;
   PicoFrameStart();
-  for (y=0;y<224;y++) PicoLine(y);
+  PicoDrawSync(223, 0);
 }
 
 void PicoGetInternal(pint_t which, pint_ret_t *r)
@@ -567,6 +350,7 @@ void (*PicoMessage)(const char *msg)=NULL;
 
 #if 1 // defined(__DEBUG_PRINT)
 #define bit(r, x) ((r>>x)&1)
+#define MVP dstrp+=strlen(dstrp)
 void z80_debug(char *dstr);
 char *debugString(void)
 {
@@ -574,40 +358,44 @@ char *debugString(void)
   static char dstr[1024];
   struct PicoVideo *pv=&Pico.video;
   unsigned char *reg=pv->reg, r;
+  extern int HighPreSpr[];
+  int i, sprites_lo, sprites_hi;
   char *dstrp;
 
+  sprites_lo = sprites_hi = 0;
+  for (i = 0; HighPreSpr[i] != 0; i+=2)
+    if (HighPreSpr[i+1] & 0x8000)
+         sprites_hi++;
+    else sprites_lo++;
+
   dstrp = dstr;
-  sprintf(dstrp, "mode set 1: %02x\n", (r=reg[0])); dstrp+=strlen(dstrp);
-  sprintf(dstrp, "display_disable: %i, M3: %i, palette: %i, ?, hints: %i\n", bit(r,0), bit(r,1), bit(r,2), bit(r,4));
-  dstrp+=strlen(dstrp);
-  sprintf(dstrp, "mode set 2: %02x\n", (r=reg[1])); dstrp+=strlen(dstrp);
-  sprintf(dstrp, "SMS/gen: %i, pal: %i, dma: %i, vints: %i, disp: %i, TMS: %i\n", bit(r,2), bit(r,3), bit(r,4),
-  	bit(r,5), bit(r,6), bit(r,7)); dstrp+=strlen(dstrp);
-  sprintf(dstrp, "mode set 3: %02x\n", (r=reg[0xB])); dstrp+=strlen(dstrp);
-  sprintf(dstrp, "LSCR: %i, HSCR: %i, 2cell vscroll: %i, IE2: %i\n", bit(r,0), bit(r,1), bit(r,2), bit(r,3)); dstrp+=strlen(dstrp);
-  sprintf(dstrp, "mode set 4: %02x\n", (r=reg[0xC])); dstrp+=strlen(dstrp);
-  sprintf(dstrp, "interlace: %i%i, cells: %i, shadow: %i\n", bit(r,2), bit(r,1), (r&0x80) ? 40 : 32,  bit(r,3));
-  dstrp+=strlen(dstrp);
+  sprintf(dstrp, "mode set 1: %02x       spr lo: %2i, spr hi: %2i\n", (r=reg[0]), sprites_lo, sprites_hi); MVP;
+  sprintf(dstrp, "display_disable: %i, M3: %i, palette: %i, ?, hints: %i\n", bit(r,0), bit(r,1), bit(r,2), bit(r,4)); MVP;
+  sprintf(dstrp, "mode set 2: %02x                            hcnt: %i\n", (r=reg[1]), pv->reg[10]); MVP;
+  sprintf(dstrp, "SMS/gen: %i, pal: %i, dma: %i, vints: %i, disp: %i, TMS: %i\n",bit(r,2),bit(r,3),bit(r,4),bit(r,5),bit(r,6),bit(r,7)); MVP;
+  sprintf(dstrp, "mode set 3: %02x\n", (r=reg[0xB])); MVP;
+  sprintf(dstrp, "LSCR: %i, HSCR: %i, 2cell vscroll: %i, IE2: %i\n", bit(r,0), bit(r,1), bit(r,2), bit(r,3)); MVP;
+  sprintf(dstrp, "mode set 4: %02x\n", (r=reg[0xC])); MVP;
+  sprintf(dstrp, "interlace: %i%i, cells: %i, shadow: %i\n", bit(r,2), bit(r,1), (r&0x80) ? 40 : 32, bit(r,3)); MVP;
   sprintf(dstrp, "scroll size: w: %i, h: %i  SRAM: %i; eeprom: %i (%i)\n", reg[0x10]&3, (reg[0x10]&0x30)>>4,
-  	bit(Pico.m.sram_reg, 4), bit(Pico.m.sram_reg, 2), SRam.eeprom_type); dstrp+=strlen(dstrp);
-  sprintf(dstrp, "sram range: %06x-%06x, reg: %02x\n", SRam.start, SRam.end, Pico.m.sram_reg); dstrp+=strlen(dstrp);
-  sprintf(dstrp, "pend int: v:%i, h:%i, vdp status: %04x\n", bit(pv->pending_ints,5), bit(pv->pending_ints,4), pv->status);
-  dstrp+=strlen(dstrp);
+  	bit(Pico.m.sram_reg, 4), bit(Pico.m.sram_reg, 2), SRam.eeprom_type); MVP;
+  sprintf(dstrp, "sram range: %06x-%06x, reg: %02x\n", SRam.start, SRam.end, Pico.m.sram_reg); MVP;
+  sprintf(dstrp, "pend int: v:%i, h:%i, vdp status: %04x\n", bit(pv->pending_ints,5), bit(pv->pending_ints,4), pv->status); MVP;
+  sprintf(dstrp, "pal: %i, hw: %02x, frame#: %i\n", Pico.m.pal, Pico.m.hardware, Pico.m.frame_count); MVP;
 #if defined(EMU_C68K)
-  sprintf(dstrp, "M68k: PC: %06x, st_flg: %x, cycles: %u\n", SekPc, PicoCpuCM68k.state_flags, SekCyclesDoneT());
-  dstrp+=strlen(dstrp);
-  sprintf(dstrp, "d0=%08x, a0=%08x, osp=%08x, irql=%i\n", PicoCpuCM68k.d[0], PicoCpuCM68k.a[0], PicoCpuCM68k.osp, PicoCpuCM68k.irq); dstrp+=strlen(dstrp);
-  sprintf(dstrp, "d1=%08x, a1=%08x,  sr=%04x\n", PicoCpuCM68k.d[1], PicoCpuCM68k.a[1], CycloneGetSr(&PicoCpuCM68k)); dstrp+=strlen(dstrp);
+  sprintf(dstrp, "M68k: PC: %06x, st_flg: %x, cycles: %u\n", SekPc, PicoCpuCM68k.state_flags, SekCyclesDoneT()); MVP;
+  sprintf(dstrp, "d0=%08x, a0=%08x, osp=%08x, irql=%i\n", PicoCpuCM68k.d[0], PicoCpuCM68k.a[0], PicoCpuCM68k.osp, PicoCpuCM68k.irq); MVP;
+  sprintf(dstrp, "d1=%08x, a1=%08x,  sr=%04x\n", PicoCpuCM68k.d[1], PicoCpuCM68k.a[1], CycloneGetSr(&PicoCpuCM68k)); dstrp+=strlen(dstrp); MVP;
   for(r=2; r < 8; r++) {
-    sprintf(dstrp, "d%i=%08x, a%i=%08x\n", r, PicoCpuCM68k.d[r], r, PicoCpuCM68k.a[r]); dstrp+=strlen(dstrp);
+    sprintf(dstrp, "d%i=%08x, a%i=%08x\n", r, PicoCpuCM68k.d[r], r, PicoCpuCM68k.a[r]); MVP;
   }
 #elif defined(EMU_M68K)
-  sprintf(dstrp, "M68k: PC: %06x, cycles: %u, irql: %i\n", SekPc, SekCyclesDoneT(), PicoCpuMM68k.int_level>>8); dstrp+=strlen(dstrp);
+  sprintf(dstrp, "M68k: PC: %06x, cycles: %u, irql: %i\n", SekPc, SekCyclesDoneT(), PicoCpuMM68k.int_level>>8); MVP;
 #elif defined(EMU_F68K)
-  sprintf(dstrp, "M68k: PC: %06x, cycles: %u, irql: %i\n", SekPc, SekCyclesDoneT(), PicoCpuFM68k.interrupts[0]); dstrp+=strlen(dstrp);
+  sprintf(dstrp, "M68k: PC: %06x, cycles: %u, irql: %i\n", SekPc, SekCyclesDoneT(), PicoCpuFM68k.interrupts[0]); MVP;
 #endif
-  sprintf(dstrp, "z80Run: %i, pal: %i, frame#: %i\n", Pico.m.z80Run, Pico.m.pal, Pico.m.frame_count); dstrp+=strlen(dstrp);
-  z80_debug(dstrp); dstrp+=strlen(dstrp);
+  sprintf(dstrp, "z80Run: %i, z80_reset: %i, z80_bnk: %06x\n", Pico.m.z80Run, Pico.m.z80_reset, Pico.m.z80_bank68k<<15); MVP;
+  z80_debug(dstrp); MVP;
   if (strlen(dstr) > sizeof(dstr))
     printf("warning: debug buffer overflow (%i/%i)\n", strlen(dstr), sizeof(dstr));