X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico_int.h;h=9841b183fc259d164cfd24b015ef065b34eb88b3;hb=2ec9bec58b89831cdead4cdec8f593c5b99d2715;hp=9630399abfd28e2377986329197a1852c5b2d3e7;hpb=7b3f44c6b677a60b63b092f825a2b6c58166b70c;p=picodrive.git

diff --git a/pico/pico_int.h b/pico/pico_int.h
index 9630399..9841b18 100644
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -41,10 +41,8 @@ extern struct Cyclone PicoCpuCM68k, PicoCpuCS68k;
 	(((PicoAHW&1) && (PicoOpt & POPT_EN_MCD_PSYNC)) ? (SekCycleAim-SekCycleCnt) : SekCyclesLeftNoMCD)
 #define SekCyclesLeftS68k \
 	((PicoOpt & POPT_EN_MCD_PSYNC) ? (SekCycleAimS68k-SekCycleCntS68k) : PicoCpuCS68k.cycles)
-#define SekSetCyclesLeftNoMCD(c) PicoCpuCM68k.cycles=c
-#define SekSetCyclesLeft(c) { \
-	if ((PicoAHW&1) && (PicoOpt & POPT_EN_MCD_PSYNC)) SekCycleCnt=SekCycleAim-(c); else SekSetCyclesLeftNoMCD(c); \
-}
+#define SekEndTimeslice(after) PicoCpuCM68k.cycles=after
+#define SekEndTimesliceS68k(after) PicoCpuCS68k.cycles=after
 #define SekPc (PicoCpuCM68k.pc-PicoCpuCM68k.membase)
 #define SekPcS68k (PicoCpuCS68k.pc-PicoCpuCS68k.membase)
 #define SekSetStop(x) { PicoCpuCM68k.state_flags&=~1; if (x) { PicoCpuCM68k.state_flags|=1; PicoCpuCM68k.cycles=0; } }
@@ -67,10 +65,8 @@ extern M68K_CONTEXT PicoCpuFM68k, PicoCpuFS68k;
 	(((PicoAHW&1) && (PicoOpt & POPT_EN_MCD_PSYNC)) ? (SekCycleAim-SekCycleCnt) : SekCyclesLeftNoMCD)
 #define SekCyclesLeftS68k \
 	((PicoOpt & POPT_EN_MCD_PSYNC) ? (SekCycleAimS68k-SekCycleCntS68k) : PicoCpuFS68k.io_cycle_counter)
-#define SekSetCyclesLeftNoMCD(c) PicoCpuFM68k.io_cycle_counter=c
-#define SekSetCyclesLeft(c) { \
-	if ((PicoAHW&1) && (PicoOpt & POPT_EN_MCD_PSYNC)) SekCycleCnt=SekCycleAim-(c); else SekSetCyclesLeftNoMCD(c); \
-}
+#define SekEndTimeslice(after) PicoCpuFM68k.io_cycle_counter=after
+#define SekEndTimesliceS68k(after) PicoCpuFS68k.io_cycle_counter=after
 #define SekPc     fm68k_get_pc(&PicoCpuFM68k)
 #define SekPcS68k fm68k_get_pc(&PicoCpuFS68k)
 #define SekSetStop(x) { \
@@ -100,10 +96,8 @@ extern m68ki_cpu_core PicoCpuMM68k, PicoCpuMS68k;
 	(((PicoAHW&1) && (PicoOpt & POPT_EN_MCD_PSYNC)) ? (SekCycleAim-SekCycleCnt) : SekCyclesLeftNoMCD)
 #define SekCyclesLeftS68k \
 	((PicoOpt & POPT_EN_MCD_PSYNC) ? (SekCycleAimS68k-SekCycleCntS68k) : PicoCpuMS68k.cyc_remaining_cycles)
-#define SekSetCyclesLeftNoMCD(c) SET_CYCLES(c)
-#define SekSetCyclesLeft(c) { \
-	if ((PicoAHW&1) && (PicoOpt & POPT_EN_MCD_PSYNC)) SekCycleCnt=SekCycleAim-(c); else SET_CYCLES(c); \
-}
+#define SekEndTimeslice(after) SET_CYCLES(after)
+#define SekEndTimesliceS68k(after) PicoCpuMS68k.cyc_remaining_cycles=after
 #define SekPc m68k_get_reg(&PicoCpuMM68k, M68K_REG_PC)
 #define SekPcS68k m68k_get_reg(&PicoCpuMS68k, M68K_REG_PC)
 #define SekSetStop(x) { \
@@ -125,7 +119,7 @@ extern m68ki_cpu_core PicoCpuMM68k, PicoCpuMS68k;
 }
 
 #endif
-#endif
+#endif // EMU_M68K
 
 extern int SekCycleCnt; // cycles done in this frame
 extern int SekCycleAim; // cycle aim
@@ -141,9 +135,15 @@ extern unsigned int SekCycleCntT; // total cycle counter, updated once per frame
 #define SekCyclesDoneT() (SekCycleCntT+SekCyclesDone()) // total nuber of cycles done for this rom
 
 #define SekEndRun(after) { \
-	SekCycleCnt -= SekCyclesLeft - after; \
-	if(SekCycleCnt < 0) SekCycleCnt = 0; \
-	SekSetCyclesLeft(after); \
+	SekCycleCnt -= SekCyclesLeft - (after); \
+	if (SekCycleCnt < 0) SekCycleCnt = 0; \
+	SekEndTimeslice(after); \
+}
+
+#define SekEndRunS68k(after) { \
+	SekCycleCntS68k -= SekCyclesLeftS68k - (after); \
+	if (SekCycleCntS68k < 0) SekCycleCntS68k = 0; \
+	SekEndTimesliceS68k(after); \
 }
 
 extern int SekCycleCntS68k;
@@ -157,13 +157,11 @@ extern int SekCycleAimS68k;
 
 #ifdef EMU_CORE_DEBUG
 extern int dbg_irq_level;
-#undef SekSetCyclesLeftNoMCD
-#undef SekSetCyclesLeft
+#undef SekEndTimeslice
 #undef SekCyclesBurn
 #undef SekEndRun
 #undef SekInterrupt
-#define SekSetCyclesLeftNoMCD(c)
-#define SekSetCyclesLeft(c)
+#define SekEndTimeslice(c)
 #define SekCyclesBurn(c) c
 #define SekEndRun(c)
 #define SekInterrupt(irq) dbg_irq_level=irq
@@ -220,11 +218,16 @@ extern int z80_scanline_cycles;  /* cycles done until z80_scanline */
 
 #define cycles_68k_to_z80(x) ((x)*957 >> 11)
 
+#define Z80_MEM_SHIFT 13
+extern unsigned long z80_read_map [0x10000 >> Z80_MEM_SHIFT];
+extern unsigned long z80_write_map[0x10000 >> Z80_MEM_SHIFT];
+typedef unsigned char (z80_read_f)(unsigned short a);
+typedef void (z80_write_f)(unsigned int a, unsigned char data);
+
 // ---------------------------------------------------------
 
 // main oscillator clock which controls timing
 #define OSC_NTSC 53693100
-// seems to be accurate, see scans from http://www.hot.ee/tmeeco/
 #define OSC_PAL  53203424
 
 struct PicoVideo
@@ -269,10 +272,14 @@ struct PicoMisc
 struct Pico
 {
   unsigned char ram[0x10000];  // 0x00000 scratch ram
-  unsigned short vram[0x8000]; // 0x10000
+  union {
+    unsigned short vram[0x8000];  // 0x10000
+    unsigned char  vramb[0x4000]; // VRAM in SMS mode
+  };
   unsigned char zram[0x2000];  // 0x20000 Z80 ram
   unsigned char ioports[0x10];
-  unsigned int pad[0x3c];      // unused
+  unsigned char sms_io_ctl;
+  unsigned char pad[0xef];     // unused
   unsigned short cram[0x40];   // 0x22100
   unsigned short vsram[0x40];  // 0x22180
 
@@ -325,7 +332,7 @@ struct mcd_misc
 	unsigned short hint_vector;
 	unsigned char  busreq;
 	unsigned char  s68k_pend_ints;
-	unsigned int   state_flags;	// 04: emu state: reset_pending, dmna_pending
+	unsigned int   state_flags;	// 04: emu state: reset_pending
 	unsigned int   counter75hz;
 	unsigned int   pad0;
 	int            timer_int3;	// 10
@@ -371,12 +378,12 @@ typedef struct
 #define Pico_mcd ((mcd_state *)Pico.rom)
 
 
-// Area.c
+// area.c
 PICO_INTERNAL void PicoAreaPackCpu(unsigned char *cpu, int is_sub);
 PICO_INTERNAL void PicoAreaUnpackCpu(unsigned char *cpu, int is_sub);
 extern void (*PicoLoadStateHook)(void);
 
-// cd/Area.c
+// cd/area.c
 PICO_INTERNAL int PicoCdSaveState(void *file);
 PICO_INTERNAL int PicoCdLoadState(void *file);
 
@@ -388,23 +395,34 @@ typedef struct {
 extern carthw_state_chunk *carthw_chunks;
 #define CHUNK_CARTHW 64
 
-// Cart.c
+// area.c
+typedef size_t (arearw)(void *p, size_t _size, size_t _n, void *file);
+typedef size_t (areaeof)(void *file);
+typedef int    (areaseek)(void *file, long offset, int whence);
+typedef int    (areaclose)(void *file);
+extern arearw  *areaRead;  // external read and write function pointers for
+extern arearw  *areaWrite; // gzip save state ability
+extern areaeof *areaEof;
+extern areaseek *areaSeek;
+extern areaclose *areaClose;
+
+// cart.c
 extern void (*PicoCartUnloadHook)(void);
 
-// Debug.c
+// debug.c
 int CM_compareRun(int cyc, int is_sub);
 
-// Draw.c
+// draw.c
 PICO_INTERNAL void PicoFrameStart(void);
 void PicoDrawSync(int to, int blank_last_line);
 extern int DrawScanline;
 #define MAX_LINE_SPRITES 29
 extern unsigned char HighLnSpr[240][3 + MAX_LINE_SPRITES];
 
-// Draw2.c
+// draw2.c
 PICO_INTERNAL void PicoFrameFull();
 
-// Memory.c
+// memory.c
 PICO_INTERNAL void PicoInitPc(unsigned int pc);
 PICO_INTERNAL unsigned int PicoCheckPc(unsigned int pc);
 PICO_INTERNAL_ASM unsigned int PicoRead32(unsigned int a);
@@ -412,29 +430,22 @@ PICO_INTERNAL void PicoMemSetup(void);
 PICO_INTERNAL_ASM void PicoMemReset(void);
 PICO_INTERNAL void PicoMemResetHooks(void);
 PICO_INTERNAL int PadRead(int i);
-PICO_INTERNAL unsigned char z80_read(unsigned short a);
-#ifndef _USE_CZ80
-PICO_INTERNAL_ASM void z80_write(unsigned char data, unsigned short a);
-PICO_INTERNAL void z80_write16(unsigned short data, unsigned short a);
-PICO_INTERNAL unsigned short z80_read16(unsigned short a);
-#else
-PICO_INTERNAL_ASM void z80_write(unsigned int a, unsigned char data);
-#endif
 PICO_INTERNAL int ym2612_write_local(unsigned int a, unsigned int d, int is_from_z80);
+void z80_mem_setup(void);
 extern unsigned int (*PicoRead16Hook)(unsigned int a, int realsize);
 extern void (*PicoWrite8Hook) (unsigned int a,unsigned int d,int realsize);
 extern void (*PicoWrite16Hook)(unsigned int a,unsigned int d,int realsize);
 
-// cd/Memory.c
+// cd/memory.c
 PICO_INTERNAL void PicoMemSetupCD(void);
 PICO_INTERNAL_ASM void PicoMemResetCD(int r3);
 PICO_INTERNAL_ASM void PicoMemResetCDdecode(int r3);
 
-// Pico/Memory.c
+// pico/memory.c
 PICO_INTERNAL void PicoMemSetupPico(void);
 PICO_INTERNAL unsigned int ym2612_read_local_68k(void);
 
-// Pico.c
+// pico.c
 extern struct Pico Pico;
 extern struct PicoSRAM SRam;
 extern int PicoPadInt[2];
@@ -445,23 +456,23 @@ PICO_INTERNAL int  CheckDMA(void);
 PICO_INTERNAL void PicoDetectRegion(void);
 PICO_INTERNAL void PicoSyncZ80(int m68k_cycles_done);
 
-// cd/Pico.c
+// cd/pico.c
 PICO_INTERNAL void PicoInitMCD(void);
 PICO_INTERNAL void PicoExitMCD(void);
 PICO_INTERNAL void PicoPowerMCD(void);
 PICO_INTERNAL int  PicoResetMCD(void);
 PICO_INTERNAL void PicoFrameMCD(void);
 
-// Pico/Pico.c
+// pico/pico.c
 PICO_INTERNAL void PicoInitPico(void);
 PICO_INTERNAL void PicoReratePico(void);
 
-// Pico/xpcm.c
+// pico/xpcm.c
 PICO_INTERNAL void PicoPicoPCMUpdate(short *buffer, int length, int stereo);
 PICO_INTERNAL void PicoPicoPCMReset(void);
 PICO_INTERNAL void PicoPicoPCMRerate(int xpcm_rate);
 
-// Sek.c
+// sek.c
 PICO_INTERNAL void SekInit(void);
 PICO_INTERNAL int  SekReset(void);
 PICO_INTERNAL void SekState(int *data);
@@ -470,7 +481,7 @@ void SekStepM68k(void);
 void SekInitIdleDet(void);
 void SekFinishIdleDet(void);
 
-// cd/Sek.c
+// cd/sek.c
 PICO_INTERNAL void SekInitS68k(void);
 PICO_INTERNAL int  SekResetS68k(void);
 PICO_INTERNAL int  SekInterruptS68k(int irq);
@@ -506,13 +517,13 @@ void ym2612_unpack_state(void);
   timer_b_step = TIMER_B_TICK_ZCYCLES * 256;
 
 
-// VideoPort.c
+// videoport.c
 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);
 extern int (*PicoDmaHook)(unsigned int source, int len, unsigned short **srcp, unsigned short **limitp);
 
-// Misc.c
+// misc.c
 PICO_INTERNAL void SRAMWriteEEPROM(unsigned int d);
 PICO_INTERNAL void SRAMUpdPending(unsigned int a, unsigned int d);
 PICO_INTERNAL_ASM unsigned int SRAMReadEEPROM(void);
@@ -521,7 +532,16 @@ PICO_INTERNAL_ASM void memcpy16bswap(unsigned short *dest, void *src, int count)
 PICO_INTERNAL_ASM void memcpy32(int *dest, int *src, int count); // 32bit word count
 PICO_INTERNAL_ASM void memset32(int *dest, int c, int count);
 
-// cd/Misc.c
+// z80 functionality wrappers
+PICO_INTERNAL void z80_init(void);
+PICO_INTERNAL void z80_pack(unsigned char *data);
+PICO_INTERNAL void z80_unpack(unsigned char *data);
+PICO_INTERNAL void z80_reset(void);
+PICO_INTERNAL void z80_exit(void);
+void z80_map_set(unsigned long *map, int start_addr,
+  int end_addr, void *func_or_mh, int is_func);
+
+// cd/misc.c
 PICO_INTERNAL_ASM void wram_2M_to_1M(unsigned char *m);
 PICO_INTERNAL_ASM void wram_1M_to_2M(unsigned char *m);
 
@@ -533,14 +553,15 @@ PICO_INTERNAL void PsndReset(void);
 PICO_INTERNAL void PsndDoDAC(int line_to);
 PICO_INTERNAL void PsndClear(void);
 PICO_INTERNAL void PsndGetSamples(int y);
-// z80 functionality wrappers
-PICO_INTERNAL void z80_init(void);
-PICO_INTERNAL void z80_pack(unsigned char *data);
-PICO_INTERNAL void z80_unpack(unsigned char *data);
-PICO_INTERNAL void z80_reset(void);
-PICO_INTERNAL void z80_exit(void);
+PICO_INTERNAL void PsndGetSamplesMS(void);
 extern int PsndDacLine;
 
+// sms.c
+void PicoPowerMS(void);
+void PicoResetMS(void);
+void PicoMemSetupMS(void);
+void PicoFrameMS(void);
+
 // emulation event logging
 #ifndef EL_LOGMASK
 #define EL_LOGMASK 0
@@ -586,6 +607,12 @@ extern void lprintf(const char *fmt, ...);
 #define cdprintf(x...)
 #endif
 
+#if defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 3
+#define MEMH_FUNC __attribute__((aligned(4)))
+#else
+#define MEMH_FUNC
+#endif
+
 #ifdef __cplusplus
 } // End of extern "C"
 #endif