X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico_int.h;h=8d1a3379ec2bb701a2d69e129f89d408d6faa3d7;hb=a8fd6e376175c06e2423d0914359c761829d6e93;hp=74d1da2c0e5e058ebc5fa44815ee09b3bf9fc335;hpb=b4db550e41b2aa277f570d7bff890c8e8ee1831f;p=picodrive.git

diff --git a/pico/pico_int.h b/pico/pico_int.h
index 74d1da2..8d1a337 100644
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -1,10 +1,11 @@
-// Pico Library - Internal Header File
-
-// (c) Copyright 2004 Dave, All rights reserved.
-// (c) Copyright 2006-2009 Grazvydas "notaz" Ignotas, all rights reserved.
-// Free for non-commercial use.
-
-// For commercial use, separate licencing terms must be obtained.
+/*
+ * PicoDrive - Internal Header File
+ * (c) Copyright Dave, 2004
+ * (C) notaz, 2006-2010
+ *
+ * This work is licensed under the terms of MAME license.
+ * See COPYING file in the top-level directory.
+ */
 
 #ifndef PICO_INTERNAL_INCLUDED
 #define PICO_INTERNAL_INCLUDED
@@ -34,7 +35,7 @@ extern "C" {
 
 // ----------------------- 68000 CPU -----------------------
 #ifdef EMU_C68K
-#include "../cpu/Cyclone/Cyclone.h"
+#include "../cpu/cyclone/Cyclone.h"
 extern struct Cyclone PicoCpuCM68k, PicoCpuCS68k;
 #define SekCyclesLeftNoMCD PicoCpuCM68k.cycles // cycles left for this run
 #define SekCyclesLeft \
@@ -45,10 +46,11 @@ extern struct Cyclone PicoCpuCM68k, PicoCpuCS68k;
 #define SekEndTimesliceS68k(after) PicoCpuCS68k.cycles=after
 #define SekPc (PicoCpuCM68k.pc-PicoCpuCM68k.membase)
 #define SekPcS68k (PicoCpuCS68k.pc-PicoCpuCS68k.membase)
-#define SekDar(x) PicoCpuCM68k.d[x]
+#define SekDar(x) (x < 8 ? PicoCpuCM68k.d[x] : PicoCpuCM68k.a[x - 8])
 #define SekSr     CycloneGetSr(&PicoCpuCM68k)
 #define SekSetStop(x) { PicoCpuCM68k.state_flags&=~1; if (x) { PicoCpuCM68k.state_flags|=1; PicoCpuCM68k.cycles=0; } }
 #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))
 
@@ -72,7 +74,7 @@ extern M68K_CONTEXT PicoCpuFM68k, PicoCpuFS68k;
 #define SekEndTimesliceS68k(after) PicoCpuFS68k.io_cycle_counter=after
 #define SekPc     fm68k_get_pc(&PicoCpuFM68k)
 #define SekPcS68k fm68k_get_pc(&PicoCpuFS68k)
-#define SekDar(x) PicoCpuFM68k.dreg[x].D
+#define SekDar(x) (x < 8 ? PicoCpuFM68k.dreg[x].D : PicoCpuFM68k.areg[x - 8].D)
 #define SekSr     PicoCpuFM68k.sr
 #define SekSetStop(x) { \
 	PicoCpuFM68k.execinfo &= ~FM68K_HALTED; \
@@ -82,6 +84,7 @@ extern M68K_CONTEXT PicoCpuFM68k, PicoCpuFS68k;
 	PicoCpuFS68k.execinfo &= ~FM68K_HALTED; \
 	if (x) { PicoCpuFS68k.execinfo |= FM68K_HALTED; PicoCpuFS68k.io_cycle_counter = 0; } \
 }
+#define SekIsStoppedM68k() (PicoCpuFM68k.execinfo&FM68K_HALTED)
 #define SekIsStoppedS68k() (PicoCpuFS68k.execinfo&FM68K_HALTED)
 #define SekShouldInterrupt fm68k_would_interrupt()
 
@@ -116,6 +119,7 @@ extern m68ki_cpu_core PicoCpuMM68k, PicoCpuMS68k;
 	if(x) { SET_CYCLES(0); PicoCpuMS68k.stopped=STOP_LEVEL_STOP; } \
 	else PicoCpuMS68k.stopped=0; \
 }
+#define SekIsStoppedM68k() (PicoCpuMM68k.stopped==STOP_LEVEL_STOP)
 #define SekIsStoppedS68k() (PicoCpuMS68k.stopped==STOP_LEVEL_STOP)
 #define SekShouldInterrupt (CPU_INT_LEVEL > FLAG_INT_MASK)
 
@@ -233,14 +237,23 @@ extern SH2 sh2s[2];
 #define ssh2 sh2s[1]
 
 #ifndef DRC_SH2
-# define ash2_end_run(after) if (sh2->icount > (after)) sh2->icount = after
-# define ash2_cycles_done() (sh2->cycles_aim - sh2->icount)
+# define ash2_end_run(after) do { \
+  if (sh2->icount > (after)) { \
+    sh2->cycles_timeslice -= sh2->icount; \
+    sh2->icount = after; \
+  } \
+} while (0)
+# define ash2_cycles_done() (sh2->cycles_timeslice - sh2->icount)
 #else
-# define ash2_end_run(after) { \
-   if ((sh2->sr >> 12) > (after)) \
-     { sh2->sr &= 0xfff; sh2->sr |= (after) << 12; } \
-}
-# define ash2_cycles_done() (sh2->cycles_aim - (sh2->sr >> 12))
+# define ash2_end_run(after) do { \
+  int left = sh2->sr >> 12; \
+  if (left > (after)) { \
+    sh2->cycles_timeslice -= left; \
+    sh2->sr &= 0xfff; \
+    sh2->sr |= (after) << 12; \
+  } \
+} while (0)
+# define ash2_cycles_done() (sh2->cycles_timeslice - (sh2->sr >> 12))
 #endif
 
 //#define sh2_pc(c)     (c) ? ssh2.ppc : msh2.ppc
@@ -456,6 +469,7 @@ typedef struct
 #define P32XF_68KVPOLL  (1 << 3)
 #define P32XF_MSH2VPOLL (1 << 4)
 #define P32XF_SSH2VPOLL (1 << 5)
+#define P32XF_PWM_PEND  (1 << 6)
 
 #define P32XI_VRES (1 << 14/2) // IRL/2
 #define P32XI_VINT (1 << 12/2)
@@ -489,7 +503,10 @@ struct Pico32x
   unsigned short dmac_fifo[DMAC_FIFO_LEN];
   unsigned int dmac_ptr;
   unsigned int pwm_irq_sample_cnt;
-  unsigned int reserved[9];
+  unsigned char comm_dirty_68k;
+  unsigned char comm_dirty_sh2;
+  unsigned short pad;
+  unsigned int reserved[8];
 };
 
 struct Pico32xMem
@@ -540,6 +557,8 @@ PICO_INTERNAL void PicoFrameStart(void);
 void PicoDrawSync(int to, int blank_last_line);
 void BackFill(int reg7, int sh);
 void FinalizeLine555(int sh, int line);
+extern int (*PicoScanBegin)(unsigned int num);
+extern int (*PicoScanEnd)(unsigned int num);
 extern int DrawScanline;
 #define MAX_LINE_SPRITES 29
 extern unsigned char HighLnSpr[240][3 + MAX_LINE_SPRITES];
@@ -684,14 +703,24 @@ PICO_INTERNAL void PsndGetSamplesMS(void);
 extern int PsndDacLine;
 
 // sms.c
+#ifndef NO_SMS
 void PicoPowerMS(void);
 void PicoResetMS(void);
 void PicoMemSetupMS(void);
 void PicoStateLoadedMS(void);
 void PicoFrameMS(void);
 void PicoFrameDrawOnlyMS(void);
+#else
+#define PicoPowerMS()
+#define PicoResetMS()
+#define PicoMemSetupMS()
+#define PicoStateLoadedMS()
+#define PicoFrameMS()
+#define PicoFrameDrawOnlyMS()
+#endif
 
 // 32x/32x.c
+#ifndef NO_32X
 extern struct Pico32x Pico32x;
 void Pico32xInit(void);
 void PicoPower32x(void);
@@ -699,9 +728,17 @@ void PicoReset32x(void);
 void Pico32xStartup(void);
 void PicoUnload32x(void);
 void PicoFrame32x(void);
+void p32x_sync_sh2s(unsigned int m68k_target);
 void p32x_update_irls(int nested_call);
 void p32x_reset_sh2s(void);
 
+enum p32x_event {
+  P32X_EVENT_PWM,
+  P32X_EVENT_FILLEND,
+  P32X_EVENT_COUNT,
+};
+void p32x_event_schedule(enum p32x_event event, unsigned int now, int after);
+
 // 32x/memory.c
 struct Pico32xMem *Pico32xMem;
 unsigned int PicoRead8_32x(unsigned int a);
@@ -717,6 +754,8 @@ void p32x_poll_event(int cpu_mask, int is_vdp);
 void FinalizeLine32xRGB555(int sh, int line);
 void PicoDraw32xLayer(int offs, int lines, int mdbg);
 void PicoDraw32xLayerMdOnly(int offs, int lines);
+extern int (*PicoScan32xBegin)(unsigned int num);
+extern int (*PicoScan32xEnd)(unsigned int num);
 enum {
   PDM32X_OFF,
   PDM32X_32X_ONLY,
@@ -728,9 +767,21 @@ extern int Pico32xDrawMode;
 unsigned int p32x_pwm_read16(unsigned int a);
 void p32x_pwm_write16(unsigned int a, unsigned int d);
 void p32x_pwm_update(int *buf32, int length, int stereo);
-void p32x_timers_do(int line_call);
+void p32x_timers_do(unsigned int cycles);
 void p32x_timers_recalc(void);
-extern int pwm_frame_smp_cnt;
+void p32x_pwm_schedule(unsigned int now);
+#else
+#define Pico32xInit()
+#define PicoPower32x()
+#define PicoReset32x()
+#define PicoFrame32x()
+#define PicoUnload32x()
+#define Pico32xStateLoaded()
+#define PicoDraw32xSetFrameMode(...)
+#define FinalizeLine32xRGB555 NULL
+#define p32x_pwm_update(...)
+#define p32x_timers_recalc()
+#endif
 
 /* avoid dependency on newer glibc */
 static __inline int isspace_(int c)
@@ -773,12 +824,11 @@ static __inline int isspace_(int c)
 #define EL_ANOMALY 0x80000000 /* some unexpected conditions (during emulation) */
 
 #if EL_LOGMASK
-extern void lprintf(const char *fmt, ...);
 #define elprintf(w,f,...) \
-{ \
+do { \
 	if ((w) & EL_LOGMASK) \
 		lprintf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__); \
-}
+} while (0)
 #elif defined(_MSC_VER)
 #define elprintf
 #else