-#include "PicoInt.h"\r
-\r
-typedef unsigned char u8;\r
-\r
-static unsigned int pppc, ops=0;\r
-extern unsigned int lastread_a, lastread_d[16], lastwrite_cyc_d[16], lastwrite_mus_d[16];\r
-extern int lrp_cyc, lrp_mus, lwp_cyc, lwp_mus;\r
-unsigned int old_regs[16], old_sr, ppop, have_illegal = 0;\r
-int dbg_irq_level = 0, dbg_irq_level_sub = 0;\r
-\r
-#undef dprintf\r
-#define dprintf(f,...) printf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__)\r
-\r
-#if defined(EMU_C68K)\r
-static struct Cyclone *currentC68k = NULL;\r
-#define other_set_sub(s) currentC68k=(s)?&PicoCpuCS68k:&PicoCpuCM68k;\r
-#define other_get_sr() CycloneGetSr(currentC68k)\r
-#define other_dar(i) currentC68k->d[i]\r
-#define other_osp currentC68k->osp\r
-#define other_get_irq() currentC68k->irq\r
-#define other_set_irq(i) currentC68k->irq=i\r
-#define other_is_stopped() (currentC68k->state_flags&1)\r
-#define other_is_tracing() ((currentC68k->state_flags&2)?1:0)\r
-#elif defined(EMU_F68K)\r
-#define other_set_sub(s) g_m68kcontext=(s)?&PicoCpuFS68k:&PicoCpuFM68k;\r
-#define other_get_sr() g_m68kcontext->sr\r
-#define other_dar(i) ((unsigned int*)g_m68kcontext->dreg)[i]\r
-#define other_osp g_m68kcontext->asp\r
-#define other_get_irq() g_m68kcontext->interrupts[0]\r
-#define other_set_irq(irq) g_m68kcontext->interrupts[0]=irq\r
-#define other_is_stopped() ((g_m68kcontext->execinfo&FM68K_HALTED)?1:0)\r
-#define other_is_tracing() ((g_m68kcontext->execinfo&FM68K_EMULATE_TRACE)?1:0)\r
-#else\r
-#error other core missing, don't compile this file\r
-#endif\r
-\r
-static int otherRun(void)\r
-{\r
-#if defined(EMU_C68K)\r
- currentC68k->cycles=1;\r
- CycloneRun(currentC68k);\r
- return 1-currentC68k->cycles;\r
-#elif defined(EMU_F68K)\r
- return fm68k_emulate(1, 0);\r
-#endif\r
-}\r
-\r
-//static\r
-void dumpPCandExit(int is_sub)\r
-{\r
- char buff[128];\r
- int i;\r
-\r
- m68k_disassemble(buff, pppc, M68K_CPU_TYPE_68000);\r
- dprintf("PC: %06x: %04x: %s", pppc, ppop, buff);\r
- dprintf(" this | prev");\r
- for(i=0; i < 8; i++)\r
- dprintf("d%i=%08x, a%i=%08x | d%i=%08x, a%i=%08x", i, other_dar(i), i, other_dar(i+8), i, old_regs[i], i, old_regs[i+8]);\r
- dprintf("SR: %04x | %04x (??s? 0iii 000x nzvc)", other_get_sr(), old_sr);\r
- dprintf("last_read: %08x @ %06x", lastread_d[--lrp_cyc&15], lastread_a);\r
- dprintf("ops done: %i, is_sub: %i", ops, is_sub);\r
- exit(1);\r
-}\r
-\r
-int CM_compareRun(int cyc, int is_sub)\r
-{\r
- char *str;\r
- int cyc_done=0, cyc_other, cyc_musashi, *irq_level, err=0;\r
- unsigned int i, pc, mu_sr;\r
-\r
- m68ki_cpu_p=is_sub?&PicoCpuMS68k:&PicoCpuMM68k;\r
- other_set_sub(is_sub);\r
- lrp_cyc = lrp_mus = 0;\r
-\r
- while (cyc_done < cyc)\r
- {\r
- if (have_illegal && m68k_read_disassembler_16(m68ki_cpu.pc) != 0x4e73) // not rte\r
- {\r
- have_illegal = 0;\r
- m68ki_cpu.pc += 2;\r
-#ifdef EMU_C68K\r
- currentC68k->pc=currentC68k->checkpc(currentC68k->pc + 2);\r
-#endif\r
- }\r
- // hacks for test_misc2\r
- if (m68ki_cpu.pc == 0x0002e0 && m68k_read_disassembler_16(m68ki_cpu.pc) == 0x4e73)\r
- {\r
- // get out of "priviledge violation" loop\r
- have_illegal = 1;\r
- //m68ki_cpu.s_flag = SFLAG_SET;\r
- //currentC68k->srh|=0x20;\r
- }\r
-\r
- pppc = is_sub ? SekPcS68k : SekPc;\r
- ppop = m68k_read_disassembler_16(pppc);\r
- memcpy(old_regs, &other_dar(0), 4*16);\r
- old_sr = other_get_sr();\r
-\r
-#if 0\r
- {\r
- char buff[128];\r
- dprintf("---");\r
- m68k_disassemble(buff, pppc, M68K_CPU_TYPE_68000);\r
- dprintf("PC: %06x: %04x: %s", pppc, ppop, buff);\r
- //dprintf("A7: %08x", currentC68k->a[7]);\r
- }\r
-#endif\r
-\r
- irq_level = is_sub ? &dbg_irq_level_sub : &dbg_irq_level;\r
- if (*irq_level)\r
- {\r
- other_set_irq(*irq_level);\r
- m68k_set_irq(*irq_level);\r
- *irq_level=0;\r
- }\r
-\r
- cyc_other=otherRun();\r
- // Musashi takes irq even if it hasn't got cycles left, let othercpu do it too\r
- if (other_get_irq() && other_get_irq() > ((other_get_sr()>>8)&7))\r
- cyc_other+=otherRun();\r
- cyc_musashi=m68k_execute(1);\r
-\r
- if (cyc_other != cyc_musashi) {\r
- dprintf("cycles: %i vs %i", cyc_other, cyc_musashi);\r
- err=1;\r
- }\r
-\r
- if (lrp_cyc != lrp_mus) {\r
- dprintf("lrp: %i vs %i", lrp_cyc&15, lrp_mus&15);\r
- err=1;\r
- }\r
-\r
- if (lwp_cyc != lwp_mus) {\r
- dprintf("lwp: %i vs %i", lwp_cyc&15, lwp_mus&15);\r
- err=1;\r
- }\r
-\r
- for (i=0; i < 16; i++) {\r
- if (lastwrite_cyc_d[i] != lastwrite_mus_d[i]) {\r
- dprintf("lastwrite: [%i]= %08x vs %08x", i, lastwrite_cyc_d[i], lastwrite_mus_d[i]);\r
- err=1;\r
- break;\r
- }\r
- }\r
-\r
- // compare PC\r
- pc = is_sub ? SekPcS68k : SekPc;\r
- m68ki_cpu.pc&=~1;\r
- if (pc != m68ki_cpu.pc) {\r
- dprintf("PC: %06x vs %06x", pc, m68ki_cpu.pc);\r
- err=1;\r
- }\r
-\r
-#if 0\r
- if( SekPc > Pico.romsize || SekPc < 0x200 ) {\r
- dprintf("PC out of bounds: %06x", SekPc);\r
- err=1;\r
- }\r
-#endif\r
-\r
- // compare regs\r
- for (i=0; i < 16; i++) {\r
- if (other_dar(i) != m68ki_cpu.dar[i]) {\r
- str = (i < 8) ? "d" : "a";\r
- dprintf("reg: %s%i: %08x vs %08x", str, i&7, other_dar(i), m68ki_cpu.dar[i]);\r
- err=1;\r
- }\r
- }\r
-\r
- // SR\r
- if (other_get_sr() != (mu_sr = m68k_get_reg(NULL, M68K_REG_SR))) {\r
- dprintf("SR: %04x vs %04x (??s? 0iii 000x nzvc)", other_get_sr(), mu_sr);\r
- err=1;\r
- }\r
-\r
- // IRQl\r
- if (other_get_irq() != (m68ki_cpu.int_level>>8)) {\r
- dprintf("IRQ: %i vs %i", other_get_irq(), (m68ki_cpu.int_level>>8));\r
- err=1;\r
- }\r
-\r
- // OSP/USP\r
- if (other_osp != m68ki_cpu.sp[((mu_sr>>11)&4)^4]) {\r
- dprintf("OSP: %06x vs %06x", other_osp, m68ki_cpu.sp[((mu_sr>>11)&4)^4]);\r
- err=1;\r
- }\r
-\r
- // stopped\r
- if ((other_is_stopped() && !m68ki_cpu.stopped) || (!other_is_stopped() && m68ki_cpu.stopped)) {\r
- dprintf("stopped: %i vs %i", other_is_stopped(), m68ki_cpu.stopped);\r
- err=1;\r
- }\r
-\r
- // tracing\r
- if((other_is_tracing() && !m68ki_tracing) || (!other_is_tracing() && m68ki_tracing)) {\r
- dprintf("tracing: %i vs %i", other_is_tracing(), m68ki_tracing);\r
- err=1;\r
- }\r
-\r
- if(err) dumpPCandExit(is_sub);\r
-\r
-#if 0\r
- if (m68ki_cpu.dar[15] < 0x00ff0000 || m68ki_cpu.dar[15] >= 0x01000000)\r
- {\r
- other_dar(15) = m68ki_cpu.dar[15] = 0xff8000;\r
- }\r
-#endif\r
-#if 0\r
- m68k_set_reg(M68K_REG_SR, ((mu_sr-1)&~0x2000)|(mu_sr&0x2000)); // broken\r
- CycloneSetSr(currentC68k, ((mu_sr-1)&~0x2000)|(mu_sr&0x2000));\r
- currentC68k->stopped = m68ki_cpu.stopped = 0;\r
- if(SekPc > 0x400 && (currentC68k->a[7] < 0xff0000 || currentC68k->a[7] > 0xffffff))\r
- currentC68k->a[7] = m68ki_cpu.dar[15] = 0xff8000;\r
-#endif\r
-\r
- cyc_done += cyc_other;\r
- ops++;\r
- }\r
-\r
- return cyc_done;\r
-}\r
+// some debug code, just for fun of it
+// (c) Copyright 2008 notaz, All rights reserved.
+
+#include "PicoInt.h"
+#include "Debug.h"
+
+#define bit(r, x) ((r>>x)&1)
+#define MVP dstrp+=strlen(dstrp)
+void z80_debug(char *dstr);
+
+static char dstr[1024*8];
+
+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)
+ sprites_hi++;
+ else sprites_lo++;
+
+ dstrp = dstr;
+ 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); 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()); 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]); MVP;
+ }
+#elif defined(EMU_M68K)
+ 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]); MVP;
+#endif
+ 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));
+
+ return dstr;
+}
+
+char *PDebugSpriteList(void)
+{
+ struct PicoVideo *pvid=&Pico.video;
+ int table=0,u,link=0;
+ int max_sprites = 80;
+ char *dstrp;
+
+ if (!(pvid->reg[12]&1))
+ max_sprites = 64;
+
+ dstr[0] = 0;
+ dstrp = dstr;
+
+ table=pvid->reg[5]&0x7f;
+ if (pvid->reg[12]&1) table&=0x7e; // Lowest bit 0 in 40-cell mode
+ table<<=8; // Get sprite table address/2
+
+ for (u=0; u < max_sprites; u++)
+ {
+ unsigned int *sprite;
+ int code, code2, sx, sy, height;
+
+ sprite=(unsigned int *)(Pico.vram+((table+(link<<2))&0x7ffc)); // Find sprite
+
+ // get sprite info
+ code = sprite[0];
+
+ // check if it is on this line
+ sy = (code&0x1ff)-0x80;
+ height = ((code>>24)&3)+1;
+
+ // masking sprite?
+ code2 = sprite[1];
+ sx = ((code2>>16)&0x1ff)-0x80;
+
+ sprintf(dstrp, "#%02i x:%4i y:%4i %ix%i %s\n", u, sx, sy, ((code>>26)&3)+1, height,
+ (code2&0x8000)?"hi":"lo");
+ MVP;
+
+ link=(code>>16)&0x7f;
+ if(!link) break; // End of sprites
+ }
+
+ return dstr;
+}
+
+#define GREEN1 0x0700
+#ifdef USE_BGR555
+ #define YELLOW1 0x071c
+ #define BLUE1 0xf000
+ #define RED1 0x001e
+#else
+ #define YELLOW1 0xe700
+ #define BLUE1 0x001e
+ #define RED1 0xf000
+#endif
+
+static void set16(unsigned short *p, unsigned short d, int cnt)
+{
+ while (cnt-- > 0)
+ *p++ = d;
+}
+
+void PDebugShowSpriteStats(unsigned short *screen, int stride)
+{
+ int lines, i, u, step;
+ unsigned short *dest;
+ unsigned char *p;
+
+ step = (320-4*4-1) / MAX_LINE_SPRITES;
+ lines = 240;
+ if (!Pico.m.pal || !(Pico.video.reg[1]&8))
+ lines = 224, screen += stride*8;
+
+ for (i = 0; i < lines; i++)
+ {
+ dest = screen + stride*i;
+ p = &HighLnSpr[i][0];
+
+ // sprite graphs
+ for (u = 0; u < (p[0] & 0x7f); u++) {
+ set16(dest, (p[3+u] & 0x80) ? YELLOW1 : GREEN1, step);
+ dest += step;
+ }
+
+ // flags
+ dest = screen + stride*i + 320-4*4;
+ if (p[1] & 0x40) set16(dest+4*0, GREEN1, 4);
+ if (p[1] & 0x80) set16(dest+4*1, YELLOW1, 4);
+ if (p[1] & 0x20) set16(dest+4*2, BLUE1, 4);
+ if (p[1] & 0x10) set16(dest+4*3, RED1, 4);
+ }
+
+ // draw grid
+ for (i = step*5; i <= 320-4*4-1; i += step*5) {
+ for (u = 0; u < lines; u++)
+ screen[i + u*stride] = 0x182;
+ }
+}
+
+void PDebugShowPalette(unsigned short *screen, int stride)
+{
+ unsigned int *spal=(void *)Pico.cram;
+ unsigned int *dpal=(void *)HighPal;
+ int x, y, i;
+
+ for (i = 0x3f/2; i >= 0; i--)
+#ifdef USE_BGR555
+ dpal[i] = ((spal[i]&0x000f000f)<< 1)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)<<4);
+#else
+ dpal[i] = ((spal[i]&0x000f000f)<<12)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)>>7);
+#endif
+ for (i = 0x3f; i >= 0; i--)
+ HighPal[0x40|i] = (unsigned short)((HighPal[i]>>1)&0x738e);
+ for (i = 0x3f; i >= 0; i--) {
+ int t=HighPal[i]&0xe71c;t+=0x4208;if(t&0x20)t|=0x1c;if(t&0x800)t|=0x700;if(t&0x10000)t|=0xe000;t&=0xe71c;
+ HighPal[0x80|i] = (unsigned short)t;
+ }
+
+ 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 += 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 += 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];
+
+ Pico.m.dirtyPal = 1;
+}
+
+#if defined(DRAW2_OVERRIDE_LINE_WIDTH)
+#define DRAW2_LINE_WIDTH DRAW2_OVERRIDE_LINE_WIDTH
+#else
+#define DRAW2_LINE_WIDTH 328
+#endif
+
+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;
+
+ if (!(pvid->reg[12]&1))
+ max_sprites = 64;
+
+ table=pvid->reg[5]&0x7f;
+ if (pvid->reg[12]&1) table&=0x7e; // Lowest bit 0 in 40-cell mode
+ table<<=8; // Get sprite table address/2
+
+ for (u=0; u < max_sprites && u <= which; u++)
+ {
+ sprite=(int *)(Pico.vram+((table+(link<<2))&0x7ffc)); // Find sprite
+
+ link=(sprite[0]>>16)&0x7f;
+ if(!link) return; // End of sprites
+ }
+ if (u == max_sprites) return;
+
+ fsprite = (int *)(Pico.vram+(table&0x7ffc));
+ oldsprite[0] = fsprite[0];
+ oldsprite[1] = fsprite[1];
+ fsprite[0] = (sprite[0] & ~0x007f01ff) | 0x000080;
+ fsprite[1] = (sprite[1] & ~0x01ff8000) | 0x800000;
+ oldreg = pvid->reg[7];
+ oldcol = Pico.cram[0];
+ pvid->reg[7] = 0;
+ Pico.cram[0] = 0;
+ PicoDrawMask = PDRAW_SPRITES_LOW_ON;
+
+ PicoFrameFull();
+ for (y = 0; y < 8*4; y++)
+ {
+ unsigned char *ps = PicoDraw2FB + DRAW2_LINE_WIDTH*y + 8;
+ for (x = 0; x < 8*4; x++)
+ if (ps[x]) screen[x] = HighPal[ps[x]];
+ screen += stride;
+ }
+
+ fsprite[0] = oldsprite[0];
+ fsprite[1] = oldsprite[1];
+ pvid->reg[7] = oldreg;
+ Pico.cram[0] = oldcol;
+ PicoDrawMask = -1;
+}
+
+#define dump_ram(ram,fname) \
+{ \
+ unsigned short *sram = (unsigned short *) ram; \
+ FILE *f; \
+ int i; \
+\
+ for (i = 0; i < sizeof(ram)/2; i++) \
+ sram[i] = (sram[i]<<8) | (sram[i]>>8); \
+ f = fopen(fname, "wb"); \
+ if (f) { \
+ fwrite(ram, 1, sizeof(ram), f); \
+ fclose(f); \
+ } \
+ for (i = 0; i < sizeof(ram)/2; i++) \
+ sram[i] = (sram[i]<<8) | (sram[i]>>8); \
+}
+
+#define dump_ram_noswab(ram,fname) \
+{ \
+ FILE *f; \
+ f = fopen(fname, "wb"); \
+ if (f) { \
+ fwrite(ram, 1, sizeof(ram), f); \
+ fclose(f); \
+ } \
+}
+
+void PDebugDumpMem(void)
+{
+ dump_ram(Pico.ram, "dumps/ram.bin");
+ dump_ram_noswab(Pico.zram, "dumps/zram.bin");
+ dump_ram(Pico.vram, "dumps/vram.bin");
+ dump_ram(Pico.cram, "dumps/cram.bin");
+ dump_ram(Pico.vsram,"dumps/vsram.bin");
+
+ if (PicoAHW & PAHW_MCD)
+ {
+ dump_ram(Pico_mcd->prg_ram, "dumps/prg_ram.bin");
+ if (Pico_mcd->s68k_regs[3]&4) // 1M mode?
+ wram_1M_to_2M(Pico_mcd->word_ram2M);
+ dump_ram(Pico_mcd->word_ram2M, "dumps/word_ram_2M.bin");
+ wram_2M_to_1M(Pico_mcd->word_ram2M);
+ dump_ram(Pico_mcd->word_ram1M[0], "dumps/word_ram_1M_0.bin");
+ dump_ram(Pico_mcd->word_ram1M[1], "dumps/word_ram_1M_1.bin");
+ if (!(Pico_mcd->s68k_regs[3]&4)) // 2M mode?
+ wram_2M_to_1M(Pico_mcd->word_ram2M);
+ dump_ram_noswab(Pico_mcd->pcm_ram,"dumps/pcm_ram.bin");
+ dump_ram_noswab(Pico_mcd->bram, "dumps/bram.bin");
+ }
+}
+
--- /dev/null
+#include "PicoInt.h"\r
+\r
+typedef unsigned char u8;\r
+\r
+static unsigned int pppc, ops=0;\r
+extern unsigned int lastread_a, lastread_d[16], lastwrite_cyc_d[16], lastwrite_mus_d[16];\r
+extern int lrp_cyc, lrp_mus, lwp_cyc, lwp_mus;\r
+unsigned int old_regs[16], old_sr, ppop, have_illegal = 0;\r
+int dbg_irq_level = 0, dbg_irq_level_sub = 0;\r
+\r
+#undef dprintf\r
+#define dprintf(f,...) printf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__)\r
+\r
+#if defined(EMU_C68K)\r
+static struct Cyclone *currentC68k = NULL;\r
+#define other_set_sub(s) currentC68k=(s)?&PicoCpuCS68k:&PicoCpuCM68k;\r
+#define other_get_sr() CycloneGetSr(currentC68k)\r
+#define other_dar(i) currentC68k->d[i]\r
+#define other_osp currentC68k->osp\r
+#define other_get_irq() currentC68k->irq\r
+#define other_set_irq(i) currentC68k->irq=i\r
+#define other_is_stopped() (currentC68k->state_flags&1)\r
+#define other_is_tracing() ((currentC68k->state_flags&2)?1:0)\r
+#elif defined(EMU_F68K)\r
+#define other_set_sub(s) g_m68kcontext=(s)?&PicoCpuFS68k:&PicoCpuFM68k;\r
+#define other_get_sr() g_m68kcontext->sr\r
+#define other_dar(i) ((unsigned int*)g_m68kcontext->dreg)[i]\r
+#define other_osp g_m68kcontext->asp\r
+#define other_get_irq() g_m68kcontext->interrupts[0]\r
+#define other_set_irq(irq) g_m68kcontext->interrupts[0]=irq\r
+#define other_is_stopped() ((g_m68kcontext->execinfo&FM68K_HALTED)?1:0)\r
+#define other_is_tracing() ((g_m68kcontext->execinfo&FM68K_EMULATE_TRACE)?1:0)\r
+#else\r
+#error other core missing, don't compile this file\r
+#endif\r
+\r
+static int otherRun(void)\r
+{\r
+#if defined(EMU_C68K)\r
+ currentC68k->cycles=1;\r
+ CycloneRun(currentC68k);\r
+ return 1-currentC68k->cycles;\r
+#elif defined(EMU_F68K)\r
+ return fm68k_emulate(1, 0);\r
+#endif\r
+}\r
+\r
+//static\r
+void dumpPCandExit(int is_sub)\r
+{\r
+ char buff[128];\r
+ int i;\r
+\r
+ m68k_disassemble(buff, pppc, M68K_CPU_TYPE_68000);\r
+ dprintf("PC: %06x: %04x: %s", pppc, ppop, buff);\r
+ dprintf(" this | prev");\r
+ for(i=0; i < 8; i++)\r
+ dprintf("d%i=%08x, a%i=%08x | d%i=%08x, a%i=%08x", i, other_dar(i), i, other_dar(i+8), i, old_regs[i], i, old_regs[i+8]);\r
+ dprintf("SR: %04x | %04x (??s? 0iii 000x nzvc)", other_get_sr(), old_sr);\r
+ dprintf("last_read: %08x @ %06x", lastread_d[--lrp_cyc&15], lastread_a);\r
+ dprintf("ops done: %i, is_sub: %i", ops, is_sub);\r
+ exit(1);\r
+}\r
+\r
+int CM_compareRun(int cyc, int is_sub)\r
+{\r
+ char *str;\r
+ int cyc_done=0, cyc_other, cyc_musashi, *irq_level, err=0;\r
+ unsigned int i, pc, mu_sr;\r
+\r
+ m68ki_cpu_p=is_sub?&PicoCpuMS68k:&PicoCpuMM68k;\r
+ other_set_sub(is_sub);\r
+ lrp_cyc = lrp_mus = 0;\r
+\r
+ while (cyc_done < cyc)\r
+ {\r
+ if (have_illegal && m68k_read_disassembler_16(m68ki_cpu.pc) != 0x4e73) // not rte\r
+ {\r
+ have_illegal = 0;\r
+ m68ki_cpu.pc += 2;\r
+#ifdef EMU_C68K\r
+ currentC68k->pc=currentC68k->checkpc(currentC68k->pc + 2);\r
+#endif\r
+ }\r
+ // hacks for test_misc2\r
+ if (m68ki_cpu.pc == 0x0002e0 && m68k_read_disassembler_16(m68ki_cpu.pc) == 0x4e73)\r
+ {\r
+ // get out of "priviledge violation" loop\r
+ have_illegal = 1;\r
+ //m68ki_cpu.s_flag = SFLAG_SET;\r
+ //currentC68k->srh|=0x20;\r
+ }\r
+\r
+ pppc = is_sub ? SekPcS68k : SekPc;\r
+ ppop = m68k_read_disassembler_16(pppc);\r
+ memcpy(old_regs, &other_dar(0), 4*16);\r
+ old_sr = other_get_sr();\r
+\r
+#if 0\r
+ {\r
+ char buff[128];\r
+ dprintf("---");\r
+ m68k_disassemble(buff, pppc, M68K_CPU_TYPE_68000);\r
+ dprintf("PC: %06x: %04x: %s", pppc, ppop, buff);\r
+ //dprintf("A7: %08x", currentC68k->a[7]);\r
+ }\r
+#endif\r
+\r
+ irq_level = is_sub ? &dbg_irq_level_sub : &dbg_irq_level;\r
+ if (*irq_level)\r
+ {\r
+ other_set_irq(*irq_level);\r
+ m68k_set_irq(*irq_level);\r
+ *irq_level=0;\r
+ }\r
+\r
+ cyc_other=otherRun();\r
+ // Musashi takes irq even if it hasn't got cycles left, let othercpu do it too\r
+ if (other_get_irq() && other_get_irq() > ((other_get_sr()>>8)&7))\r
+ cyc_other+=otherRun();\r
+ cyc_musashi=m68k_execute(1);\r
+\r
+ if (cyc_other != cyc_musashi) {\r
+ dprintf("cycles: %i vs %i", cyc_other, cyc_musashi);\r
+ err=1;\r
+ }\r
+\r
+ if (lrp_cyc != lrp_mus) {\r
+ dprintf("lrp: %i vs %i", lrp_cyc&15, lrp_mus&15);\r
+ err=1;\r
+ }\r
+\r
+ if (lwp_cyc != lwp_mus) {\r
+ dprintf("lwp: %i vs %i", lwp_cyc&15, lwp_mus&15);\r
+ err=1;\r
+ }\r
+\r
+ for (i=0; i < 16; i++) {\r
+ if (lastwrite_cyc_d[i] != lastwrite_mus_d[i]) {\r
+ dprintf("lastwrite: [%i]= %08x vs %08x", i, lastwrite_cyc_d[i], lastwrite_mus_d[i]);\r
+ err=1;\r
+ break;\r
+ }\r
+ }\r
+\r
+ // compare PC\r
+ pc = is_sub ? SekPcS68k : SekPc;\r
+ m68ki_cpu.pc&=~1;\r
+ if (pc != m68ki_cpu.pc) {\r
+ dprintf("PC: %06x vs %06x", pc, m68ki_cpu.pc);\r
+ err=1;\r
+ }\r
+\r
+#if 0\r
+ if( SekPc > Pico.romsize || SekPc < 0x200 ) {\r
+ dprintf("PC out of bounds: %06x", SekPc);\r
+ err=1;\r
+ }\r
+#endif\r
+\r
+ // compare regs\r
+ for (i=0; i < 16; i++) {\r
+ if (other_dar(i) != m68ki_cpu.dar[i]) {\r
+ str = (i < 8) ? "d" : "a";\r
+ dprintf("reg: %s%i: %08x vs %08x", str, i&7, other_dar(i), m68ki_cpu.dar[i]);\r
+ err=1;\r
+ }\r
+ }\r
+\r
+ // SR\r
+ if (other_get_sr() != (mu_sr = m68k_get_reg(NULL, M68K_REG_SR))) {\r
+ dprintf("SR: %04x vs %04x (??s? 0iii 000x nzvc)", other_get_sr(), mu_sr);\r
+ err=1;\r
+ }\r
+\r
+ // IRQl\r
+ if (other_get_irq() != (m68ki_cpu.int_level>>8)) {\r
+ dprintf("IRQ: %i vs %i", other_get_irq(), (m68ki_cpu.int_level>>8));\r
+ err=1;\r
+ }\r
+\r
+ // OSP/USP\r
+ if (other_osp != m68ki_cpu.sp[((mu_sr>>11)&4)^4]) {\r
+ dprintf("OSP: %06x vs %06x", other_osp, m68ki_cpu.sp[((mu_sr>>11)&4)^4]);\r
+ err=1;\r
+ }\r
+\r
+ // stopped\r
+ if ((other_is_stopped() && !m68ki_cpu.stopped) || (!other_is_stopped() && m68ki_cpu.stopped)) {\r
+ dprintf("stopped: %i vs %i", other_is_stopped(), m68ki_cpu.stopped);\r
+ err=1;\r
+ }\r
+\r
+ // tracing\r
+ if((other_is_tracing() && !m68ki_tracing) || (!other_is_tracing() && m68ki_tracing)) {\r
+ dprintf("tracing: %i vs %i", other_is_tracing(), m68ki_tracing);\r
+ err=1;\r
+ }\r
+\r
+ if(err) dumpPCandExit(is_sub);\r
+\r
+#if 0\r
+ if (m68ki_cpu.dar[15] < 0x00ff0000 || m68ki_cpu.dar[15] >= 0x01000000)\r
+ {\r
+ other_dar(15) = m68ki_cpu.dar[15] = 0xff8000;\r
+ }\r
+#endif\r
+#if 0\r
+ m68k_set_reg(M68K_REG_SR, ((mu_sr-1)&~0x2000)|(mu_sr&0x2000)); // broken\r
+ CycloneSetSr(currentC68k, ((mu_sr-1)&~0x2000)|(mu_sr&0x2000));\r
+ currentC68k->stopped = m68ki_cpu.stopped = 0;\r
+ if(SekPc > 0x400 && (currentC68k->a[7] < 0xff0000 || currentC68k->a[7] > 0xffffff))\r
+ currentC68k->a[7] = m68ki_cpu.dar[15] = 0xff8000;\r
+#endif\r
+\r
+ cyc_done += cyc_other;\r
+ ops++;\r
+ }\r
+\r
+ return cyc_done;\r
+}\r
static int HighCacheB[41+1];\r
int HighPreSpr[80*2+1]; // slightly preprocessed sprites\r
\r
-#define MAX_LINE_SPRITES 29\r
#define SPRL_HAVE_HI 0x80 // have hi priority sprites\r
#define SPRL_HAVE_LO 0x40 // *lo*\r
#define SPRL_MAY_HAVE_OP 0x20 // may have operator sprites on the line\r
#endif\r
}\r
\r
-/* debug and fun */\r
-#define GREEN1 0x0700\r
-#ifdef USE_BGR555\r
- #define YELLOW1 0x071c\r
- #define BLUE1 0xf000\r
- #define RED1 0x001e\r
-#else\r
- #define YELLOW1 0xe700\r
- #define BLUE1 0x001e\r
- #define RED1 0xf000\r
-#endif\r
-\r
-static void set16(unsigned short *p, unsigned short d, int cnt)\r
-{\r
- while (cnt-- > 0)\r
- *p++ = d;\r
-}\r
-\r
-void PicoDrawShowSpriteStats(unsigned short *screen, int stride)\r
-{\r
- int lines, i, u, step;\r
- unsigned short *dest;\r
- unsigned char *p;\r
-\r
- step = (320-4*4-1) / MAX_LINE_SPRITES;\r
- lines = 240;\r
- if (!Pico.m.pal || !(Pico.video.reg[1]&8))\r
- lines = 224, screen += stride*8;\r
-\r
- for (i = 0; i < lines; i++)\r
- {\r
- dest = screen + stride*i;\r
- p = &HighLnSpr[i][0];\r
-\r
- // sprite graphs\r
- for (u = 0; u < (p[0] & 0x7f); u++) {\r
- set16(dest, (p[3+u] & 0x80) ? YELLOW1 : GREEN1, step);\r
- dest += step;\r
- }\r
-\r
- // flags\r
- dest = screen + stride*i + 320-4*4;\r
- if (p[1] & SPRL_HAVE_LO) set16(dest+4*0, GREEN1, 4);\r
- if (p[1] & SPRL_HAVE_HI) set16(dest+4*1, YELLOW1, 4);\r
- if (p[1] & SPRL_MAY_HAVE_OP) set16(dest+4*2, BLUE1, 4);\r
- if (p[1] & SPRL_LO_ABOVE_HI) set16(dest+4*3, RED1, 4);\r
- }\r
-\r
- // draw grid\r
- for (i = step*5; i <= 320-4*4-1; i += step*5) {\r
- for (u = 0; u < lines; u++)\r
- screen[i + u*stride] = 0x182;\r
- }\r
-}\r
-\r
-void PicoDrawShowPalette(unsigned short *screen, int stride)\r
-{\r
- unsigned int *spal=(void *)Pico.cram;\r
- unsigned int *dpal=(void *)HighPal;\r
- int x, y, i;\r
-\r
- for (i = 0x3f/2; i >= 0; i--)\r
-#ifdef USE_BGR555\r
- dpal[i] = ((spal[i]&0x000f000f)<< 1)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)<<4);\r
-#else\r
- dpal[i] = ((spal[i]&0x000f000f)<<12)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)>>7);\r
-#endif\r
- for (i = 0x3f; i >= 0; i--)\r
- HighPal[0x40|i] = (unsigned short)((HighPal[i]>>1)&0x738e);\r
- for (i = 0x3f; i >= 0; i--) {\r
- int t=HighPal[i]&0xe71c;t+=0x4208;if(t&0x20)t|=0x1c;if(t&0x800)t|=0x700;if(t&0x10000)t|=0xe000;t&=0xe71c;\r
- HighPal[0x80|i] = (unsigned short)t;\r
- }\r
-\r
- screen += 16*stride+8;\r
- for (y = 0; y < 8*4; y++)\r
- for (x = 0; x < 8*16; x++)\r
- screen[x + y*stride] = HighPal[x/8 + (y/8)*16];\r
-\r
- screen += 160;\r
- for (y = 0; y < 8*4; y++)\r
- for (x = 0; x < 8*16; x++)\r
- screen[x + y*stride] = HighPal[(x/8 + (y/8)*16) | 0x40];\r
-\r
- screen += stride*48;\r
- for (y = 0; y < 8*4; y++)\r
- for (x = 0; x < 8*16; x++)\r
- screen[x + y*stride] = HighPal[(x/8 + (y/8)*16) | 0x80];\r
-\r
- Pico.m.dirtyPal = 1;\r
-}\r
-\r
#define LINE_WIDTH 328\r
#endif\r
\r
-int currpri = 0;\r
-\r
static int HighCache2A[41*(TILE_ROWS+1)+1+1]; // caches for high layers\r
static int HighCache2B[41*(TILE_ROWS+1)+1+1];\r
\r
code=Pico.vram[nametab_row+(tilex&xmask)];\r
if (code==blank) continue;\r
\r
-#ifdef USE_CACHE\r
if (code>>15) { // high priority tile\r
*hcache++ = code|(dx<<16)|(trow<<27); // cache it\r
-#else\r
- if ((code>>15) != currpri) {\r
-#endif\r
continue;\r
}\r
\r
}\r
#endif\r
\r
-static void DrawDisplayFull()\r
+static void DrawDisplayFull(void)\r
{\r
struct PicoVideo *pvid=&Pico.video;\r
int win, edge=0, hvwin=0; // LSb->MSb: hwin&plane, vwin&plane, full\r
}\r
\r
// horizontal window?\r
- if((win=pvid->reg[0x12])) {\r
+ if ((win=pvid->reg[0x12]))\r
+ {\r
hvwin=1; // hwindow shares display with plane A\r
edge=win&0x1f;\r
if(win == 0x80) {\r
}\r
\r
// check for vertical window, but only if win is not fullscreen\r
- if(hvwin != 4) {\r
+ if (hvwin != 4)\r
+ {\r
win=pvid->reg[0x11];\r
edge=win&0x1f;\r
if (win&0x80) {\r
}\r
}\r
\r
- if(hvwin==1) { winend|=maxcolc<<16; planeend|=maxcolc<<16; }\r
+ if (hvwin==1) { winend|=maxcolc<<16; planeend|=maxcolc<<16; }\r
\r
- currpri = 0;\r
- DrawLayerFull(1, HighCache2B, START_ROW, (maxcolc<<16)|END_ROW);\r
- switch(hvwin) {\r
+ HighCache2A[1] = HighCache2B[1] = 0;\r
+ if (PicoDrawMask & PDRAW_LAYERB_ON)\r
+ DrawLayerFull(1, HighCache2B, START_ROW, (maxcolc<<16)|END_ROW);\r
+ if (PicoDrawMask & PDRAW_LAYERA_ON) switch (hvwin)\r
+ {\r
case 4:\r
// fullscreen window\r
DrawWindowFull(START_ROW, (maxcolc<<16)|END_ROW, 0);\r
- HighCache2A[1] = 0;\r
break;\r
\r
case 3:\r
DrawLayerFull(0, HighCache2A, START_ROW, (maxcolc<<16)|END_ROW);\r
break;\r
}\r
- DrawAllSpritesFull(0, maxw);\r
+ if (PicoDrawMask & PDRAW_SPRITES_LOW_ON)\r
+ DrawAllSpritesFull(0, maxw);\r
\r
-#ifdef USE_CACHE\r
- if(HighCache2B[1]) DrawTilesFromCacheF(HighCache2B);\r
- if(HighCache2A[1]) DrawTilesFromCacheF(HighCache2A);\r
- switch(hvwin) {\r
+ if (HighCache2B[1]) DrawTilesFromCacheF(HighCache2B);\r
+ if (HighCache2A[1]) DrawTilesFromCacheF(HighCache2A);\r
+ switch (hvwin)\r
+ {\r
case 4:\r
// fullscreen window\r
DrawWindowFull(START_ROW, (maxcolc<<16)|END_ROW, 1);\r
DrawWindowFull(winstart, winend, 1);\r
break;\r
}\r
-#else\r
- currpri = 1;\r
- // TODO\r
-#endif\r
- DrawAllSpritesFull(1, maxw);\r
+ if (PicoDrawMask & PDRAW_SPRITES_HI_ON)\r
+ DrawAllSpritesFull(1, maxw);\r
}\r
\r
\r
PICO_INTERNAL void PicoFrameFull()\r
{\r
// prepare cram?\r
- if(PicoPrepareCram) PicoPrepareCram();\r
+ if (PicoPrepareCram) PicoPrepareCram();\r
\r
// Draw screen:\r
BackFillFull(Pico.video.reg[7]);\r
// callback to output message from emu\r
void (*PicoMessage)(const char *msg)=NULL;\r
\r
-#if 1 // defined(__DEBUG_PRINT)\r
-#define bit(r, x) ((r>>x)&1)\r
-#define MVP dstrp+=strlen(dstrp)\r
-void z80_debug(char *dstr);\r
-char *debugString(void)\r
-{\r
-#if 1\r
- static char dstr[1024];\r
- struct PicoVideo *pv=&Pico.video;\r
- unsigned char *reg=pv->reg, r;\r
- extern int HighPreSpr[];\r
- int i, sprites_lo, sprites_hi;\r
- char *dstrp;\r
-\r
- sprites_lo = sprites_hi = 0;\r
- for (i = 0; HighPreSpr[i] != 0; i+=2)\r
- if (HighPreSpr[i+1] & 0x8000)\r
- sprites_hi++;\r
- else sprites_lo++;\r
-\r
- dstrp = dstr;\r
- sprintf(dstrp, "mode set 1: %02x spr lo: %2i, spr hi: %2i\n", (r=reg[0]), sprites_lo, sprites_hi); MVP;\r
- 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;\r
- sprintf(dstrp, "mode set 2: %02x hcnt: %i\n", (r=reg[1]), pv->reg[10]); MVP;\r
- 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;\r
- sprintf(dstrp, "mode set 3: %02x\n", (r=reg[0xB])); MVP;\r
- 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;\r
- sprintf(dstrp, "mode set 4: %02x\n", (r=reg[0xC])); MVP;\r
- sprintf(dstrp, "interlace: %i%i, cells: %i, shadow: %i\n", bit(r,2), bit(r,1), (r&0x80) ? 40 : 32, bit(r,3)); MVP;\r
- sprintf(dstrp, "scroll size: w: %i, h: %i SRAM: %i; eeprom: %i (%i)\n", reg[0x10]&3, (reg[0x10]&0x30)>>4,\r
- bit(Pico.m.sram_reg, 4), bit(Pico.m.sram_reg, 2), SRam.eeprom_type); MVP;\r
- sprintf(dstrp, "sram range: %06x-%06x, reg: %02x\n", SRam.start, SRam.end, Pico.m.sram_reg); MVP;\r
- 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;\r
- sprintf(dstrp, "pal: %i, hw: %02x, frame#: %i\n", Pico.m.pal, Pico.m.hardware, Pico.m.frame_count); MVP;\r
-#if defined(EMU_C68K)\r
- sprintf(dstrp, "M68k: PC: %06x, st_flg: %x, cycles: %u\n", SekPc, PicoCpuCM68k.state_flags, SekCyclesDoneT()); MVP;\r
- sprintf(dstrp, "d0=%08x, a0=%08x, osp=%08x, irql=%i\n", PicoCpuCM68k.d[0], PicoCpuCM68k.a[0], PicoCpuCM68k.osp, PicoCpuCM68k.irq); MVP;\r
- sprintf(dstrp, "d1=%08x, a1=%08x, sr=%04x\n", PicoCpuCM68k.d[1], PicoCpuCM68k.a[1], CycloneGetSr(&PicoCpuCM68k)); dstrp+=strlen(dstrp); MVP;\r
- for(r=2; r < 8; r++) {\r
- sprintf(dstrp, "d%i=%08x, a%i=%08x\n", r, PicoCpuCM68k.d[r], r, PicoCpuCM68k.a[r]); MVP;\r
- }\r
-#elif defined(EMU_M68K)\r
- sprintf(dstrp, "M68k: PC: %06x, cycles: %u, irql: %i\n", SekPc, SekCyclesDoneT(), PicoCpuMM68k.int_level>>8); MVP;\r
-#elif defined(EMU_F68K)\r
- sprintf(dstrp, "M68k: PC: %06x, cycles: %u, irql: %i\n", SekPc, SekCyclesDoneT(), PicoCpuFM68k.interrupts[0]); MVP;\r
-#endif\r
- sprintf(dstrp, "z80Run: %i, z80_reset: %i, z80_bnk: %06x\n", Pico.m.z80Run, Pico.m.z80_reset, Pico.m.z80_bank68k<<15); MVP;\r
- z80_debug(dstrp); MVP;\r
- if (strlen(dstr) > sizeof(dstr))\r
- printf("warning: debug buffer overflow (%i/%i)\n", strlen(dstr), sizeof(dstr));\r
-\r
-#else\r
- struct PicoVideo *pvid=&Pico.video;\r
- int table=0;\r
- int i,u,n,link=0;\r
- static char dstr[1024*8];\r
- dstr[0] = 0;\r
-\r
- table=pvid->reg[5]&0x7f;\r
- if (pvid->reg[12]&1) table&=0x7e; // Lowest bit 0 in 40-cell mode\r
- table<<=8; // Get sprite table address/2\r
-\r
- for (i=u=n=0; u < 80 && n < 20; u++)\r
- {\r
- unsigned int *sprite;\r
- int code, code2, sx, sy, height;\r
-\r
- sprite=(unsigned int *)(Pico.vram+((table+(link<<2))&0x7ffc)); // Find sprite\r
-\r
- // get sprite info\r
- code = sprite[0];\r
-\r
- // check if it is on this line\r
- sy = (code&0x1ff);//-0x80;\r
- height = ((code>>24)&3)+1;\r
-\r
- // masking sprite?\r
- code2 = sprite[1];\r
- sx = (code2>>16)&0x1ff;\r
-\r
- printf("#%02i x: %03i y: %03i %ix%i\n", u, sx, sy, ((code>>26)&3)+1, height);\r
-\r
- link=(code>>16)&0x7f;\r
- if(!link) break; // End of sprites\r
- }\r
-#endif\r
-\r
- return dstr;\r
-}\r
-#endif\r
PICO_INTERNAL void PicoFrameStart(void);\r
void PicoDrawSync(int to, int blank_last_line);\r
extern int DrawScanline;\r
+#define MAX_LINE_SPRITES 29\r
+extern unsigned char HighLnSpr[240][3 + MAX_LINE_SPRITES];\r
\r
// Draw2.c\r
PICO_INTERNAL void PicoFrameFull();\r
#elif defined(EMU_M68K)\r
SekCycleCnt+=m68k_execute(1);\r
#elif defined(EMU_F68K)\r
- SekCycleCnt+=fm68k_emulate(1, 0);\r
+ SekCycleCnt+=fm68k_emulate(1, 0, 0);\r
#endif\r
}\r
\r
void (*PicoMCDopenTray)(void) = NULL;
int (*PicoMCDcloseTray)(void) = NULL;
-#define dump_ram(ram,fname) \
-{ \
- int i, d; \
- FILE *f; \
-\
- for (i = 0; i < sizeof(ram); i+=2) { \
- d = (ram[i]<<8) | ram[i+1]; \
- *(unsigned short *)(ram+i) = d; \
- } \
- f = fopen(fname, "wb"); \
- if (f) { \
- fwrite(ram, 1, sizeof(ram), f); \
- fclose(f); \
- } \
- for (i = 0; i < sizeof(ram); i+=2) { \
- d = (ram[i]<<8) | ram[i+1]; \
- *(unsigned short *)(ram+i) = d; \
- } \
-}
-
PICO_INTERNAL void PicoInitMCD(void)
{
Init_CD_Driver();
}
-
PICO_INTERNAL void PicoExitMCD(void)
{
End_CD_Driver();
-
- //dump_ram(Pico_mcd->prg_ram, "prg.bin");
- //dump_ram(Pico.ram, "ram.bin");
}
PICO_INTERNAL void PicoPowerMCD(void)
--- /dev/null
+// platform specific things for common menu code
+
+#ifdef __GP2X__
+#include "../gp2x/gp2x.h"
+
+#define BTN_UP GP2X_UP
+#define BTN_DOWN GP2X_DOWN
+#define BTN_LEFT GP2X_LEFT
+#define BTN_RIGHT GP2X_RIGHT
+
+#define BTN_NORTH GP2X_Y
+#define BTN_SOUTH GP2X_X
+#define BTN_WEST GP2X_A
+#define BTN_EAST GP2X_B
+#define BTN_L GP2X_L
+#define BTN_R GP2X_R
+
+unsigned long wait_for_input(unsigned long interesting);
+void gp2x_pd_clone_buffer2(void);
+void menu_darken_bg(void *dst, int pixels, int darker);
+void menu_flip(void);
+
+#define SCREEN_WIDTH 320
+#define SCREEN_HEIGHT 240
+#define SCREEN_BUFFER gp2x_screen
+
+#define read_buttons(which) \
+ wait_for_input(which)
+#define menu_draw_begin() \
+ gp2x_pd_clone_buffer2()
+#define clear_screen() \
+ memset(gp2x_screen, 0, 320*240*2)
+#define darken_screen() \
+ menu_darken_bg(gp2x_screen, 320*240, 0)
+#define menu_draw_end() \
+ menu_flip()
+
+// ------------------------------------
+
+#elif defined(__GIZ__)
+
+// TODO
+//#include "../gizmondo/giz.h"
+#define SCREEN_WIDTH 321
+#define SCREEN_BUFFER menu_screen
+extern unsigned char *menu_screen;
+
+// ------------------------------------
+
+#elif defined(PSP)
+
+#include "../psp/psp.h"
+
+#define BTN_NORTH BTN_TRIANGLE
+#define BTN_SOUTH BTN_X
+#define BTN_WEST BTN_SQUARE
+#define BTN_EAST BTN_CIRCLE
+
+unsigned long wait_for_input(unsigned int interesting, int is_key_config);
+void menu_draw_begin(void);
+void menu_darken_bg(void *dst, const void *src, int pixels, int darker);
+void menu_draw_end(void);
+
+#define SCREEN_WIDTH 512
+#define SCREEN_HEIGHT 272
+#define SCREEN_BUFFER psp_screen
+
+#define read_buttons(which) \
+ wait_for_input(which, 0)
+#define clear_screen() \
+ memset(SCREEN_BUFFER, 0, SCREEN_WIDTH*SCREEN_HEIGHT*2)
+#define darken_screen() \
+ menu_darken_bg(psp_screen, psp_screen, SCREEN_WIDTH*SCREEN_HEIGHT, 0)
+
+#endif
#include "fonts.h"\r
#include "readpng.h"\r
#include "lprintf.h"\r
+#include "common.h"\r
+#include "emu.h"\r
\r
-#if defined(__GP2X__)\r
- #include "../gp2x/gp2x.h"\r
- #define SCREEN_WIDTH 320\r
- #define SCREEN_BUFFER gp2x_screen\r
-#elif defined(__GIZ__)\r
- //#include "../gizmondo/giz.h"\r
- #define SCREEN_WIDTH 321\r
- #define SCREEN_BUFFER menu_screen\r
- extern unsigned char *menu_screen;\r
-#elif defined(PSP)\r
- #include "../psp/psp.h"\r
- #define SCREEN_WIDTH 512\r
- #define SCREEN_BUFFER psp_screen\r
-#endif\r
\r
char menuErrorMsg[64] = { 0, };\r
\r
}\r
}\r
\r
+// ------------ debug menu ------------\r
+\r
+#include <sys/stat.h>\r
+#include <sys/types.h>\r
+\r
+#include <Pico/Pico.h>\r
+#include <Pico/Debug.h>\r
+\r
+void SekStepM68k(void);\r
+\r
+static void draw_text_debug(const char *str, int skip, int from)\r
+{\r
+ const char *p;\r
+ int len, line;\r
+\r
+ p = str;\r
+ while (skip-- > 0)\r
+ {\r
+ while (*p && *p != '\n') p++;\r
+ if (*p == 0 || p[1] == 0) return;\r
+ p++;\r
+ }\r
+\r
+ str = p;\r
+ for (line = from; line < SCREEN_HEIGHT/10; line++)\r
+ {\r
+ while (*p && *p != '\n') p++;\r
+ len = p - str;\r
+ if (len > 55) len = 55;\r
+ smalltext_out16_lim(1, line*10, str, 0xffff, len);\r
+ if (*p == 0) break;\r
+ p++; str = p;\r
+ }\r
+}\r
+\r
+static void draw_frame_debug(void)\r
+{\r
+ char layer_str[48] = "layers: ";\r
+ if (PicoDrawMask & PDRAW_LAYERB_ON) memcpy(layer_str + 8, "B", 1);\r
+ if (PicoDrawMask & PDRAW_LAYERA_ON) memcpy(layer_str + 10, "A", 1);\r
+ if (PicoDrawMask & PDRAW_SPRITES_LOW_ON) memcpy(layer_str + 12, "spr_lo", 6);\r
+ if (PicoDrawMask & PDRAW_SPRITES_HI_ON) memcpy(layer_str + 19, "spr_hi", 6);\r
+\r
+ clear_screen();\r
+ emu_forcedFrame(0);\r
+ smalltext_out16(4, SCREEN_HEIGHT-8, layer_str, 0xffff);\r
+}\r
+\r
+void debug_menu_loop(void)\r
+{\r
+ int inp, mode = 0;\r
+ int spr_offs = 0, dumped = 0;\r
+\r
+ while (1)\r
+ {\r
+ switch (mode)\r
+ {\r
+ case 0: menu_draw_begin();\r
+ draw_text_debug(PDebugMain(), 0, 0);\r
+ if (dumped) {\r
+ smalltext_out16(SCREEN_WIDTH-6*10, SCREEN_HEIGHT-8, "dumped", 0xffff);\r
+ dumped = 0;\r
+ }\r
+ break;\r
+ case 1: draw_frame_debug(); break;\r
+ case 2: clear_screen();\r
+ emu_forcedFrame(0);\r
+ darken_screen();\r
+ PDebugShowSpriteStats(SCREEN_BUFFER, SCREEN_WIDTH); break;\r
+ case 3: clear_screen();\r
+ PDebugShowPalette(SCREEN_BUFFER, SCREEN_WIDTH);\r
+ PDebugShowSprite((unsigned short *)SCREEN_BUFFER + SCREEN_WIDTH*120+SCREEN_WIDTH/2+16,\r
+ SCREEN_WIDTH, spr_offs);\r
+ draw_text_debug(PDebugSpriteList(), spr_offs, 6);\r
+ break;\r
+ }\r
+ menu_draw_end();\r
+\r
+ inp = read_buttons(BTN_EAST|BTN_SOUTH|BTN_WEST|BTN_L|BTN_R|BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT);\r
+ if (inp & BTN_SOUTH) return;\r
+ if (inp & BTN_L) { mode--; if (mode < 0) mode = 3; }\r
+ if (inp & BTN_R) { mode++; if (mode > 3) mode = 0; }\r
+ switch (mode)\r
+ {\r
+ case 0:\r
+ if (inp & BTN_EAST) SekStepM68k();\r
+ if ((inp & (BTN_WEST|BTN_LEFT)) == (BTN_WEST|BTN_LEFT)) {\r
+ mkdir("dumps", 0777);\r
+ PDebugDumpMem();\r
+ dumped = 1;\r
+ }\r
+ break;\r
+ case 1:\r
+ if (inp & BTN_LEFT) PicoDrawMask ^= PDRAW_LAYERB_ON;\r
+ if (inp & BTN_RIGHT) PicoDrawMask ^= PDRAW_LAYERA_ON;\r
+ if (inp & BTN_DOWN) PicoDrawMask ^= PDRAW_SPRITES_LOW_ON;\r
+ if (inp & BTN_UP) PicoDrawMask ^= PDRAW_SPRITES_HI_ON;\r
+ break;\r
+ case 3:\r
+ if (inp & BTN_DOWN) spr_offs++;\r
+ if (inp & BTN_UP) spr_offs--;\r
+ if (spr_offs < 0) spr_offs = 0;\r
+ break;\r
+ }\r
+ }\r
+}\r
+\r
+\r
void smalltext_out16(int x, int y, const char *texto, int color);
void smalltext_out16_lim(int x, int y, const char *texto, int color, int max);
void menu_draw_selection(int x, int y, int w);
+void debug_menu_loop(void);
extern char menuErrorMsg[64];
OBJS += ../../PicoAll.o\r
else\r
OBJS += Pico/Area.o Pico/Cart.o Pico/Memory.o Pico/Misc.o Pico/Pico.o Pico/Sek.o \\r
- Pico/VideoPort.o Pico/Draw2.o Pico/Draw.o Pico/Patch.o\r
+ Pico/VideoPort.o Pico/Draw2.o Pico/Draw.o Pico/Patch.o Pico/Debug.o\r
# Pico - CD\r
OBJS += Pico/cd/Pico.o Pico/cd/Memory.o Pico/cd/Sek.o Pico/cd/LC89510.o \\r
Pico/cd/cd_sys.o Pico/cd/cd_file.o Pico/cd/cue.o Pico/cd/gfx_cd.o \\r
OBJS += unzip/unzip.o unzip/unzip_stream.o\r
# debug\r
ifeq "$(debug_cyclone)" "1"\r
-OBJS += Pico/Debug.o cpu/musashi/m68kdasm.o\r
+OBJS += Pico/DebugCPU.o cpu/musashi/m68kdasm.o\r
endif\r
# CPU cores\r
ifeq "$(use_musashi)" "1"\r
"???", "???", "???", "PUSH", "???", "???", "???", "???"\r
};\r
\r
-static void menu_darken_bg(void *dst, int pixels, int darker);\r
+void menu_darken_bg(void *dst, int pixels, int darker);\r
static void menu_prepare_bg(int use_game_bg);\r
\r
static unsigned long inp_prev = 0;\r
static int inp_prevjoy = 0;\r
\r
-static unsigned long wait_for_input(unsigned long interesting)\r
+unsigned long wait_for_input(unsigned long interesting)\r
{\r
unsigned long ret;\r
static int repeats = 0, wait = 20;\r
return ret;\r
}\r
\r
-static void menu_flip(void)\r
+void menu_flip(void)\r
{\r
gp2x_video_flush_cache();\r
gp2x_video_flip2();\r
return ret;\r
}\r
\r
-// ------------ debug menu ------------\r
-\r
-char *debugString(void);\r
-void PicoDrawShowSpriteStats(unsigned short *screen, int stride);\r
-void PicoDrawShowPalette(unsigned short *screen, int stride);\r
-\r
-static void draw_main_debug(void)\r
-{\r
- char *p, *str = debugString();\r
- int len, line;\r
-\r
- gp2x_pd_clone_buffer2();\r
-\r
- p = str;\r
- for (line = 0; line < 24; line++)\r
- {\r
- while (*p && *p != '\n') p++;\r
- len = p - str;\r
- if (len > 55) len = 55;\r
- smalltext_out16_lim(1, line*10, str, 0xffff, len);\r
- if (*p == 0) break;\r
- p++; str = p;\r
- }\r
-}\r
-\r
-static void draw_frame_debug(void)\r
-{\r
- char layer_str[48] = "layers: ";\r
- if (PicoDrawMask & PDRAW_LAYERB_ON) memcpy(layer_str + 8, "B", 1);\r
- if (PicoDrawMask & PDRAW_LAYERA_ON) memcpy(layer_str + 10, "A", 1);\r
- if (PicoDrawMask & PDRAW_SPRITES_LOW_ON) memcpy(layer_str + 12, "spr_lo", 6);\r
- if (PicoDrawMask & PDRAW_SPRITES_HI_ON) memcpy(layer_str + 19, "spr_hi", 6);\r
-\r
- memset(gp2x_screen, 0, 320*240*2);\r
- emu_forcedFrame(0);\r
- smalltext_out16(4, 232, layer_str, 0xffff);\r
-}\r
-\r
-static void debug_menu_loop(void)\r
-{\r
- int inp, mode = 0;\r
-\r
- while (1)\r
- {\r
- switch (mode)\r
- {\r
- case 0: draw_main_debug(); break;\r
- case 1: draw_frame_debug(); break;\r
- case 2: gp2x_pd_clone_buffer2();\r
- PicoDrawShowSpriteStats(gp2x_screen, 320); break;\r
- case 3: memset(gp2x_screen, 0, 320*240*2);\r
- PicoDrawShowPalette(gp2x_screen, 320); break;\r
- }\r
- menu_flip();\r
-\r
- inp = wait_for_input(GP2X_B|GP2X_X|GP2X_L|GP2X_R|GP2X_UP|GP2X_DOWN|GP2X_LEFT|GP2X_RIGHT);\r
- if (inp & (GP2X_B|GP2X_X)) return;\r
- if (inp & GP2X_L) { mode--; if (mode < 0) mode = 3; }\r
- if (inp & GP2X_R) { mode++; if (mode > 3) mode = 0; }\r
- if (mode == 1) {\r
- if (inp & GP2X_LEFT) PicoDrawMask ^= PDRAW_LAYERB_ON;\r
- if (inp & GP2X_RIGHT) PicoDrawMask ^= PDRAW_LAYERA_ON;\r
- if (inp & GP2X_DOWN) PicoDrawMask ^= PDRAW_SPRITES_LOW_ON;\r
- if (inp & GP2X_UP) PicoDrawMask ^= PDRAW_SPRITES_HI_ON;\r
- }\r
- }\r
-}\r
-\r
// ------------ patch/gg menu ------------\r
\r
static void draw_patchlist(int sel)\r
}\r
}\r
\r
-static void menu_darken_bg(void *dst, int pixels, int darker)\r
+void menu_darken_bg(void *dst, int pixels, int darker)\r
{\r
unsigned int *screen = dst;\r
pixels /= 2;\r
# Pico
OBJS += Pico/Area.o Pico/Cart.o Pico/Memory.o Pico/Misc.o Pico/Pico.o Pico/Sek.o \
- Pico/VideoPort.o Pico/Draw2.o Pico/Draw.o Pico/Patch.o
+ Pico/VideoPort.o Pico/Draw2.o Pico/Draw.o Pico/Patch.o Pico/Debug.o
# Pico - CD
OBJS += Pico/cd/Pico.o Pico/cd/Memory.o Pico/cd/Sek.o Pico/cd/LC89510.o \
Pico/cd/cd_sys.o Pico/cd/cd_file.o Pico/cd/cue.o Pico/cd/gfx_cd.o \
# misc
ifeq "$(use_fame)" "1"
ifeq "$(use_musashi)" "1"
-OBJS += Pico/Debug.o
+OBJS += Pico/DebugCPU.o
OBJS += cpu/musashi/m68kdasm.o
endif
endif
#define NO_SYNC
+#define CASE_SENSITIVE_FS 1 // CS filesystem
+#define DONT_OPEN_MANY_FILES 0
+#define REDUCE_IO_CALLS 0
+#define SIMPLE_WRITE_SOUND 0
+
+// draw.c
+#define OVERRIDE_HIGHCOL 0
+
// draw2.c
#define START_ROW 0 // which row of tiles to start rendering at?
#define END_ROW 28 // ..end
#use_mz80 = 1\r
amalgamate = 0\r
for_15fw = 1\r
+# :!touch platform/psp/psp.c\r
\r
\r
CFLAGS += -I../.. -I. -DNO_SYNC\r
ifeq "$(amalgamate)" "1"\r
OBJS += ../../PicoAll.o\r
else\r
-OBJS += Pico/Area.o Pico/Cart.o Pico/Memory.o Pico/Misc.o \\r
- Pico/Pico.o Pico/Sek.o Pico/VideoPort.o Pico/Draw2.o Pico/Draw.o \\r
- Pico/Patch.o Pico/Draw_amips.o Pico/Memory_amips.o Pico/Misc_amips.o\r
+OBJS += Pico/Area.o Pico/Cart.o Pico/Memory.o Pico/Misc.o Pico/Pico.o Pico/Sek.o Pico/VideoPort.o \\r
+ Pico/Draw2.o Pico/Draw.o Pico/Patch.o Pico/Draw_amips.o Pico/Memory_amips.o \\r
+ Pico/Misc_amips.o Pico/Debug.o\r
# Pico - CD\r
OBJS += Pico/cd/Pico.o Pico/cd/Memory.o Pico/cd/Sek.o Pico/cd/LC89510.o \\r
Pico/cd/cd_sys.o Pico/cd/cd_file.o Pico/cd/cue.o Pico/cd/gfx_cd.o \\r
# cleanup\r
\r
myclean:\r
- rm -rf $(DIRS)\r
+ #rm -rf $(DIRS)\r
$(RM) PicoDrive.map\r
make -C ../../cpu/musashi clean\r
\r
static unsigned short bg_buffer[480*272] __attribute__((aligned(16)));
#define menu_screen psp_screen
-static void menu_darken_bg(void *dst, const void *src, int pixels, int darker);
+void menu_darken_bg(void *dst, const void *src, int pixels, int darker);
static void menu_prepare_bg(int use_game_bg, int use_fg);
static unsigned int inp_prev = 0;
-static unsigned long wait_for_input(unsigned int interesting, int is_key_config)
+unsigned long wait_for_input(unsigned int interesting, int is_key_config)
{
unsigned int ret;
static int repeats = 0, wait = 20;
return ret;
}
-static void menu_draw_begin(void)
+void menu_draw_begin(void)
{
// short *src = (short *)bg_buffer, *dst = (short *)menu_screen;
// int i;
}
-static void menu_draw_end(void)
+void menu_draw_end(void)
{
psp_video_flip(1);
}
return ret;
}
-// ------------ debug menu ------------
-
-char *debugString(void);
-void PicoDrawShowSpriteStats(unsigned short *screen, int stride);
-void PicoDrawShowPalette(unsigned short *screen, int stride);
-
-static void draw_main_debug(void)
-{
- char *p, *str = debugString();
- int len, line;
-
- menu_draw_begin();
-
- p = str;
- for (line = 0; line < 24; line++)
- {
- while (*p && *p != '\n') p++;
- len = p - str;
- if (len > 55) len = 55;
- smalltext_out16_lim(1, line*10, str, 0xffff, len);
- if (*p == 0) break;
- p++; str = p;
- }
-}
-
-static void draw_frame_debug(void)
-{
- char layer_str[48] = "layers: ";
- if (PicoDrawMask & PDRAW_LAYERB_ON) memcpy(layer_str + 8, "B", 1);
- if (PicoDrawMask & PDRAW_LAYERA_ON) memcpy(layer_str + 10, "A", 1);
- if (PicoDrawMask & PDRAW_SPRITES_LOW_ON) memcpy(layer_str + 12, "spr_lo", 6);
- if (PicoDrawMask & PDRAW_SPRITES_HI_ON) memcpy(layer_str + 19, "spr_hi", 6);
-
- memset(psp_screen, 0, 512*272*2);
- emu_forcedFrame(0);
- smalltext_out16(4, 264, layer_str, 0xffff);
-}
-
-static void debug_menu_loop(void)
-{
- int inp, mode = 0;
-
- while (1)
- {
- switch (mode)
- {
- case 0: draw_main_debug(); break;
- case 1: draw_frame_debug(); break;
- case 2: menu_draw_begin();
- PicoDrawShowSpriteStats((unsigned short *)psp_screen+512*16+80, 512); break;
- case 3: memset(psp_screen, 0, 512*272*2);
- PicoDrawShowPalette(psp_screen, 512); break;
- }
- menu_draw_end();
-
- inp = wait_for_input(BTN_X|BTN_CIRCLE|BTN_L|BTN_R|BTN_UP|BTN_DOWN|BTN_LEFT|BTN_RIGHT, 0);
- if (inp & (BTN_X|BTN_CIRCLE)) return;
- if (inp & BTN_L) { mode--; if (mode < 0) mode = 3; }
- if (inp & BTN_R) { mode++; if (mode > 3) mode = 0; }
- if (mode == 1) {
- if (inp & BTN_LEFT) PicoDrawMask ^= PDRAW_LAYERB_ON;
- if (inp & BTN_RIGHT) PicoDrawMask ^= PDRAW_LAYERA_ON;
- if (inp & BTN_DOWN) PicoDrawMask ^= PDRAW_SPRITES_LOW_ON;
- if (inp & BTN_UP) PicoDrawMask ^= PDRAW_SPRITES_HI_ON;
- }
- }
-}
-
// ------------ patch/gg menu ------------
static void draw_patchlist(int sel)
}
}
-// warning: alignment
-static void menu_darken_bg(void *dst, const void *src, int pixels, int darker)
+void menu_darken_bg(void *dst, const void *src, int pixels, int darker)
{
unsigned int *dest = dst;
const unsigned int *srce = src;
notaz.gp2x.de / picodrive.git / commitdiff