X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=picodrive.git;a=blobdiff_plain;f=pico%2Fdebug.c;h=e3ef83bef557406e5aa0643da12179c312858241;hp=2370bfaf6c907bdb304f2ad3860fb5e0abb8e58d;hb=e0bcb7a90d06b295b1ca989b6ad70412912cca5b;hpb=cff531af94bd9c9c89ae162e80f48ddc26a4e504

diff --git a/pico/debug.c b/pico/debug.c
index 2370bfa..e3ef83b 100644
--- a/pico/debug.c
+++ b/pico/debug.c
@@ -20,13 +20,12 @@ char *PDebugMain(void)
 {
   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)
+  for (i = 0; Pico.est.HighPreSpr[i] != 0; i+=2)
+    if (Pico.est.HighPreSpr[i+1] & 0x8000)
          sprites_hi++;
     else sprites_lo++;
 
@@ -40,14 +39,11 @@ char *PDebugMain(void)
   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,
-  	!!(SRam.flags & SRF_ENABLED), !!(SRam.flags & SRF_EEPROM), SRam.eeprom_type); MVP;
+    !!(SRam.flags & SRF_ENABLED), !!(SRam.flags & SRF_EEPROM), 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, cycles: %i\n", Pico.m.pal, Pico.m.hardware, Pico.m.frame_count, SekCyclesDoneT()); MVP;
+  sprintf(dstrp, "pal: %i, hw: %02x, frame#: %i, cycles: %i\n", Pico.m.pal, Pico.m.hardware, Pico.m.frame_count, SekCyclesDone()); MVP;
   sprintf(dstrp, "M68k: PC: %06x, SR: %04x, irql: %i\n", SekPc, SekSr, SekIrqLevel); MVP;
-#if defined(EMU_C68K)
-  sprintf(dstrp - 1, ", st_flg: %x\n", PicoCpuCM68k.state_flags); MVP;
-#endif
   for (r = 0; r < 8; r++) {
     sprintf(dstrp, "d%i=%08x, a%i=%08x\n", r, SekDar(r), r, SekDar(r+8)); MVP;
   }
@@ -83,7 +79,7 @@ char *PDebug32x(void)
     i*2, r[i+0], r[i+1], r[i+2], r[i+3], r[i+4], r[i+5], r[i+6], r[i+7]); MVP;
 
   sprintf(dstrp, "                   mSH2              sSH2\n"); MVP;
-  sprintf(dstrp, "PC,SR %08x,     %03x %08x,     %03x\n", sh2_pc(0), sh2_sr(0), sh2_pc(1), sh2_sr(1)); MVP;
+  sprintf(dstrp, "PC,SR %08x,     %03x %08x,     %03x\n", sh2_pc(&msh2), sh2_sr(0), sh2_pc(&ssh2), sh2_sr(1)); MVP;
   for (i = 0; i < 16/2; i++) {
     sprintf(dstrp, "R%d,%2d %08x,%08x %08x,%08x\n", i, i + 8,
       sh2_reg(0,i), sh2_reg(0,i+8), sh2_reg(1,i), sh2_reg(1,i+8)); MVP;
@@ -200,29 +196,30 @@ void PDebugShowSpriteStats(unsigned short *screen, int stride)
 
 void PDebugShowPalette(unsigned short *screen, int stride)
 {
+  struct PicoEState *est = &Pico.est;
   int x, y;
 
   Pico.m.dirtyPal = 1;
   if (PicoAHW & PAHW_SMS)
     PicoDoHighPal555M4();
   else
-    PicoDoHighPal555(1);
+    PicoDoHighPal555(1, 0, est);
   Pico.m.dirtyPal = 1;
 
   screen += 16*stride+8;
   for (y = 0; y < 8*4; y++)
     for (x = 0; x < 8*16; x++)
-      screen[x + y*stride] = HighPal[x/8 + (y/8)*16];
+      screen[x + y*stride] = est->HighPal[x/8 + (y/8)*16];
 
   screen += 160;
   for (y = 0; y < 8*4; y++)
     for (x = 0; x < 8*16; x++)
-      screen[x + y*stride] = HighPal[(x/8 + (y/8)*16) | 0x40];
+      screen[x + y*stride] = est->HighPal[(x/8 + (y/8)*16) | 0x40];
 
   screen += stride*48;
   for (y = 0; y < 8*4; y++)
     for (x = 0; x < 8*16; x++)
-      screen[x + y*stride] = HighPal[(x/8 + (y/8)*16) | 0x80];
+      screen[x + y*stride] = est->HighPal[(x/8 + (y/8)*16) | 0x80];
 }
 
 #if defined(DRAW2_OVERRIDE_LINE_WIDTH)
@@ -236,6 +233,7 @@ void PDebugShowSprite(unsigned short *screen, int stride, int which)
   struct PicoVideo *pvid=&Pico.video;
   int table=0,u,link=0,*sprite=0,*fsprite,oldsprite[2];
   int x,y,max_sprites = 80, oldcol, oldreg;
+  unsigned char olddbg;
 
   if (!(pvid->reg[12]&1))
     max_sprites = 64;
@@ -260,16 +258,17 @@ void PDebugShowSprite(unsigned short *screen, int stride, int which)
   fsprite[1] = (sprite[1] & ~0x01ff8000) | 0x800000;
   oldreg = pvid->reg[7];
   oldcol = Pico.cram[0];
+  olddbg = pvid->debug_p;
   pvid->reg[7] = 0;
   Pico.cram[0] = 0;
-  PicoDrawMask = PDRAW_SPRITES_LOW_ON;
+  pvid->debug_p = PVD_KILL_A | PVD_KILL_B;
 
   PicoFrameFull();
   for (y = 0; y < 8*4; y++)
   {
-    unsigned char *ps = PicoDraw2FB + DRAW2_LINE_WIDTH*y + 8;
+    unsigned char *ps = Pico.est.Draw2FB + DRAW2_LINE_WIDTH*y + 8;
     for (x = 0; x < 8*4; x++)
-      if (ps[x]) screen[x] = HighPal[ps[x]], ps[x] = 0;
+      if (ps[x]) screen[x] = Pico.est.HighPal[ps[x]], ps[x] = 0;
     screen += stride;
   }
 
@@ -277,7 +276,7 @@ void PDebugShowSprite(unsigned short *screen, int stride, int which)
   fsprite[1] = oldsprite[1];
   pvid->reg[7] = oldreg;
   Pico.cram[0] = oldcol;
-  PicoDrawMask = -1;
+  pvid->debug_p = olddbg;
 }
 
 #define dump_ram(ram,fname) \
@@ -345,8 +344,8 @@ void PDebugDumpMem(void)
     dump_ram(Pico32xMem->dram[0], "dumps/dram0.bin");
     dump_ram(Pico32xMem->dram[1], "dumps/dram1.bin");
     dump_ram(Pico32xMem->pal, "dumps/pal32x.bin");
-    dump_ram(Pico32xMem->data_array[0], "dumps/data_array0.bin");
-    dump_ram(Pico32xMem->data_array[1], "dumps/data_array1.bin");
+    dump_ram(msh2.data_array, "dumps/data_array0.bin");
+    dump_ram(ssh2.data_array, "dumps/data_array1.bin");
   }
 #endif
 }
@@ -402,3 +401,168 @@ void PDebugCPUStep(void)
     SekStepM68k();
 }
 
+#ifdef EVT_LOG
+static struct evt_t {
+  unsigned int cycles;
+  short cpu;
+  short evt;
+} *evts;
+static int first_frame;
+static int evt_alloc;
+static int evt_cnt;
+
+void pevt_log(unsigned int cycles, enum evt_cpu c, enum evt e)
+{
+  if (first_frame == 0)
+    first_frame = Pico.m.frame_count;
+  if (evt_alloc == evt_cnt) {
+    evt_alloc = evt_alloc * 2 + 16 * 1024;
+    evts = realloc(evts, evt_alloc * sizeof(evts[0]));
+  }
+  evts[evt_cnt].cycles = cycles;
+  evts[evt_cnt].cpu = c;
+  evts[evt_cnt].evt = e;
+  evt_cnt++;
+}
+
+static int evt_cmp(const void *p1, const void *p2)
+{
+  const struct evt_t *e1 = p1, *e2 = p2;
+  int ret = (int)(e1->cycles - e2->cycles);
+  if (ret)
+    return ret;
+  if (e1->evt == EVT_RUN_END || e1->evt == EVT_POLL_END)
+    return -1;
+  if (e1->evt == EVT_RUN_START || e1->evt == EVT_POLL_START)
+    return 1;
+  if (e2->evt == EVT_RUN_END || e2->evt == EVT_POLL_END)
+    return 1;
+  if (e1->evt == EVT_RUN_START || e1->evt == EVT_POLL_START)
+    return -1;
+  return 0;
+}
+
+void pevt_dump(void)
+{
+  static const char *evt_names[EVT_CNT] = {
+    "x", "x", "+run", "-run", "+poll", "-poll",
+  };
+  char evt_print[EVT_CPU_CNT][EVT_CNT] = {{0,}};
+  unsigned int start_cycles[EVT_CPU_CNT] = {0,};
+  unsigned int run_cycles[EVT_CPU_CNT] = {0,};
+  unsigned int frame_cycles[EVT_CPU_CNT] = {0,};
+  unsigned int frame_resched[EVT_CPU_CNT] = {0,};
+  unsigned int cycles = 0;
+  int frame = first_frame - 1;
+  int line = 0;
+  int cpu_mask = 0;
+  int dirty = 0;
+  int i;
+
+  qsort(evts, evt_cnt, sizeof(evts[0]), evt_cmp);
+
+  for (i = 0; i < evt_cnt; i++) {
+    int c = evts[i].cpu, e = evts[i].evt;
+    int ei, ci;
+
+    if (cycles != evts[i].cycles || (cpu_mask & (1 << c))
+        || e == EVT_FRAME_START || e == EVT_NEXT_LINE)
+    {
+      if (dirty) {
+        printf("%u:%03u:%u ", frame, line, cycles);
+        for (ci = 0; ci < EVT_CPU_CNT; ci++) {
+          int found = 0;
+          for (ei = 0; ei < EVT_CNT; ei++) {
+            if (evt_print[ci][ei]) {
+              if (ei == EVT_RUN_END) {
+                printf("%8s%4d", evt_names[ei], run_cycles[ci]);
+                run_cycles[ci] = 0;
+              }
+              else
+                printf("%8s    ", evt_names[ei]);
+              found = 1;
+            }
+          }
+          if (!found)
+            printf("%12s", "");
+        }
+        printf("\n");
+        memset(evt_print, 0, sizeof(evt_print));
+        cpu_mask = 0;
+        dirty = 0;
+      }
+      cycles = evts[i].cycles;
+    }
+
+    switch (e) {
+    case EVT_FRAME_START:
+      frame++;
+      line = 0;
+      printf("%u:%03u:%u ", frame, line, cycles);
+      for (ci = 0; ci < EVT_CPU_CNT; ci++) {
+        printf("%12u", frame_cycles[ci]);
+        frame_cycles[ci] = 0;
+      }
+      printf("\n");
+      printf("%u:%03u:%u ", frame, line, cycles);
+      for (ci = 0; ci < EVT_CPU_CNT; ci++) {
+        printf("%12u", frame_resched[ci]);
+        frame_resched[ci] = 0;
+      }
+      printf("\n");
+      break;
+    case EVT_NEXT_LINE:
+      line++;
+      printf("%u:%03u:%u\n", frame, line, cycles);
+      break;
+    case EVT_RUN_START:
+      start_cycles[c] = cycles;
+      goto default_;
+    case EVT_RUN_END:
+      run_cycles[c] += cycles - start_cycles[c];
+      frame_cycles[c] += cycles - start_cycles[c];
+      frame_resched[c]++;
+      goto default_;
+    default_:
+    default:
+      evt_print[c][e] = 1;
+      cpu_mask |= 1 << c;
+      dirty = 1;
+      break;
+    }
+  }
+}
+#endif
+
+#if defined(CPU_CMP_R) || defined(CPU_CMP_W) || defined(DRC_CMP)
+static FILE *tl_f;
+
+void tl_write(const void *ptr, size_t size)
+{
+  if (tl_f == NULL)
+    tl_f = fopen("tracelog", "wb");
+
+  fwrite(ptr, 1, size, tl_f);
+}
+
+void tl_write_uint(unsigned char ctl, unsigned int v)
+{
+  tl_write(&ctl, sizeof(ctl));
+  tl_write(&v, sizeof(v));
+}
+
+int tl_read(void *ptr, size_t size)
+{
+  if (tl_f == NULL)
+    tl_f = fopen("tracelog", "rb");
+
+  return fread(ptr, 1, size, tl_f);
+}
+
+int tl_read_uint(void *ptr)
+{
+  return tl_read(ptr, 4);
+}
+#endif
+
+// vim:shiftwidth=2:ts=2:expandtab