fix array-out-of-bounds issue

[picodrive.git] / pico / pico_int.h

diff --git a/pico/pico_int.h b/pico/pico_int.h
index ef49295..690c233 100644 (file)
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -49,7 +49,7 @@ extern struct Cyclone PicoCpuCM68k, PicoCpuCS68k;
 #define SekSetStopS68k(x) { PicoCpuCS68k.state_flags&=~1; if (x) { PicoCpuCS68k.state_flags|=1; PicoCpuCS68k.cycles=0; } }\r
 #define SekIsStoppedM68k() (PicoCpuCM68k.state_flags&1)\r
 #define SekIsStoppedS68k() (PicoCpuCS68k.state_flags&1)\r
-#define SekShouldInterrupt (PicoCpuCM68k.irq > (PicoCpuCM68k.srh&7))\r
+#define SekShouldInterrupt() (PicoCpuCM68k.irq > (PicoCpuCM68k.srh&7))\r
 \r
 #define SekInterrupt(i) PicoCpuCM68k.irq=i\r
 #define SekIrqLevel     PicoCpuCM68k.irq\r
@@ -77,7 +77,7 @@ extern M68K_CONTEXT PicoCpuFM68k, PicoCpuFS68k;
 }\r
 #define SekIsStoppedM68k() (PicoCpuFM68k.execinfo&FM68K_HALTED)\r
 #define SekIsStoppedS68k() (PicoCpuFS68k.execinfo&FM68K_HALTED)\r
-#define SekShouldInterrupt fm68k_would_interrupt()\r
+#define SekShouldInterrupt() fm68k_would_interrupt()\r
 \r
 #define SekInterrupt(irq) PicoCpuFM68k.interrupts[0]=irq\r
 #define SekIrqLevel       PicoCpuFM68k.interrupts[0]\r
@@ -106,7 +106,7 @@ extern m68ki_cpu_core PicoCpuMM68k, PicoCpuMS68k;
 }\r
 #define SekIsStoppedM68k() (PicoCpuMM68k.stopped==STOP_LEVEL_STOP)\r
 #define SekIsStoppedS68k() (PicoCpuMS68k.stopped==STOP_LEVEL_STOP)\r
-#define SekShouldInterrupt (CPU_INT_LEVEL > FLAG_INT_MASK)\r
+#define SekShouldInterrupt() (CPU_INT_LEVEL > FLAG_INT_MASK)\r
 \r
 #define SekInterrupt(irq) { \\r
        void *oldcontext = m68ki_cpu_p; \\r
@@ -132,7 +132,11 @@ extern unsigned int SekCycleAim;
 \r
 // burn cycles while not in SekRun() and while in\r
 #define SekCyclesBurn(c)    SekCycleCnt += c\r
-#define SekCyclesBurnRun(c) SekCyclesLeft -= c\r
+#define SekCyclesBurnRun(c) { \\r
+  SekCyclesLeft -= c; \\r
+  if (SekCyclesLeft < 0) \\r
+    SekCyclesLeft = 0; \\r
+}\r
 \r
 // note: sometimes may extend timeslice to delay an irq\r
 #define SekEndRun(after) { \\r
@@ -378,16 +382,22 @@ struct mcd_pcm
        } ch[8];\r
 };\r
 \r
+#define PCD_ST_S68K_RST 1\r
+\r
 struct mcd_misc\r
 {\r
        unsigned short hint_vector;\r
-       unsigned char  busreq;\r
+       unsigned char  busreq;          // not s68k_regs[1]\r
        unsigned char  s68k_pend_ints;\r
-       unsigned int   state_flags;     // 04: emu state: reset_pending\r
+       unsigned int   state_flags;     // 04\r
        unsigned int   stopwatch_base_c;\r
-       unsigned int   pad[3];\r
+       unsigned short m68k_poll_a;\r
+       unsigned short m68k_poll_cnt;\r
+       unsigned short s68k_poll_a;\r
+       unsigned short s68k_poll_cnt;\r
+       unsigned int   s68k_poll_clk;\r
        unsigned char  bcram_reg;       // 18: battery-backed RAM cart register\r
-       unsigned char  pad2;\r
+       unsigned char  dmna_ret_2m;\r
        unsigned short pad3;\r
        int pad4[9];\r
 };\r
@@ -599,7 +609,7 @@ PICO_INTERNAL int  CheckDMA(void);
 PICO_INTERNAL void PicoDetectRegion(void);\r
 PICO_INTERNAL void PicoSyncZ80(unsigned int m68k_cycles_done);\r
 \r
-// cd/pico.c\r
+// cd/mcd.c\r
 #define PCDS_IEN1     (1<<1)\r
 #define PCDS_IEN2     (1<<2)\r
 #define PCDS_IEN3     (1<<3)\r
@@ -624,6 +634,7 @@ extern unsigned int pcd_event_times[PCD_EVENT_COUNT];
 void pcd_event_schedule(unsigned int now, enum pcd_event event, int after);\r
 void pcd_event_schedule_s68k(enum pcd_event event, int after);\r
 unsigned int pcd_cycles_m68k_to_s68k(unsigned int c);\r
+int  pcd_sync_s68k(unsigned int m68k_target, int m68k_poll_sync);\r
 void pcd_state_loaded(void);\r
 \r
 // pico/pico.c\r
@@ -927,9 +938,9 @@ void pevt_log(unsigned int cycles, enum evt_cpu c, enum evt e);
 void pevt_dump(void);\r
 \r
 #define pevt_log_m68k(e) \\r
-  pevt_log(SekCyclesDoneT(), EVT_M68K, e)\r
+  pevt_log(SekCyclesDone(), EVT_M68K, e)\r
 #define pevt_log_m68k_o(e) \\r
-  pevt_log(SekCyclesDoneT2(), EVT_M68K, e)\r
+  pevt_log(SekCyclesDone(), EVT_M68K, e)\r
 #define pevt_log_sh2(sh2, e) \\r
   pevt_log(sh2_cycles_done_m68k(sh2), EVT_MSH2 + (sh2)->is_slave, e)\r
 #define pevt_log_sh2_o(sh2, e) \\r