X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico_int.h;h=55da52654165d3e6ae5a1a58951f997521edb538;hb=5e89f0f5aebedc086888415e063b9883fc4a9e92;hp=df3a66126998744540a5b8f025732c4c47f23a2a;hpb=bcc9eda077d079ea5005d60ac58f9fe0d5105abe;p=picodrive.git

diff --git a/pico/pico_int.h b/pico/pico_int.h
index df3a661..55da526 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
@@ -188,6 +186,7 @@ extern struct DrZ80 drZ80;
 #define z80_int()          drZ80.Z80_IRQ = 1
 
 #define z80_cyclesLeft     drZ80.cycles
+#define z80_pc()           (drZ80.Z80PC - drZ80.Z80PC_BASE)
 
 #elif defined(_USE_CZ80)
 #include "../cpu/cz80/cz80.h"
@@ -197,6 +196,7 @@ extern struct DrZ80 drZ80;
 #define z80_int()          Cz80_Set_IRQ(&CZ80, 0, HOLD_LINE)
 
 #define z80_cyclesLeft     (CZ80.ICount - CZ80.ExtraCycles)
+#define z80_pc()           Cz80_Get_Reg(&CZ80, CZ80_PC)
 
 #else
 
@@ -220,11 +220,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
@@ -250,18 +255,19 @@ struct PicoMisc
   char dirtyPal;               // 06 Is the palette dirty (1 - change @ this frame, 2 - some time before)
   unsigned char hardware;      // 07 Hardware value for country
   unsigned char pal;           // 08 1=PAL 0=NTSC
-  unsigned char sram_reg;      // SRAM mode register. bit0: allow read? bit1: deny write? bit2: EEPROM? bit4: detected? (header or by access)
+  unsigned char sram_reg;      // 09 SRAM reg. See SRR_* below
   unsigned short z80_bank68k;  // 0a
-  unsigned short z80_lastaddr; // this is for Z80 faking
-  unsigned char  z80_fakeval;
+  unsigned short pad0;
+  unsigned char  pad1;
   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
+  unsigned char  eeprom_cycle; // EEPROM cycle number
   unsigned char  eeprom_slave; // EEPROM slave word for X24C02 and better SRAMs
-  unsigned char prot_bytes[2]; // simple protection faking
+  unsigned char  eeprom_status;
+  unsigned char  pad2;
   unsigned short dma_xfers;    // 18
-  unsigned char pad[2];
+  unsigned char  eeprom_wb[2]; // EEPROM latch/write buffer
   unsigned int  frame_count;   // 1c for movies and idle det
 };
 
@@ -269,10 +275,14 @@ struct PicoMisc
 struct Pico
 {
   unsigned char ram[0x10000];  // 0x00000 scratch ram
-  unsigned short vram[0x8000]; // 0x10000
+  union {                      // vram is byteswapped for easier reads when drawing
+    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
 
@@ -284,19 +294,26 @@ struct Pico
 };
 
 // sram
+#define SRR_MAPPED   (1 << 0)
+#define SRR_READONLY (1 << 1)
+
+#define SRF_ENABLED  (1 << 0)
+#define SRF_EEPROM   (1 << 1)
+
 struct PicoSRAM
 {
   unsigned char *data;		// actual data
   unsigned int start;		// start address in 68k address space
   unsigned int end;
-  unsigned char unused1;	// 0c: unused
+  unsigned char flags;		// 0c: SRF_*
   unsigned char unused2;
   unsigned char changed;
-  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_type;    // eeprom type: 0: 7bit (24C01), 2: 2 addr words (X24C02+), 3: 3 addr words
+  unsigned char unused3;
   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
+  unsigned int size;
 };
 
 // MCD
@@ -325,7 +342,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
@@ -368,15 +385,44 @@ typedef struct
 	Rot_Comp rot_comp;
 } mcd_state;
 
+// XXX: this will need to be reworked for cart+cd support.
 #define Pico_mcd ((mcd_state *)Pico.rom)
 
+// 32X
+#define P32XV_nPAL (1<<15)
+#define P32XV_PRI  (1<< 7)
+#define P32XV_Mx   (3<< 0)
 
-// Area.c
+#define P32XV_VBLK (1<<15)
+#define P32XV_HBLK (1<<14)
+#define P32XV_PEN  (1<<13)
+#define P32XV_nFEN (1<< 1)
+#define P32XV_FS   (1<< 0)
+
+struct Pico32x
+{
+  unsigned short regs[0x20];
+  unsigned short vdp_regs[0x10];
+  unsigned char pending_fb;
+  unsigned char dirty_pal;
+  unsigned char pad[2];
+};
+
+struct Pico32xMem
+{
+  unsigned char  sdram[0x40000];
+  unsigned short dram[2][0x20000/2]; // AKA fb
+  unsigned char  m68k_rom[0x10000]; // 0x100; using M68K_BANK_SIZE
+  unsigned short pal[0x100];
+  unsigned short pal_native[0x100]; // converted to native (for renderer)
+};
+
+// 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);
 
@@ -399,53 +445,47 @@ extern areaeof *areaEof;
 extern areaseek *areaSeek;
 extern areaclose *areaClose;
 
-// Cart.c
+// cart.c
+extern void (*PicoCartMemSetup)(void);
 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);
+void BackFill(int reg7, int sh);
+void FinalizeLineRGB555(int sh, int 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
-PICO_INTERNAL void PicoInitPc(unsigned int pc);
-PICO_INTERNAL unsigned int PicoCheckPc(unsigned int pc);
-PICO_INTERNAL_ASM unsigned int PicoRead32(unsigned int a);
+// mode4.c
+void PicoFrameStartMode4(void);
+void PicoLineMode4(int line);
+void PicoDoHighPal555M4(void);
+void PicoDrawSetColorFormatMode4(int which);
+
+// memory.c
 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);
-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);
+unsigned int PicoRead8_io(unsigned int a);
+unsigned int PicoRead16_io(unsigned int a);
+void PicoWrite8_io(unsigned int a, unsigned int d);
+void PicoWrite16_io(unsigned int a, unsigned int d);
 
-// cd/Memory.c
+// pico/memory.c
+PICO_INTERNAL void PicoMemSetupPico(void);
+
+// cd/memory.c
 PICO_INTERNAL void PicoMemSetupCD(void);
-PICO_INTERNAL_ASM void PicoMemResetCD(int r3);
+PICO_INTERNAL_ASM void PicoMemRemapCD(int r3);
 PICO_INTERNAL_ASM void PicoMemResetCDdecode(int r3);
 
-// 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];
@@ -456,23 +496,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);
@@ -481,7 +521,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);
@@ -517,22 +557,31 @@ 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
-PICO_INTERNAL void SRAMWriteEEPROM(unsigned int d);
-PICO_INTERNAL void SRAMUpdPending(unsigned int a, unsigned int d);
-PICO_INTERNAL_ASM unsigned int SRAMReadEEPROM(void);
+// misc.c
 PICO_INTERNAL_ASM void memcpy16(unsigned short *dest, unsigned short *src, int count);
 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
+// eeprom.c
+void EEPROM_write8(unsigned int a, unsigned int d);
+void EEPROM_write16(unsigned int d);
+unsigned int EEPROM_read(void);
+
+// 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);
+
+// 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);
 
@@ -544,14 +593,43 @@ 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);
+void PicoFrameDrawOnlyMS(void);
+
+// 32x/32x.c
+extern struct Pico32x Pico32x;
+void Pico32xInit(void);
+void PicoPower32x(void);
+void PicoReset32x(void);
+void Pico32xStartup(void);
+void PicoUnload32x(void);
+void PicoFrame32x(void);
+
+// 32x/memory.c
+struct Pico32xMem *Pico32xMem;
+unsigned int PicoRead8_32x(unsigned int a);
+unsigned int PicoRead16_32x(unsigned int a);
+void PicoWrite8_32x(unsigned int a, unsigned int d);
+void PicoWrite16_32x(unsigned int a, unsigned int d);
+void PicoMemSetup32x(void);
+void Pico32xSwapDRAM(int b);
+
+// 32x/draw.c
+void FinalizeLine32xRGB555(int sh, int line);
+
+/* avoid dependency on newer glibc */
+static __inline int isspace_(int c)
+{
+	return (0x09 <= c && c <= 0x0d) || c == ' ';
+}
+
 // emulation event logging
 #ifndef EL_LOGMASK
 #define EL_LOGMASK 0
@@ -574,6 +652,9 @@ extern int PsndDacLine;
 #define EL_SVP     0x00004000 /* SVP stuff */
 #define EL_PICOHW  0x00008000 /* Pico stuff */
 #define EL_IDLE    0x00010000 /* idle loop det. */
+#define EL_CDREGS  0x00020000 /* MCD: register access */
+#define EL_CDREG3  0x00040000 /* MCD: register 3 only */
+#define EL_32X     0x00080000
 
 #define EL_STATUS  0x40000000 /* status messages */
 #define EL_ANOMALY 0x80000000 /* some unexpected conditions (during emulation) */
@@ -597,6 +678,18 @@ 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 __GNUC__
+#define NOINLINE __attribute__((noinline))
+#else
+#define NOINLINE
+#endif
+
 #ifdef __cplusplus
 } // End of extern "C"
 #endif