X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico_int.h;h=3a530ca20800249e561138693106e6cff7307dd5;hb=ecc8036ee27ec57454c3fe736a71dd9c0cbcf3de;hp=ef49295f83889b96bf118f384022662a9be92975;hpb=ae214f1c37e5b02b6413040649a40f8ba3874e1b;p=picodrive.git

diff --git a/pico/pico_int.h b/pico/pico_int.h
index ef49295..3a530ca 100644
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -49,7 +49,10 @@ extern struct Cyclone PicoCpuCM68k, PicoCpuCS68k;
 #define SekSetStopS68k(x) { PicoCpuCS68k.state_flags&=~1; if (x) { PicoCpuCS68k.state_flags|=1; PicoCpuCS68k.cycles=0; } }
 #define SekIsStoppedM68k() (PicoCpuCM68k.state_flags&1)
 #define SekIsStoppedS68k() (PicoCpuCS68k.state_flags&1)
-#define SekShouldInterrupt (PicoCpuCM68k.irq > (PicoCpuCM68k.srh&7))
+#define SekShouldInterrupt() (PicoCpuCM68k.irq > (PicoCpuCM68k.srh&7))
+
+#define SekNotPolling     PicoCpuCM68k.not_pol
+#define SekNotPollingS68k PicoCpuCS68k.not_pol
 
 #define SekInterrupt(i) PicoCpuCM68k.irq=i
 #define SekIrqLevel     PicoCpuCM68k.irq
@@ -77,7 +80,10 @@ extern M68K_CONTEXT PicoCpuFM68k, PicoCpuFS68k;
 }
 #define SekIsStoppedM68k() (PicoCpuFM68k.execinfo&FM68K_HALTED)
 #define SekIsStoppedS68k() (PicoCpuFS68k.execinfo&FM68K_HALTED)
-#define SekShouldInterrupt fm68k_would_interrupt()
+#define SekShouldInterrupt() fm68k_would_interrupt()
+
+#define SekNotPolling     PicoCpuFM68k.not_polling
+#define SekNotPollingS68k PicoCpuFS68k.not_polling
 
 #define SekInterrupt(irq) PicoCpuFM68k.interrupts[0]=irq
 #define SekIrqLevel       PicoCpuFM68k.interrupts[0]
@@ -106,7 +112,10 @@ extern m68ki_cpu_core PicoCpuMM68k, PicoCpuMS68k;
 }
 #define SekIsStoppedM68k() (PicoCpuMM68k.stopped==STOP_LEVEL_STOP)
 #define SekIsStoppedS68k() (PicoCpuMS68k.stopped==STOP_LEVEL_STOP)
-#define SekShouldInterrupt (CPU_INT_LEVEL > FLAG_INT_MASK)
+#define SekShouldInterrupt() (CPU_INT_LEVEL > FLAG_INT_MASK)
+
+#define SekNotPolling     PicoCpuMM68k.not_polling
+#define SekNotPollingS68k PicoCpuMS68k.not_polling
 
 #define SekInterrupt(irq) { \
 	void *oldcontext = m68ki_cpu_p; \
@@ -132,7 +141,9 @@ extern unsigned int SekCycleAim;
 
 // burn cycles while not in SekRun() and while in
 #define SekCyclesBurn(c)    SekCycleCnt += c
-#define SekCyclesBurnRun(c) SekCyclesLeft -= c
+#define SekCyclesBurnRun(c) { \
+  SekCyclesLeft -= c; \
+}
 
 // note: sometimes may extend timeslice to delay an irq
 #define SekEndRun(after) { \
@@ -170,6 +181,8 @@ extern struct DrZ80 drZ80;
 #define z80_run(cycles)    ((cycles) - DrZ80Run(&drZ80, cycles))
 #define z80_run_nr(cycles) DrZ80Run(&drZ80, cycles)
 #define z80_int()          drZ80.Z80_IRQ = 1
+#define z80_int()          drZ80.Z80_IRQ = 1
+#define z80_nmi()          drZ80.Z80IF |= 8
 
 #define z80_cyclesLeft     drZ80.cycles
 #define z80_pc()           (drZ80.Z80PC - drZ80.Z80PC_BASE)
@@ -180,6 +193,7 @@ extern struct DrZ80 drZ80;
 #define z80_run(cycles)    Cz80_Exec(&CZ80, cycles)
 #define z80_run_nr(cycles) Cz80_Exec(&CZ80, cycles)
 #define z80_int()          Cz80_Set_IRQ(&CZ80, 0, HOLD_LINE)
+#define z80_nmi()          Cz80_Set_IRQ(&CZ80, IRQ_LINE_NMI, 0)
 
 #define z80_cyclesLeft     (CZ80.ICount - CZ80.ExtraCycles)
 #define z80_pc()           Cz80_Get_Reg(&CZ80, CZ80_PC)
@@ -189,6 +203,7 @@ extern struct DrZ80 drZ80;
 #define z80_run(cycles)    (cycles)
 #define z80_run_nr(cycles)
 #define z80_int()
+#define z80_nmi()
 
 #endif
 
@@ -309,7 +324,8 @@ struct PicoMS
 {
   unsigned char carthw[0x10];
   unsigned char io_ctl;
-  unsigned char pad[0x4f];
+  unsigned char nmi_state;
+  unsigned char pad[0x4e];
 };
 
 // some assembly stuff depend on these, do not touch!
@@ -378,16 +394,22 @@ struct mcd_pcm
 	} ch[8];
 };
 
+#define PCD_ST_S68K_RST 1
+
 struct mcd_misc
 {
 	unsigned short hint_vector;
-	unsigned char  busreq;
+	unsigned char  busreq;		// not s68k_regs[1]
 	unsigned char  s68k_pend_ints;
-	unsigned int   state_flags;	// 04: emu state: reset_pending
+	unsigned int   state_flags;	// 04
 	unsigned int   stopwatch_base_c;
-	unsigned int   pad[3];
+	unsigned short m68k_poll_a;
+	unsigned short m68k_poll_cnt;
+	unsigned short s68k_poll_a;
+	unsigned short s68k_poll_cnt;
+	unsigned int   s68k_poll_clk;
 	unsigned char  bcram_reg;	// 18: battery-backed RAM cart register
-	unsigned char  pad2;
+	unsigned char  dmna_ret_2m;
 	unsigned short pad3;
 	int pad4[9];
 };
@@ -599,7 +621,7 @@ PICO_INTERNAL int  CheckDMA(void);
 PICO_INTERNAL void PicoDetectRegion(void);
 PICO_INTERNAL void PicoSyncZ80(unsigned int m68k_cycles_done);
 
-// cd/pico.c
+// cd/mcd.c
 #define PCDS_IEN1     (1<<1)
 #define PCDS_IEN2     (1<<2)
 #define PCDS_IEN3     (1<<3)
@@ -624,6 +646,7 @@ extern unsigned int pcd_event_times[PCD_EVENT_COUNT];
 void pcd_event_schedule(unsigned int now, enum pcd_event event, int after);
 void pcd_event_schedule_s68k(enum pcd_event event, int after);
 unsigned int pcd_cycles_m68k_to_s68k(unsigned int c);
+int  pcd_sync_s68k(unsigned int m68k_target, int m68k_poll_sync);
 void pcd_state_loaded(void);
 
 // pico/pico.c
@@ -688,6 +711,7 @@ void ym2612_unpack_state(void);
 
 
 // videoport.c
+extern int line_base_cycles;
 PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d);
 PICO_INTERNAL_ASM unsigned int PicoVideoRead(unsigned int a);
 PICO_INTERNAL_ASM unsigned int PicoVideoRead8(unsigned int a);
@@ -819,9 +843,9 @@ void sh2_peripheral_reset(SH2 *sh2);
 unsigned int sh2_peripheral_read8(unsigned int a, SH2 *sh2);
 unsigned int sh2_peripheral_read16(unsigned int a, SH2 *sh2);
 unsigned int sh2_peripheral_read32(unsigned int a, SH2 *sh2);
-void sh2_peripheral_write8(unsigned int a, unsigned int d, SH2 *sh2);
-void sh2_peripheral_write16(unsigned int a, unsigned int d, SH2 *sh2);
-void sh2_peripheral_write32(unsigned int a, unsigned int d, SH2 *sh2);
+void REGPARM(3) sh2_peripheral_write8(unsigned int a, unsigned int d, SH2 *sh2);
+void REGPARM(3) sh2_peripheral_write16(unsigned int a, unsigned int d, SH2 *sh2);
+void REGPARM(3) sh2_peripheral_write32(unsigned int a, unsigned int d, SH2 *sh2);
 
 #else
 #define Pico32xInit()
@@ -927,9 +951,9 @@ void pevt_log(unsigned int cycles, enum evt_cpu c, enum evt e);
 void pevt_dump(void);
 
 #define pevt_log_m68k(e) \
-  pevt_log(SekCyclesDoneT(), EVT_M68K, e)
+  pevt_log(SekCyclesDone(), EVT_M68K, e)
 #define pevt_log_m68k_o(e) \
-  pevt_log(SekCyclesDoneT2(), EVT_M68K, e)
+  pevt_log(SekCyclesDone(), EVT_M68K, e)
 #define pevt_log_sh2(sh2, e) \
   pevt_log(sh2_cycles_done_m68k(sh2), EVT_MSH2 + (sh2)->is_slave, e)
 #define pevt_log_sh2_o(sh2, e) \
@@ -950,7 +974,7 @@ void pevt_dump(void);
 #define cdprintf(x...)
 #endif
 
-#ifdef __i386__
+#if defined(__GNUC__) && defined(__i386__)
 #define REGPARM(x) __attribute__((regparm(x)))
 #else
 #define REGPARM(x)