X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPicoInt.h;h=aa6164855f511da95395e3c30d0f470a7af226f3;hb=9037e45d9f2752fdd6ebbc01328148839403a84f;hp=bd10f19e46b17477ff021bd79b2da89d069d452e;hpb=f8ef8ff7100baa0ac0ecfcacb47aea3a9e24bc38;p=picodrive.git diff --git a/Pico/PicoInt.h b/Pico/PicoInt.h index bd10f19..aa61648 100644 --- a/Pico/PicoInt.h +++ b/Pico/PicoInt.h @@ -38,12 +38,12 @@ extern "C" { extern struct Cyclone PicoCpuCM68k, PicoCpuCS68k; #define SekCyclesLeftNoMCD PicoCpuCM68k.cycles // cycles left for this run #define SekCyclesLeft \ - (((PicoMCD&1) && (PicoOpt & 0x2000)) ? (SekCycleAim-SekCycleCnt) : SekCyclesLeftNoMCD) + (((PicoAHW&1) && (PicoOpt & POPT_EN_MCD_PSYNC)) ? (SekCycleAim-SekCycleCnt) : SekCyclesLeftNoMCD) #define SekCyclesLeftS68k \ - ((PicoOpt & 0x2000) ? (SekCycleAimS68k-SekCycleCntS68k) : PicoCpuCS68k.cycles) + ((PicoOpt & POPT_EN_MCD_PSYNC) ? (SekCycleAimS68k-SekCycleCntS68k) : PicoCpuCS68k.cycles) #define SekSetCyclesLeftNoMCD(c) PicoCpuCM68k.cycles=c #define SekSetCyclesLeft(c) { \ - if ((PicoMCD&1) && (PicoOpt & 0x2000)) SekCycleCnt=SekCycleAim-(c); else SekSetCyclesLeftNoMCD(c); \ + if ((PicoAHW&1) && (PicoOpt & POPT_EN_MCD_PSYNC)) SekCycleCnt=SekCycleAim-(c); else SekSetCyclesLeftNoMCD(c); \ } #define SekPc (PicoCpuCM68k.pc-PicoCpuCM68k.membase) #define SekPcS68k (PicoCpuCS68k.pc-PicoCpuCS68k.membase) @@ -64,12 +64,12 @@ extern struct Cyclone PicoCpuCM68k, PicoCpuCS68k; extern M68K_CONTEXT PicoCpuFM68k, PicoCpuFS68k; #define SekCyclesLeftNoMCD PicoCpuFM68k.io_cycle_counter #define SekCyclesLeft \ - (((PicoMCD&1) && (PicoOpt & 0x2000)) ? (SekCycleAim-SekCycleCnt) : SekCyclesLeftNoMCD) + (((PicoAHW&1) && (PicoOpt & POPT_EN_MCD_PSYNC)) ? (SekCycleAim-SekCycleCnt) : SekCyclesLeftNoMCD) #define SekCyclesLeftS68k \ - ((PicoOpt & 0x2000) ? (SekCycleAimS68k-SekCycleCntS68k) : PicoCpuFS68k.io_cycle_counter) + ((PicoOpt & POPT_EN_MCD_PSYNC) ? (SekCycleAimS68k-SekCycleCntS68k) : PicoCpuFS68k.io_cycle_counter) #define SekSetCyclesLeftNoMCD(c) PicoCpuFM68k.io_cycle_counter=c #define SekSetCyclesLeft(c) { \ - if ((PicoMCD&1) && (PicoOpt & 0x2000)) SekCycleCnt=SekCycleAim-(c); else SekSetCyclesLeftNoMCD(c); \ + if ((PicoAHW&1) && (PicoOpt & POPT_EN_MCD_PSYNC)) SekCycleCnt=SekCycleAim-(c); else SekSetCyclesLeftNoMCD(c); \ } #define SekPc fm68k_get_pc(&PicoCpuFM68k) #define SekPcS68k fm68k_get_pc(&PicoCpuFS68k) @@ -97,12 +97,12 @@ extern m68ki_cpu_core PicoCpuMM68k, PicoCpuMS68k; #ifndef SekCyclesLeft #define SekCyclesLeftNoMCD PicoCpuMM68k.cyc_remaining_cycles #define SekCyclesLeft \ - (((PicoMCD&1) && (PicoOpt & 0x2000)) ? (SekCycleAim-SekCycleCnt) : SekCyclesLeftNoMCD) + (((PicoAHW&1) && (PicoOpt & POPT_EN_MCD_PSYNC)) ? (SekCycleAim-SekCycleCnt) : SekCyclesLeftNoMCD) #define SekCyclesLeftS68k \ - ((PicoOpt & 0x2000) ? (SekCycleAimS68k-SekCycleCntS68k) : PicoCpuMS68k.cyc_remaining_cycles) + ((PicoOpt & POPT_EN_MCD_PSYNC) ? (SekCycleAimS68k-SekCycleCntS68k) : PicoCpuMS68k.cyc_remaining_cycles) #define SekSetCyclesLeftNoMCD(c) SET_CYCLES(c) #define SekSetCyclesLeft(c) { \ - if ((PicoMCD&1) && (PicoOpt & 0x2000)) SekCycleCnt=SekCycleAim-(c); else SET_CYCLES(c); \ + if ((PicoAHW&1) && (PicoOpt & POPT_EN_MCD_PSYNC)) SekCycleCnt=SekCycleAim-(c); else SET_CYCLES(c); \ } #define SekPc m68k_get_reg(&PicoCpuMM68k, M68K_REG_PC) #define SekPcS68k m68k_get_reg(&PicoCpuMS68k, M68K_REG_PC) @@ -156,20 +156,23 @@ extern int SekCycleAimS68k; #define SekCyclesDoneS68k() (SekCycleAimS68k-SekCyclesLeftS68k) #ifdef EMU_CORE_DEBUG +extern int dbg_irq_level; #undef SekSetCyclesLeftNoMCD #undef SekSetCyclesLeft #undef SekCyclesBurn #undef SekEndRun +#undef SekInterrupt #define SekSetCyclesLeftNoMCD(c) #define SekSetCyclesLeft(c) #define SekCyclesBurn(c) c #define SekEndRun(c) +#define SekInterrupt(irq) dbg_irq_level=irq #endif // ----------------------- Z80 CPU ----------------------- #if defined(_USE_MZ80) -#include "../../cpu/mz80/mz80.h" +#include "../cpu/mz80/mz80.h" #define z80_run(cycles) mz80_run(cycles) #define z80_run_nr(cycles) mz80_run(cycles) @@ -177,7 +180,7 @@ extern int SekCycleAimS68k; #define z80_resetCycles() mz80GetElapsedTicks(1) #elif defined(_USE_DRZ80) -#include "../../cpu/DrZ80/drz80.h" +#include "../cpu/DrZ80/drz80.h" extern struct DrZ80 drZ80; @@ -190,7 +193,7 @@ extern struct DrZ80 drZ80; #define z80_resetCycles() #elif defined(_USE_CZ80) -#include "../../cpu/cz80/cz80.h" +#include "../cpu/cz80/cz80.h" #define z80_run(cycles) Cz80_Exec(&CZ80, cycles) #define z80_run_nr(cycles) Cz80_Exec(&CZ80, cycles) @@ -208,7 +211,12 @@ extern struct DrZ80 drZ80; // --------------------------------------------------------- -extern int PicoMCD; +// Pico active hw +#define PAHW_MCD (1<<0) +#define PAHW_32X (1<<1) +#define PAHW_SVP (1<<2) +#define PAHW_PICO (1<<3) +extern int PicoAHW; // main oscillator clock which controls timing #define OSC_NTSC 53693100 @@ -241,7 +249,7 @@ struct PicoMisc unsigned short z80_bank68k; // 0a unsigned short z80_lastaddr; // this is for Z80 faking unsigned char z80_fakeval; - unsigned char pad0; + unsigned char z80_reset; // z80 reset held unsigned char padDelay[2]; // 10 gamepad phase time outs, so we count a delay unsigned short eeprom_addr; // EEPROM address register unsigned char eeprom_cycle; // EEPROM SRAM cycle number @@ -335,10 +343,10 @@ typedef struct union { // 0a0000: 256K struct { unsigned char word_ram2M[0x40000]; - unsigned char unused[0x20000]; + unsigned char unused0[0x20000]; }; struct { - unsigned char unused[0x20000]; + unsigned char unused1[0x20000]; unsigned char word_ram1M[2][0x20000]; }; }; @@ -362,13 +370,22 @@ typedef struct // Area.c PICO_INTERNAL int PicoAreaPackCpu(unsigned char *cpu, int is_sub); PICO_INTERNAL int PicoAreaUnpackCpu(unsigned char *cpu, int is_sub); +extern void (*PicoLoadStateHook)(void); // cd/Area.c PICO_INTERNAL int PicoCdSaveState(void *file); PICO_INTERNAL int PicoCdLoadState(void *file); +typedef struct { + int chunk; + int size; + void *ptr; +} carthw_state_chunk; +extern carthw_state_chunk *carthw_chunks; +#define CHUNK_CARTHW 64 + // Cart.c -PICO_INTERNAL void PicoCartDetect(void); +extern void (*PicoCartUnloadHook)(void); // Debug.c int CM_compareRun(int cyc, int is_sub); @@ -404,20 +421,28 @@ PICO_INTERNAL void PicoMemSetupCD(void); PICO_INTERNAL_ASM void PicoMemResetCD(int r3); PICO_INTERNAL_ASM void PicoMemResetCDdecode(int r3); +// Pico/Memory.c +PICO_INTERNAL void PicoMemSetupPico(void); + // Pico.c extern struct Pico Pico; extern struct PicoSRAM SRam; extern int emustatus; extern int z80startCycle, z80stopCycle; // in 68k cycles extern void (*PicoResetHook)(void); +extern void (*PicoLineHook)(int count); PICO_INTERNAL int CheckDMA(void); // cd/Pico.c PICO_INTERNAL int PicoInitMCD(void); PICO_INTERNAL void PicoExitMCD(void); -PICO_INTERNAL int PicoResetMCD(int hard); +PICO_INTERNAL void PicoPowerMCD(void); +PICO_INTERNAL int PicoResetMCD(void); PICO_INTERNAL int PicoFrameMCD(void); +// Pico/Pico.c +PICO_INTERNAL int PicoInitPico(void); + // Sek.c PICO_INTERNAL int SekInit(void); PICO_INTERNAL int SekReset(void); @@ -436,7 +461,7 @@ extern int PsndLen_exc_add; // VideoPort.c PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d); PICO_INTERNAL_ASM unsigned int PicoVideoRead(unsigned int a); -extern int (*PicoDmaHook)(unsigned int source, unsigned short **srcp, unsigned short **limitp); +extern int (*PicoDmaHook)(unsigned int source, int len, unsigned short **srcp, unsigned short **limitp); // Misc.c PICO_INTERNAL void SRAMWriteEEPROM(unsigned int d); @@ -476,23 +501,24 @@ PICO_INTERNAL void z80_exit(void); #define EL_LOGMASK 0 #endif -#define EL_HVCNT 0x0001 /* hv counter reads */ -#define EL_SR 0x0002 /* SR reads */ -#define EL_INTS 0x0004 /* ints and acks */ -#define EL_YM2612R 0x0008 /* 68k ym2612 reads */ -#define EL_INTSW 0x0010 /* log irq switching on/off */ -#define EL_ASVDP 0x0020 /* VDP accesses during active scan */ -#define EL_VDPDMA 0x0040 /* VDP DMA transfers and their timing */ -#define EL_BUSREQ 0x0080 /* z80 busreq r/w or reset w */ -#define EL_Z80BNK 0x0100 /* z80 i/o through bank area */ -#define EL_SRAMIO 0x0200 /* sram i/o */ -#define EL_EEPROM 0x0400 /* eeprom debug */ -#define EL_UIO 0x0800 /* unmapped i/o */ -#define EL_IO 0x1000 /* all i/o */ -#define EL_CDPOLL 0x2000 /* MCD: log poll detection */ - -#define EL_STATUS 0x4000 /* status messages */ -#define EL_ANOMALY 0x8000 /* some unexpected conditions (during emulation) */ +#define EL_HVCNT 0x00000001 /* hv counter reads */ +#define EL_SR 0x00000002 /* SR reads */ +#define EL_INTS 0x00000004 /* ints and acks */ +#define EL_YM2612R 0x00000008 /* 68k ym2612 reads */ +#define EL_INTSW 0x00000010 /* log irq switching on/off */ +#define EL_ASVDP 0x00000020 /* VDP accesses during active scan */ +#define EL_VDPDMA 0x00000040 /* VDP DMA transfers and their timing */ +#define EL_BUSREQ 0x00000080 /* z80 busreq r/w or reset w */ +#define EL_Z80BNK 0x00000100 /* z80 i/o through bank area */ +#define EL_SRAMIO 0x00000200 /* sram i/o */ +#define EL_EEPROM 0x00000400 /* eeprom debug */ +#define EL_UIO 0x00000800 /* unmapped i/o */ +#define EL_IO 0x00001000 /* all i/o */ +#define EL_CDPOLL 0x00002000 /* MCD: log poll detection */ +#define EL_SVP 0x00004000 /* SVP stuff */ + +#define EL_STATUS 0x40000000 /* status messages */ +#define EL_ANOMALY 0x80000000 /* some unexpected conditions (during emulation) */ #if EL_LOGMASK extern void lprintf(const char *fmt, ...); @@ -501,9 +527,17 @@ extern void lprintf(const char *fmt, ...); if ((w) & EL_LOGMASK) \ lprintf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__); \ } +#elif defined(_MSC_VER) +#define elprintf #else #define elprintf(w,f,...) #endif +#ifdef _MSC_VER +#define cdprintf +#else +#define cdprintf(x...) +#endif + #endif // PICO_INTERNAL_INCLUDED