improve cue handling a bit

[picodrive.git] / pico / pico_int.h

diff --git a/pico/pico_int.h b/pico/pico_int.h
index 2053ac6..6096e13 100644 (file)
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -134,8 +134,6 @@ extern unsigned int SekCycleAim;
 #define SekCyclesBurn(c)    SekCycleCnt += 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
@@ -174,6 +172,8 @@ extern struct DrZ80 drZ80;
 #define z80_run(cycles)    ((cycles) - DrZ80Run(&drZ80, cycles))\r
 #define z80_run_nr(cycles) DrZ80Run(&drZ80, cycles)\r
 #define z80_int()          drZ80.Z80_IRQ = 1\r
+#define z80_int()          drZ80.Z80_IRQ = 1\r
+#define z80_nmi()          drZ80.Z80IF |= 8\r
 \r
 #define z80_cyclesLeft     drZ80.cycles\r
 #define z80_pc()           (drZ80.Z80PC - drZ80.Z80PC_BASE)\r
@@ -184,6 +184,7 @@ extern struct DrZ80 drZ80;
 #define z80_run(cycles)    Cz80_Exec(&CZ80, cycles)\r
 #define z80_run_nr(cycles) Cz80_Exec(&CZ80, cycles)\r
 #define z80_int()          Cz80_Set_IRQ(&CZ80, 0, HOLD_LINE)\r
+#define z80_nmi()          Cz80_Set_IRQ(&CZ80, IRQ_LINE_NMI, 0)\r
 \r
 #define z80_cyclesLeft     (CZ80.ICount - CZ80.ExtraCycles)\r
 #define z80_pc()           Cz80_Get_Reg(&CZ80, CZ80_PC)\r
@@ -193,6 +194,7 @@ extern struct DrZ80 drZ80;
 #define z80_run(cycles)    (cycles)\r
 #define z80_run_nr(cycles)\r
 #define z80_int()\r
+#define z80_nmi()\r
 \r
 #endif\r
 \r
@@ -313,7 +315,8 @@ struct PicoMS
 {\r
   unsigned char carthw[0x10];\r
   unsigned char io_ctl;\r
-  unsigned char pad[0x4f];\r
+  unsigned char nmi_state;\r
+  unsigned char pad[0x4e];\r
 };\r
 \r
 // some assembly stuff depend on these, do not touch!\r
@@ -382,10 +385,12 @@ 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\r
        unsigned int   stopwatch_base_c;\r
@@ -697,6 +702,7 @@ void ym2612_unpack_state(void);
 \r
 \r
 // videoport.c\r
+extern int line_base_cycles;\r
 PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d);\r
 PICO_INTERNAL_ASM unsigned int PicoVideoRead(unsigned int a);\r
 PICO_INTERNAL_ASM unsigned int PicoVideoRead8(unsigned int a);\r
@@ -828,9 +834,9 @@ void sh2_peripheral_reset(SH2 *sh2);
 unsigned int sh2_peripheral_read8(unsigned int a, SH2 *sh2);\r
 unsigned int sh2_peripheral_read16(unsigned int a, SH2 *sh2);\r
 unsigned int sh2_peripheral_read32(unsigned int a, SH2 *sh2);\r
-void sh2_peripheral_write8(unsigned int a, unsigned int d, SH2 *sh2);\r
-void sh2_peripheral_write16(unsigned int a, unsigned int d, SH2 *sh2);\r
-void sh2_peripheral_write32(unsigned int a, unsigned int d, SH2 *sh2);\r
+void REGPARM(3) sh2_peripheral_write8(unsigned int a, unsigned int d, SH2 *sh2);\r
+void REGPARM(3) sh2_peripheral_write16(unsigned int a, unsigned int d, SH2 *sh2);\r
+void REGPARM(3) sh2_peripheral_write32(unsigned int a, unsigned int d, SH2 *sh2);\r
 \r
 #else\r
 #define Pico32xInit()\r
@@ -959,7 +965,7 @@ void pevt_dump(void);
 #define cdprintf(x...)\r
 #endif\r
 \r
-#ifdef __i386__\r
+#if defined(__GNUC__) && defined(__i386__)\r
 #define REGPARM(x) __attribute__((regparm(x)))\r
 #else\r
 #define REGPARM(x)\r