X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPicoInt.h;h=a9720c86037b130eac6bd1f1b296e927f0af33ca;hb=3aa1e148a28da9b4e10e824984f7b3a4908b1ace;hp=e92294385e0de492d2c7f99d263ac72fc31afd3d;hpb=e5503e2f4fe1c7ccc46c493a1596fb0e416f678e;p=picodrive.git

diff --git a/Pico/PicoInt.h b/Pico/PicoInt.h
index e922943..a9720c8 100644
--- a/Pico/PicoInt.h
+++ b/Pico/PicoInt.h
@@ -24,7 +24,7 @@
 #define PICO_INTERNAL_ASM
 #endif
 
-// to select core, define EMU_C68K, EMU_M68K or EMU_A68K in your makefile or project
+// to select core, define EMU_C68K, EMU_M68K or EMU_F68K in your makefile or project
 
 #ifdef __cplusplus
 extern "C" {
@@ -34,65 +34,68 @@ extern "C" {
 // ----------------------- 68000 CPU -----------------------
 #ifdef EMU_C68K
 #include "../cpu/Cyclone/Cyclone.h"
-extern struct Cyclone PicoCpu, PicoCpuS68k;
-#define SekCyclesLeftNoMCD PicoCpu.cycles // cycles left for this run
+extern struct Cyclone PicoCpuCM68k, PicoCpuCS68k;
+#define SekCyclesLeftNoMCD PicoCpuCM68k.cycles // cycles left for this run
 #define SekCyclesLeft \
 	(((PicoMCD&1) && (PicoOpt & 0x2000)) ? (SekCycleAim-SekCycleCnt) : SekCyclesLeftNoMCD)
 #define SekCyclesLeftS68k \
-	((PicoOpt & 0x2000) ? (SekCycleAimS68k-SekCycleCntS68k) : PicoCpuS68k.cycles)
-#define SekSetCyclesLeftNoMCD(c) PicoCpu.cycles=c
+	((PicoOpt & 0x2000) ? (SekCycleAimS68k-SekCycleCntS68k) : PicoCpuCS68k.cycles)
+#define SekSetCyclesLeftNoMCD(c) PicoCpuCM68k.cycles=c
 #define SekSetCyclesLeft(c) { \
 	if ((PicoMCD&1) && (PicoOpt & 0x2000)) SekCycleCnt=SekCycleAim-(c); else SekSetCyclesLeftNoMCD(c); \
 }
-#define SekPc (PicoCpu.pc-PicoCpu.membase)
-#define SekPcS68k (PicoCpuS68k.pc-PicoCpuS68k.membase)
-#define SekSetStop(x) { PicoCpu.state_flags&=~1; if (x) { PicoCpu.state_flags|=1; PicoCpu.cycles=0; } }
-#define SekSetStopS68k(x) { PicoCpuS68k.state_flags&=~1; if (x) { PicoCpuS68k.state_flags|=1; PicoCpuS68k.cycles=0; } }
+#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; } }
+#define SekSetStopS68k(x) { PicoCpuCS68k.state_flags&=~1; if (x) { PicoCpuCS68k.state_flags|=1; PicoCpuCS68k.cycles=0; } }
 #endif
 
-#ifdef EMU_A68K
-void __cdecl M68000_RUN();
-// The format of the data in a68k.asm (at the _M68000_regs location)
-struct A68KContext
-{
-  unsigned int d[8],a[8];
-  unsigned int isp,srh,ccr,xc,pc,irq,sr;
-  int (*IrqCallback) (int nIrq);
-  unsigned int ppc;
-  void *pResetCallback;
-  unsigned int sfc,dfc,usp,vbr;
-  unsigned int AsmBank,CpuVersion;
-};
-struct A68KContext M68000_regs;
-extern int m68k_ICount;
-#define SekCyclesLeft m68k_ICount
-#define SekSetCyclesLeft(c) m68k_ICount=c
-#define SekPc M68000_regs.pc
+#ifdef EMU_F68K
+#include "../cpu/fame/fame.h"
+M68K_CONTEXT PicoCpuFM68k, PicoCpuFS68k;
+#define SekCyclesLeftNoMCD PicoCpuFM68k.io_cycle_counter
+#define SekCyclesLeft \
+	(((PicoMCD&1) && (PicoOpt & 0x2000)) ? (SekCycleAim-SekCycleCnt) : SekCyclesLeftNoMCD)
+#define SekCyclesLeftS68k \
+	((PicoOpt & 0x2000) ? (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); \
+}
+#define SekPc     m68k_get_pc(&PicoCpuFM68k)
+#define SekPcS68k m68k_get_pc(&PicoCpuFS68k)
+#define SekSetStop(x) { \
+	PicoCpuFM68k.execinfo &= ~M68K_HALTED; \
+	if (x) { PicoCpuFM68k.execinfo |= M68K_HALTED; PicoCpuFM68k.io_cycle_counter = 0; } \
+}
+#define SekSetStopS68k(x) { \
+	PicoCpuFS68k.execinfo &= ~M68K_HALTED; \
+	if (x) { PicoCpuFS68k.execinfo |= M68K_HALTED; PicoCpuFS68k.io_cycle_counter = 0; } \
+}
 #endif
 
 #ifdef EMU_M68K
 #include "../cpu/musashi/m68kcpu.h"
-extern m68ki_cpu_core PicoM68kCPU; // MD's CPU
-extern m68ki_cpu_core PicoS68kCPU; // Mega CD's CPU
+extern m68ki_cpu_core PicoCpuMM68k, PicoCpuMS68k;
 #ifndef SekCyclesLeft
-#define SekCyclesLeftNoMCD PicoM68kCPU.cyc_remaining_cycles
+#define SekCyclesLeftNoMCD PicoCpuMM68k.cyc_remaining_cycles
 #define SekCyclesLeft \
 	(((PicoMCD&1) && (PicoOpt & 0x2000)) ? (SekCycleAim-SekCycleCnt) : SekCyclesLeftNoMCD)
 #define SekCyclesLeftS68k \
-	((PicoOpt & 0x2000) ? (SekCycleAimS68k-SekCycleCntS68k) : PicoS68kCPU.cyc_remaining_cycles)
+	((PicoOpt & 0x2000) ? (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); \
 }
-#define SekPc m68k_get_reg(&PicoM68kCPU, M68K_REG_PC)
-#define SekPcS68k m68k_get_reg(&PicoS68kCPU, M68K_REG_PC)
+#define SekPc m68k_get_reg(&PicoCpuMM68k, M68K_REG_PC)
+#define SekPcS68k m68k_get_reg(&PicoCpuMS68k, M68K_REG_PC)
 #define SekSetStop(x) { \
-	if(x) { SET_CYCLES(0); PicoM68kCPU.stopped=STOP_LEVEL_STOP; } \
-	else PicoM68kCPU.stopped=0; \
+	if(x) { SET_CYCLES(0); PicoCpuMM68k.stopped=STOP_LEVEL_STOP; } \
+	else PicoCpuMM68k.stopped=0; \
 }
 #define SekSetStopS68k(x) { \
-	if(x) { SET_CYCLES(0); PicoS68kCPU.stopped=STOP_LEVEL_STOP; } \
-	else PicoS68kCPU.stopped=0; \
+	if(x) { SET_CYCLES(0); PicoCpuMS68k.stopped=STOP_LEVEL_STOP; } \
+	else PicoCpuMS68k.stopped=0; \
 }
 #endif
 #endif
@@ -101,7 +104,11 @@ extern int SekCycleCnt; // cycles done in this frame
 extern int SekCycleAim; // cycle aim
 extern unsigned int SekCycleCntT; // total cycle counter, updated once per frame
 
-#define SekCyclesReset() {SekCycleCntT+=SekCycleCnt;SekCycleCnt=SekCycleAim=0;}
+#define SekCyclesReset() { \
+	SekCycleCntT+=SekCycleAim; \
+	SekCycleCnt-=SekCycleAim; \
+	SekCycleAim=0; \
+}
 #define SekCyclesBurn(c)  SekCycleCnt+=c
 #define SekCyclesDone()  (SekCycleAim-SekCyclesLeft)    // nuber of cycles done in this frame (can be checked anywhere)
 #define SekCyclesDoneT() (SekCycleCntT+SekCyclesDone()) // total nuber of cycles done for this rom
@@ -115,7 +122,10 @@ extern unsigned int SekCycleCntT; // total cycle counter, updated once per frame
 extern int SekCycleCntS68k;
 extern int SekCycleAimS68k;
 
-#define SekCyclesResetS68k() {SekCycleCntS68k=SekCycleAimS68k=0;}
+#define SekCyclesResetS68k() { \
+	SekCycleCntS68k-=SekCycleAimS68k; \
+	SekCycleAimS68k=0; \
+}
 #define SekCyclesDoneS68k()  (SekCycleAimS68k-SekCyclesLeftS68k)
 
 // debug cyclone
@@ -130,24 +140,26 @@ extern int SekCycleAimS68k;
 #define SekEndRun(c)
 #endif
 
-extern int PicoMCD;
-
 // ---------------------------------------------------------
 
+extern int PicoMCD;
+
 // main oscillator clock which controls timing
 #define OSC_NTSC 53693100
-#define OSC_PAL  53203424 // not accurate
+// seems to be accurate, see scans from http://www.hot.ee/tmeeco/
+#define OSC_PAL  53203424
 
 struct PicoVideo
 {
   unsigned char reg[0x20];
-  unsigned int command; // 32-bit Command
-  unsigned char pending; // 1 if waiting for second half of 32-bit command
-  unsigned char type; // Command type (v/c/vsram read/write)
-  unsigned short addr; // Read/Write address
-  int status; // Status bits
+  unsigned int command;       // 32-bit Command
+  unsigned char pending;      // 1 if waiting for second half of 32-bit command
+  unsigned char type;         // Command type (v/c/vsram read/write)
+  unsigned short addr;        // Read/Write address
+  int status;                 // Status bits
   unsigned char pending_ints; // pending interrupts: ??VH????
-  unsigned char pad[0x13];
+  signed char lwrite_cnt;     // VDP write count during active display line
+  unsigned char pad[0x12];
 };
 
 struct PicoMisc
@@ -165,11 +177,11 @@ struct PicoMisc
   unsigned char  z80_fakeval;
   unsigned char  pad0;
   unsigned char  padDelay[2];  // 10 gamepad phase time outs, so we count a delay
-  unsigned short sram_addr;  // EEPROM address register
-  unsigned char sram_cycle;  // EEPROM SRAM cycle number
-  unsigned char sram_slave;  // EEPROM slave word for X24C02 and better SRAMs
+  unsigned short eeprom_addr;  // EEPROM address register
+  unsigned char  eeprom_cycle; // EEPROM SRAM cycle number
+  unsigned char  eeprom_slave; // EEPROM slave word for X24C02 and better SRAMs
   unsigned char prot_bytes[2]; // simple protection faking
-  unsigned short dma_bytes;  //
+  unsigned short dma_xfers;
   unsigned char pad[2];
   unsigned int  frame_count; // mainly for movies
 };
@@ -198,10 +210,14 @@ struct PicoSRAM
   unsigned char *data;		// actual data
   unsigned int start;		// start address in 68k address space
   unsigned int end;
-  unsigned char resize;		// 0c: 1=SRAM size changed and needs to be reallocated on PicoReset
-  unsigned char reg_back;	// copy of Pico.m.sram_reg to set after reset
+  unsigned char unused1;	// 0c: unused
+  unsigned char unused2;
   unsigned char changed;
-  unsigned char pad;
+  unsigned char eeprom_type;    // eeprom type: 0: 7bit (24C01), 2: device with 2 addr words (X24C02+), 3: dev with 3 addr words
+  unsigned char eeprom_abits;	// eeprom access must be odd addr for: bit0 ~ cl, bit1 ~ out
+  unsigned char eeprom_bit_cl;	// bit number for cl
+  unsigned char eeprom_bit_in;  // bit number for in
+  unsigned char eeprom_bit_out; // bit number for out
 };
 
 // MCD
@@ -285,6 +301,9 @@ PICO_INTERNAL int PicoAreaUnpackCpu(unsigned char *cpu, int is_sub);
 PICO_INTERNAL int PicoCdSaveState(void *file);
 PICO_INTERNAL int PicoCdLoadState(void *file);
 
+// Cart.c
+PICO_INTERNAL void PicoCartDetect(void);
+
 // Draw.c
 PICO_INTERNAL int PicoLine(int scan);
 PICO_INTERNAL void PicoFrameStart(void);
@@ -325,7 +344,7 @@ PICO_INTERNAL int PicoFrameMCD(void);
 PICO_INTERNAL int SekInit(void);
 PICO_INTERNAL int SekReset(void);
 PICO_INTERNAL int SekInterrupt(int irq);
-PICO_INTERNAL void SekState(unsigned char *data);
+PICO_INTERNAL void SekState(int *data);
 PICO_INTERNAL void SekSetRealTAS(int use_real);
 
 // cd/Sek.c
@@ -377,5 +396,37 @@ PICO_INTERNAL void z80_exit(void);
 } // End of extern "C"
 #endif
 
+// emulation event logging
+#ifndef EL_LOGMASK
+#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 (TODO) */
+
+#define EL_STATUS  0x4000 /* status messages */
+#define EL_ANOMALY 0x8000 /* some unexpected conditions */
+
+#if EL_LOGMASK
+#define elprintf(w,f,...) \
+{ \
+	if ((w) & EL_LOGMASK) \
+		printf("%05i:%03i: " f "\n",Pico.m.frame_count,Pico.m.scanline,##__VA_ARGS__); \
+}
+#else
+#define elprintf(w,f,...)
+#endif
+
 #endif // PICO_INTERNAL_INCLUDED