(((PicoAHW&1) && (PicoOpt & POPT_EN_MCD_PSYNC)) ? (SekCycleAim-SekCycleCnt) : SekCyclesLeftNoMCD)\r
#define SekCyclesLeftS68k \\r
((PicoOpt & POPT_EN_MCD_PSYNC) ? (SekCycleAimS68k-SekCycleCntS68k) : PicoCpuCS68k.cycles)\r
-#define SekSetCyclesLeftNoMCD(c) PicoCpuCM68k.cycles=c\r
-#define SekSetCyclesLeft(c) { \\r
- if ((PicoAHW&1) && (PicoOpt & POPT_EN_MCD_PSYNC)) SekCycleCnt=SekCycleAim-(c); else SekSetCyclesLeftNoMCD(c); \\r
-}\r
+#define SekEndTimeslice(after) PicoCpuCM68k.cycles=after\r
+#define SekEndTimesliceS68k(after) PicoCpuCS68k.cycles=after\r
#define SekPc (PicoCpuCM68k.pc-PicoCpuCM68k.membase)\r
#define SekPcS68k (PicoCpuCS68k.pc-PicoCpuCS68k.membase)\r
#define SekSetStop(x) { PicoCpuCM68k.state_flags&=~1; if (x) { PicoCpuCM68k.state_flags|=1; PicoCpuCM68k.cycles=0; } }\r
(((PicoAHW&1) && (PicoOpt & POPT_EN_MCD_PSYNC)) ? (SekCycleAim-SekCycleCnt) : SekCyclesLeftNoMCD)\r
#define SekCyclesLeftS68k \\r
((PicoOpt & POPT_EN_MCD_PSYNC) ? (SekCycleAimS68k-SekCycleCntS68k) : PicoCpuFS68k.io_cycle_counter)\r
-#define SekSetCyclesLeftNoMCD(c) PicoCpuFM68k.io_cycle_counter=c\r
-#define SekSetCyclesLeft(c) { \\r
- if ((PicoAHW&1) && (PicoOpt & POPT_EN_MCD_PSYNC)) SekCycleCnt=SekCycleAim-(c); else SekSetCyclesLeftNoMCD(c); \\r
-}\r
+#define SekEndTimeslice(after) PicoCpuFM68k.io_cycle_counter=after\r
+#define SekEndTimesliceS68k(after) PicoCpuFS68k.io_cycle_counter=after\r
#define SekPc fm68k_get_pc(&PicoCpuFM68k)\r
#define SekPcS68k fm68k_get_pc(&PicoCpuFS68k)\r
#define SekSetStop(x) { \\r
(((PicoAHW&1) && (PicoOpt & POPT_EN_MCD_PSYNC)) ? (SekCycleAim-SekCycleCnt) : SekCyclesLeftNoMCD)\r
#define SekCyclesLeftS68k \\r
((PicoOpt & POPT_EN_MCD_PSYNC) ? (SekCycleAimS68k-SekCycleCntS68k) : PicoCpuMS68k.cyc_remaining_cycles)\r
-#define SekSetCyclesLeftNoMCD(c) SET_CYCLES(c)\r
-#define SekSetCyclesLeft(c) { \\r
- if ((PicoAHW&1) && (PicoOpt & POPT_EN_MCD_PSYNC)) SekCycleCnt=SekCycleAim-(c); else SET_CYCLES(c); \\r
-}\r
+#define SekEndTimeslice(after) SET_CYCLES(after)\r
+#define SekEndTimesliceS68k(after) PicoCpuMS68k.cyc_remaining_cycles=after\r
#define SekPc m68k_get_reg(&PicoCpuMM68k, M68K_REG_PC)\r
#define SekPcS68k m68k_get_reg(&PicoCpuMS68k, M68K_REG_PC)\r
#define SekSetStop(x) { \\r
}\r
\r
#endif\r
-#endif\r
+#endif // EMU_M68K\r
\r
extern int SekCycleCnt; // cycles done in this frame\r
extern int SekCycleAim; // cycle aim\r
#define SekCyclesDoneT() (SekCycleCntT+SekCyclesDone()) // total nuber of cycles done for this rom\r
\r
#define SekEndRun(after) { \\r
- SekCycleCnt -= SekCyclesLeft - after; \\r
- if(SekCycleCnt < 0) SekCycleCnt = 0; \\r
- SekSetCyclesLeft(after); \\r
+ SekCycleCnt -= SekCyclesLeft - (after); \\r
+ if (SekCycleCnt < 0) SekCycleCnt = 0; \\r
+ SekEndTimeslice(after); \\r
+}\r
+\r
+#define SekEndRunS68k(after) { \\r
+ SekCycleCntS68k -= SekCyclesLeftS68k - (after); \\r
+ if (SekCycleCntS68k < 0) SekCycleCntS68k = 0; \\r
+ SekEndTimesliceS68k(after); \\r
}\r
\r
extern int SekCycleCntS68k;\r
\r
#ifdef EMU_CORE_DEBUG\r
extern int dbg_irq_level;\r
-#undef SekSetCyclesLeftNoMCD\r
-#undef SekSetCyclesLeft\r
+#undef SekEndTimeslice\r
#undef SekCyclesBurn\r
#undef SekEndRun\r
#undef SekInterrupt\r
-#define SekSetCyclesLeftNoMCD(c)\r
-#define SekSetCyclesLeft(c)\r
+#define SekEndTimeslice(c)\r
#define SekCyclesBurn(c) c\r
#define SekEndRun(c)\r
#define SekInterrupt(irq) dbg_irq_level=irq\r
#define z80_int() drZ80.Z80_IRQ = 1\r
\r
#define z80_cyclesLeft drZ80.cycles\r
+#define z80_pc() (drZ80.Z80PC - drZ80.Z80PC_BASE)\r
\r
#elif defined(_USE_CZ80)\r
#include "../cpu/cz80/cz80.h"\r
#define z80_int() Cz80_Set_IRQ(&CZ80, 0, HOLD_LINE)\r
\r
#define z80_cyclesLeft (CZ80.ICount - CZ80.ExtraCycles)\r
+#define z80_pc() Cz80_Get_Reg(&CZ80, CZ80_PC)\r
\r
#else\r
\r
\r
#define cycles_68k_to_z80(x) ((x)*957 >> 11)\r
\r
+#define Z80_MEM_SHIFT 13\r
+extern unsigned long z80_read_map [0x10000 >> Z80_MEM_SHIFT];\r
+extern unsigned long z80_write_map[0x10000 >> Z80_MEM_SHIFT];\r
+typedef unsigned char (z80_read_f)(unsigned short a);\r
+typedef void (z80_write_f)(unsigned int a, unsigned char data);\r
+\r
// ---------------------------------------------------------\r
\r
// main oscillator clock which controls timing\r
#define OSC_NTSC 53693100\r
-// seems to be accurate, see scans from http://www.hot.ee/tmeeco/\r
#define OSC_PAL 53203424\r
\r
struct PicoVideo\r
struct Pico\r
{\r
unsigned char ram[0x10000]; // 0x00000 scratch ram\r
- unsigned short vram[0x8000]; // 0x10000\r
+ union { // vram is byteswapped for easier reads when drawing\r
+ unsigned short vram[0x8000]; // 0x10000\r
+ unsigned char vramb[0x4000]; // VRAM in SMS mode\r
+ };\r
unsigned char zram[0x2000]; // 0x20000 Z80 ram\r
unsigned char ioports[0x10];\r
- unsigned int pad[0x3c]; // unused\r
+ unsigned char sms_io_ctl;\r
+ unsigned char pad[0xef]; // unused\r
unsigned short cram[0x40]; // 0x22100\r
unsigned short vsram[0x40]; // 0x22180\r
\r
unsigned short hint_vector;\r
unsigned char busreq;\r
unsigned char s68k_pend_ints;\r
- unsigned int state_flags; // 04: emu state: reset_pending, dmna_pending\r
+ unsigned int state_flags; // 04: emu state: reset_pending\r
unsigned int counter75hz;\r
unsigned int pad0;\r
int timer_int3; // 10\r
#define Pico_mcd ((mcd_state *)Pico.rom)\r
\r
\r
-// Area.c\r
+// area.c\r
PICO_INTERNAL void PicoAreaPackCpu(unsigned char *cpu, int is_sub);\r
PICO_INTERNAL void PicoAreaUnpackCpu(unsigned char *cpu, int is_sub);\r
extern void (*PicoLoadStateHook)(void);\r
\r
-// cd/Area.c\r
+// cd/area.c\r
PICO_INTERNAL int PicoCdSaveState(void *file);\r
PICO_INTERNAL int PicoCdLoadState(void *file);\r
\r
extern areaseek *areaSeek;\r
extern areaclose *areaClose;\r
\r
-// Cart.c\r
+// cart.c\r
extern void (*PicoCartUnloadHook)(void);\r
\r
-// Debug.c\r
+// debug.c\r
int CM_compareRun(int cyc, int is_sub);\r
\r
-// Draw.c\r
+// draw.c\r
PICO_INTERNAL void PicoFrameStart(void);\r
void PicoDrawSync(int to, int blank_last_line);\r
+void BackFill(int reg7, int sh);\r
+void FinalizeLineRGB555(int sh);\r
extern int DrawScanline;\r
#define MAX_LINE_SPRITES 29\r
extern unsigned char HighLnSpr[240][3 + MAX_LINE_SPRITES];\r
\r
-// Draw2.c\r
+// draw2.c\r
PICO_INTERNAL void PicoFrameFull();\r
\r
-// Memory.c\r
+// mode4.c\r
+void PicoFrameStartMode4(void);\r
+void PicoLineMode4(int line);\r
+void PicoDoHighPal555M4(void);\r
+void PicoDrawSetColorFormatMode4(int which);\r
+\r
+// memory.c\r
PICO_INTERNAL void PicoInitPc(unsigned int pc);\r
PICO_INTERNAL unsigned int PicoCheckPc(unsigned int pc);\r
PICO_INTERNAL_ASM unsigned int PicoRead32(unsigned int a);\r
PICO_INTERNAL_ASM void PicoMemReset(void);\r
PICO_INTERNAL void PicoMemResetHooks(void);\r
PICO_INTERNAL int PadRead(int i);\r
-PICO_INTERNAL unsigned char z80_read(unsigned short a);\r
-#ifndef _USE_CZ80\r
-PICO_INTERNAL_ASM void z80_write(unsigned char data, unsigned short a);\r
-PICO_INTERNAL void z80_write16(unsigned short data, unsigned short a);\r
-PICO_INTERNAL unsigned short z80_read16(unsigned short a);\r
-#else\r
-PICO_INTERNAL_ASM void z80_write(unsigned int a, unsigned char data);\r
-#endif\r
PICO_INTERNAL int ym2612_write_local(unsigned int a, unsigned int d, int is_from_z80);\r
+void z80_mem_setup(void);\r
extern unsigned int (*PicoRead16Hook)(unsigned int a, int realsize);\r
extern void (*PicoWrite8Hook) (unsigned int a,unsigned int d,int realsize);\r
extern void (*PicoWrite16Hook)(unsigned int a,unsigned int d,int realsize);\r
\r
-// cd/Memory.c\r
+// cd/memory.c\r
PICO_INTERNAL void PicoMemSetupCD(void);\r
PICO_INTERNAL_ASM void PicoMemResetCD(int r3);\r
PICO_INTERNAL_ASM void PicoMemResetCDdecode(int r3);\r
\r
-// Pico/Memory.c\r
+// pico/memory.c\r
PICO_INTERNAL void PicoMemSetupPico(void);\r
PICO_INTERNAL unsigned int ym2612_read_local_68k(void);\r
\r
-// Pico.c\r
+// pico.c\r
extern struct Pico Pico;\r
extern struct PicoSRAM SRam;\r
extern int PicoPadInt[2];\r
PICO_INTERNAL void PicoDetectRegion(void);\r
PICO_INTERNAL void PicoSyncZ80(int m68k_cycles_done);\r
\r
-// cd/Pico.c\r
+// cd/pico.c\r
PICO_INTERNAL void PicoInitMCD(void);\r
PICO_INTERNAL void PicoExitMCD(void);\r
PICO_INTERNAL void PicoPowerMCD(void);\r
PICO_INTERNAL int PicoResetMCD(void);\r
PICO_INTERNAL void PicoFrameMCD(void);\r
\r
-// Pico/Pico.c\r
+// pico/pico.c\r
PICO_INTERNAL void PicoInitPico(void);\r
PICO_INTERNAL void PicoReratePico(void);\r
\r
-// Pico/xpcm.c\r
+// pico/xpcm.c\r
PICO_INTERNAL void PicoPicoPCMUpdate(short *buffer, int length, int stereo);\r
PICO_INTERNAL void PicoPicoPCMReset(void);\r
PICO_INTERNAL void PicoPicoPCMRerate(int xpcm_rate);\r
\r
-// Sek.c\r
+// sek.c\r
PICO_INTERNAL void SekInit(void);\r
PICO_INTERNAL int SekReset(void);\r
PICO_INTERNAL void SekState(int *data);\r
void SekInitIdleDet(void);\r
void SekFinishIdleDet(void);\r
\r
-// cd/Sek.c\r
+// cd/sek.c\r
PICO_INTERNAL void SekInitS68k(void);\r
PICO_INTERNAL int SekResetS68k(void);\r
PICO_INTERNAL int SekInterruptS68k(int irq);\r
timer_b_step = TIMER_B_TICK_ZCYCLES * 256;\r
\r
\r
-// VideoPort.c\r
+// videoport.c\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
extern int (*PicoDmaHook)(unsigned int source, int len, unsigned short **srcp, unsigned short **limitp);\r
\r
-// Misc.c\r
+// misc.c\r
PICO_INTERNAL void SRAMWriteEEPROM(unsigned int d);\r
PICO_INTERNAL void SRAMUpdPending(unsigned int a, unsigned int d);\r
PICO_INTERNAL_ASM unsigned int SRAMReadEEPROM(void);\r
PICO_INTERNAL_ASM void memcpy32(int *dest, int *src, int count); // 32bit word count\r
PICO_INTERNAL_ASM void memset32(int *dest, int c, int count);\r
\r
-// cd/Misc.c\r
+// z80 functionality wrappers\r
+PICO_INTERNAL void z80_init(void);\r
+PICO_INTERNAL void z80_pack(unsigned char *data);\r
+PICO_INTERNAL void z80_unpack(unsigned char *data);\r
+PICO_INTERNAL void z80_reset(void);\r
+PICO_INTERNAL void z80_exit(void);\r
+void z80_map_set(unsigned long *map, int start_addr,\r
+ int end_addr, void *func_or_mh, int is_func);\r
+\r
+// cd/misc.c\r
PICO_INTERNAL_ASM void wram_2M_to_1M(unsigned char *m);\r
PICO_INTERNAL_ASM void wram_1M_to_2M(unsigned char *m);\r
\r
PICO_INTERNAL void PsndDoDAC(int line_to);\r
PICO_INTERNAL void PsndClear(void);\r
PICO_INTERNAL void PsndGetSamples(int y);\r
-// z80 functionality wrappers\r
-PICO_INTERNAL void z80_init(void);\r
-PICO_INTERNAL void z80_pack(unsigned char *data);\r
-PICO_INTERNAL void z80_unpack(unsigned char *data);\r
-PICO_INTERNAL void z80_reset(void);\r
-PICO_INTERNAL void z80_exit(void);\r
+PICO_INTERNAL void PsndGetSamplesMS(void);\r
extern int PsndDacLine;\r
\r
+// sms.c\r
+void PicoPowerMS(void);\r
+void PicoResetMS(void);\r
+void PicoMemSetupMS(void);\r
+void PicoFrameMS(void);\r
+void PicoFrameDrawOnlyMS(void);\r
+\r
// emulation event logging\r
#ifndef EL_LOGMASK\r
#define EL_LOGMASK 0\r
#define cdprintf(x...)\r
#endif\r
\r
+#if defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 3\r
+#define MEMH_FUNC __attribute__((aligned(4)))\r
+#else\r
+#define MEMH_FUNC\r
+#endif\r
+\r
#ifdef __cplusplus\r
} // End of extern "C"\r
#endif\r