hint-less mode updated for SVP, state load callback, etc

[picodrive.git] / Pico / VideoPort.c

diff --git a/Pico/VideoPort.c b/Pico/VideoPort.c
index 1065618..cceab7c 100644 (file)
--- a/Pico/VideoPort.c
+++ b/Pico/VideoPort.c
@@ -22,7 +22,7 @@ typedef unsigned int   u32;
 #define UTYPES_DEFINED\r
 #endif\r
 \r
-int (*PicoDmaHook)(unsigned int source, unsigned short **srcp, unsigned short **limitp) = NULL;\r
+int (*PicoDmaHook)(unsigned int source, int len, unsigned short **srcp, unsigned short **limitp) = NULL;\r
 \r
 static __inline void AutoIncrement(void)\r
 {\r
@@ -41,7 +41,7 @@ static void VideoWrite(u16 d)
     case 3: Pico.m.dirtyPal = 1;\r
             Pico.cram [(a>>1)&0x003f]=d; break; // wraps (Desert Strike)\r
     case 5: Pico.vsram[(a>>1)&0x003f]=d; break;\r
-    default:elprintf(EL_ANOMALY, "VDP write %04x with bad type %i", d, Pico.video.type); break;\r
+    //default:elprintf(EL_ANOMALY, "VDP write %04x with bad type %i", d, Pico.video.type); break;\r
   }\r
 \r
   //dprintf("w[%i] @ %04x, inc=%i [%i|%i]", Pico.video.type, a, Pico.video.reg[0xf], Pico.m.scanline, SekCyclesDone());\r
@@ -134,11 +134,12 @@ static void DmaSlow(int len)
       return;\r
     }\r
   } else {\r
-    if (source<Pico.romsize) { // Rom\r
+    // if we have DmaHook, let it handle ROM because of possible DMA delay\r
+    if (PicoDmaHook && PicoDmaHook(source, len, &pd, &pdend));\r
+    else if (source<Pico.romsize) { // Rom\r
       pd=(u16 *)(Pico.rom+(source&~1));\r
       pdend=(u16 *)(Pico.rom+Pico.romsize);\r
     }\r
-    else if (PicoDmaHook && PicoDmaHook(source, &pd, &pdend));\r
     else {\r
       elprintf(EL_VDPDMA|EL_ANOMALY, "DmaSlow[%i] %06x->%04x: invalid src", Pico.video.type, source, a);\r
       return;\r
@@ -370,19 +371,24 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
       {\r
         // Register write:\r
         int num=(d>>8)&0x1f;\r
-        if(num==00) elprintf(EL_INTSW, "hint_onoff: %i->%i [%i] pend=%i @ %06x", (pvid->reg[0]&0x10)>>4,\r
+        int dold=pvid->reg[num];\r
+        if (num > 0x0a && !(pvid->reg[1]&4)) {\r
+          elprintf(EL_ANOMALY, "%02x written to reg %02x in SMS mode @ %06x", d, num, SekPc);\r
+        } else\r
+         pvid->reg[num]=(unsigned char)d;\r
+        if (num==00) elprintf(EL_INTSW, "hint_onoff: %i->%i [%i] pend=%i @ %06x", (dold&0x10)>>4,\r
                         (d&0x10)>>4, SekCyclesDone(), (pvid->pending_ints&0x10)>>4, SekPc);\r
-        if(num==01) elprintf(EL_INTSW, "vint_onoff: %i->%i [%i] pend=%i @ %06x", (pvid->reg[1]&0x20)>>5,\r
+        if (num==01) elprintf(EL_INTSW, "vint_onoff: %i->%i [%i] pend=%i @ %06x", (dold&0x20)>>5,\r
                         (d&0x20)>>5, SekCyclesDone(), (pvid->pending_ints&0x20)>>5, SekPc);\r
-        //if(num==01) dprintf("set_blank: %i @ %06x [%i|%i]", !((d&0x40)>>6), SekPc, Pico.m.scanline, SekCyclesDone());\r
-        //if(num==10) dprintf("hint_set: %i @ %06x [%i|%i]", (unsigned char)d, SekPc, Pico.m.scanline, SekCyclesDone());\r
-        pvid->reg[num]=(unsigned char)d;\r
+        if      (num ==   5 && (d^dold)) rendstatus|=1;\r
+        // renderers should update their palettes if sh/hi mode is changed\r
+        else if (num == 0xc && ((d^dold)&8)) Pico.m.dirtyPal = 2;\r
 #ifndef EMU_CORE_DEBUG\r
         // update IRQ level (Lemmings, Wiz 'n' Liz intro, ... )\r
         // may break if done improperly:\r
         // International Superstar Soccer Deluxe (crash), Street Racer (logos), Burning Force (gfx),\r
         // Fatal Rewind (crash), Sesame Street Counting Cafe\r
-        if (num < 2)\r
+        else if (num < 2)\r
         {\r
           if (!SekShouldInterrupt) // hack\r
           {\r
@@ -393,13 +399,10 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
             else if(pints & 0x10) irq = 4;\r
             SekInterrupt(irq); // update line\r
 \r
-            if (irq) SekEndRun(24); // make it delayed\r
+            if (irq && Pico.m.scanline!=-1) SekEndRun(24); // make it delayed\r
           }\r
         }\r
-        else\r
 #endif\r
-        if(num == 5) rendstatus|=1;\r
-        else if(num == 0xc) Pico.m.dirtyPal = 2; // renderers should update their palettes if sh/hi mode is changed\r
         pvid->type=0; // register writes clear command (else no Sega logo in Golden Axe II)\r
       } else {\r
         // High word of command:\r