svp compiler direct calls

[picodrive.git] / Pico / Pico.c

diff --git a/Pico/Pico.c b/Pico/Pico.c
index aec354d..b07af08 100644 (file)
--- a/Pico/Pico.c
+++ b/Pico/Pico.c
@@ -17,7 +17,9 @@ int PicoSkipFrame=0; // skip rendering frame?
 int PicoRegionOverride = 0; // override the region detection 0: Auto, 1: Japan NTSC, 2: Japan PAL, 4: US, 8: Europe\r
 int PicoAutoRgnOrder = 0;\r
 int emustatus = 0; // rapid_ym2612, multi_ym_updates\r
-void (*PicoWriteSound)(int len) = 0; // called once per frame at the best time to send sound buffer (PsndOut) to hardware\r
+void (*PicoWriteSound)(int len) = NULL; // called at the best time to send sound buffer (PsndOut) to hardware\r
+void (*PicoResetHook)(void) = NULL;\r
+void (*PicoLineHook)(int count) = NULL;\r
 \r
 struct PicoSRAM SRam = {0,};\r
 int z80startCycle, z80stopCycle; // in 68k cycles\r
@@ -36,6 +38,7 @@ int PicoInit(void)
   z80_init(); // init even if we aren't going to use it\r
 \r
   PicoInitMCD();\r
+  PicoSVPInit();\r
 \r
   SRam.data=0;\r
 \r
@@ -139,6 +142,8 @@ int PicoReset(int hard)
 \r
   PsndReset(); // pal must be known here\r
 \r
+  if (PicoResetHook) PicoResetHook();\r
+\r
   if (PicoMCD & 1) {\r
     PicoResetMCD(hard);\r
     return 0;\r
@@ -213,7 +218,7 @@ static __inline void SekRunM68k(int cyc)
 #elif defined(EMU_M68K)\r
   SekCycleCnt+=m68k_execute(cyc_do);\r
 #elif defined(EMU_F68K)\r
-  SekCycleCnt+=fm68k_emulate(cyc_do+1);\r
+  SekCycleCnt+=fm68k_emulate(cyc_do+1, 0);\r
 #endif\r
 }\r
 \r
@@ -230,7 +235,7 @@ static __inline void SekStep(void)
 #elif defined(EMU_M68K)\r
   SekCycleCnt+=m68k_execute(1);\r
 #elif defined(EMU_F68K)\r
-  SekCycleCnt+=fm68k_emulate(1);\r
+  SekCycleCnt+=fm68k_emulate(1, 0);\r
 #endif\r
   SekCycleAim=realaim;\r
 }\r
@@ -251,6 +256,12 @@ static int CheckIdle(void)
 // to be called on 224 or line_sample scanlines only\r
 static __inline void getSamples(int y)\r
 {\r
+#if SIMPLE_WRITE_SOUND\r
+  if (y != 224) return;\r
+  PsndRender(0, PsndLen);\r
+  if (PicoWriteSound) PicoWriteSound(PsndLen);\r
+  PsndClear();\r
+#else\r
   static int curr_pos = 0;\r
 \r
   if(y == 224) {\r
@@ -267,6 +278,7 @@ static __inline void getSamples(int y)
     emustatus&=~1;\r
     curr_pos = PsndRender(0, PsndLen/2);\r
   }\r
+#endif\r
 }\r
 \r
 \r
@@ -297,10 +309,10 @@ static void PicoRunZ80Simple(int line_from, int line_to)
       if ((line == 224 || line == line_sample) && PsndOut) getSamples(line);\r
       if (line == 32 && PsndOut) emustatus &= ~1;\r
       if (line >= line_from_r && line < line_to_r)\r
-        z80_run(228);\r
+        z80_run_nr(228);\r
     }\r
   } else if (line_to_r-line_from_r > 0) {\r
-    z80_run(228*(line_to_r-line_from_r));\r
+    z80_run_nr(228*(line_to_r-line_from_r));\r
     // samples will be taken by caller\r
   }\r
 }\r
@@ -360,6 +372,7 @@ static int PicoFrameSimple(void)
     SekRunM68k(cycles_68k_block);\r
 \r
     PicoRunZ80Simple(line, lines);\r
+    if (PicoLineHook) PicoLineHook(lines_step);\r
     line=lines;\r
   }\r
 \r
@@ -373,6 +386,7 @@ static int PicoFrameSimple(void)
 \r
     lines += sects*lines_step;\r
     PicoRunZ80Simple(line, lines);\r
+    if (PicoLineHook) PicoLineHook(sects*lines_step);\r
   }\r
 \r
   // render screen\r
@@ -436,6 +450,7 @@ static int PicoFrameSimple(void)
     SekRunM68k(cycles_68k_vblock);\r
 \r
     PicoRunZ80Simple(line, lines);\r
+    if (PicoLineHook) PicoLineHook(lines_step);\r
     line=lines;\r
 \r
     sects--;\r
@@ -446,6 +461,7 @@ static int PicoFrameSimple(void)
   if (sects) {\r
     lines += sects*lines_step;\r
     PicoRunZ80Simple(line, lines);\r
+    if (PicoLineHook) PicoLineHook(sects*lines_step);\r
   }\r
 \r
   return 0;\r
@@ -487,6 +503,17 @@ void PicoFrameDrawOnly(void)
   for (y=0;y<224;y++) PicoLine(y);\r
 }\r
 \r
+int PicoGetStat(pstat_t which)\r
+{\r
+  switch (which)\r
+  {\r
+    case PS_PAL:       return Pico.m.pal;\r
+    case PS_40_CELL:   return Pico.video.reg[12]&1;\r
+    case PS_240_LINES: return Pico.m.pal && (Pico.video.reg[1]&8);\r
+  }\r
+  return 0;\r
+}\r
+\r
 // callback to output message from emu\r
 void (*PicoMessage)(const char *msg)=NULL;\r
 \r
@@ -573,14 +600,6 @@ char *debugString(void)
   }\r
 #endif\r
 \r
-#if 0\r
-  {\r
-    FILE *f = fopen("zram", "wb");\r
-    fwrite(Pico.zram, 1, 0x2000, f);\r
-    fclose(f);\r
-  }\r
-#endif\r
-\r
   return dstr;\r
 }\r
 #endif\r