32x and sms savestates. Core-independent z80 state. SS bugfixing/refactoring.

[picodrive.git] / pico / pico_int.h

diff --git a/pico/pico_int.h b/pico/pico_int.h
index 3ee4ea1..74d1da2 100644 (file)
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -178,14 +178,7 @@ extern int dbg_irq_level;
 \r
 // ----------------------- Z80 CPU -----------------------\r
 \r
-#if defined(_USE_MZ80)\r
-#include "../cpu/mz80/mz80.h"\r
-\r
-#define z80_run(cycles)    { mz80GetElapsedTicks(1); mz80_run(cycles) }\r
-#define z80_run_nr(cycles) mz80_run(cycles)\r
-#define z80_int()          mz80int(0)\r
-\r
-#elif defined(_USE_DRZ80)\r
+#if defined(_USE_DRZ80)\r
 #include "../cpu/DrZ80/drz80.h"\r
 \r
 extern struct DrZ80 drZ80;\r
@@ -215,6 +208,8 @@ extern struct DrZ80 drZ80;
 \r
 #endif\r
 \r
+#define Z80_STATE_SIZE 0x60\r
+\r
 extern int z80stopCycle;         /* in 68k cycles */\r
 extern int z80_cycle_cnt;        /* 'done' z80 cycles before z80_run() */\r
 extern int z80_cycle_aim;\r
@@ -305,6 +300,13 @@ struct PicoMisc
   unsigned int  frame_count;   // 1c for movies and idle det\r
 };\r
 \r
+struct PicoMS\r
+{\r
+  unsigned char carthw[0x10];\r
+  unsigned char io_ctl;\r
+  unsigned char pad[0x4f];\r
+};\r
+\r
 // some assembly stuff depend on these, do not touch!\r
 struct Pico\r
 {\r
@@ -314,9 +316,8 @@ struct Pico
     unsigned char  vramb[0x4000]; // VRAM in SMS mode\r
   };\r
   unsigned char zram[0x2000];  // 0x20000 Z80 ram\r
-  unsigned char ioports[0x10];\r
-  unsigned char sms_io_ctl;\r
-  unsigned char pad[0xef];     // unused\r
+  unsigned char ioports[0x10]; // XXX: fix asm and mv\r
+  unsigned char pad[0xf0];     // unused\r
   unsigned short cram[0x40];   // 0x22100\r
   unsigned short vsram[0x40];  // 0x22180\r
 \r
@@ -325,6 +326,7 @@ struct Pico
 \r
   struct PicoMisc m;\r
   struct PicoVideo video;\r
+  struct PicoMS ms;\r
 };\r
 \r
 // sram\r
@@ -487,6 +489,7 @@ struct Pico32x
   unsigned short dmac_fifo[DMAC_FIFO_LEN];\r
   unsigned int dmac_ptr;\r
   unsigned int pwm_irq_sample_cnt;\r
+  unsigned int reserved[9];\r
 };\r
 \r
 struct Pico32xMem\r
@@ -496,7 +499,10 @@ struct Pico32xMem
   unsigned short drcblk_ram[1 << (18 - SH2_DRCBLK_RAM_SHIFT)];\r
 #endif\r
   unsigned short dram[2][0x20000/2];    // AKA fb\r
-  unsigned char  m68k_rom[0x10000];     // 0x100; using M68K_BANK_SIZE\r
+  union {\r
+    unsigned char  m68k_rom[0x100];\r
+    unsigned char  m68k_rom_bank[0x10000]; // M68K_BANK_SIZE\r
+  };\r
   unsigned char  data_array[2][0x1000]; // cache in SH2s (can be used as RAM)\r
 #ifdef DRC_SH2\r
   unsigned short drcblk_da[2][1 << (12 - SH2_DRCBLK_DA_SHIFT)];\r
@@ -510,14 +516,8 @@ struct Pico32xMem
 };\r
 \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
-PICO_INTERNAL int PicoCdSaveState(void *file);\r
-PICO_INTERNAL int PicoCdLoadState(void *file);\r
-\r
 typedef struct {\r
        int chunk;\r
        int size;\r
@@ -526,19 +526,9 @@ typedef struct {
 extern carthw_state_chunk *carthw_chunks;\r
 #define CHUNK_CARTHW 64\r
 \r
-// area.c\r
-typedef size_t (arearw)(void *p, size_t _size, size_t _n, void *file);\r
-typedef size_t (areaeof)(void *file);\r
-typedef int    (areaseek)(void *file, long offset, int whence);\r
-typedef int    (areaclose)(void *file);\r
-extern arearw  *areaRead;  // external read and write function pointers for\r
-extern arearw  *areaWrite; // gzip save state ability\r
-extern areaeof *areaEof;\r
-extern areaseek *areaSeek;\r
-extern areaclose *areaClose;\r
-\r
 // cart.c\r
-void Byteswap(void *dst, const void *src, int len);\r
+extern int PicoCartResize(int newsize);\r
+extern void Byteswap(void *dst, const void *src, int len);\r
 extern void (*PicoCartMemSetup)(void);\r
 extern void (*PicoCartUnloadHook)(void);\r
 \r
@@ -612,6 +602,8 @@ PICO_INTERNAL void SekInit(void);
 PICO_INTERNAL int  SekReset(void);\r
 PICO_INTERNAL void SekState(int *data);\r
 PICO_INTERNAL void SekSetRealTAS(int use_real);\r
+PICO_INTERNAL void SekPackCpu(unsigned char *cpu, int is_sub);\r
+PICO_INTERNAL void SekUnpackCpu(const unsigned char *cpu, int is_sub);\r
 void SekStepM68k(void);\r
 void SekInitIdleDet(void);\r
 void SekFinishIdleDet(void);\r
@@ -671,8 +663,8 @@ unsigned int EEPROM_read(void);
 \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_pack(void *data);\r
+PICO_INTERNAL int  z80_unpack(const void *data);\r
 PICO_INTERNAL void z80_reset(void);\r
 PICO_INTERNAL void z80_exit(void);\r
 \r
@@ -695,6 +687,7 @@ extern int PsndDacLine;
 void PicoPowerMS(void);\r
 void PicoResetMS(void);\r
 void PicoMemSetupMS(void);\r
+void PicoStateLoadedMS(void);\r
 void PicoFrameMS(void);\r
 void PicoFrameDrawOnlyMS(void);\r
 \r
@@ -717,6 +710,7 @@ void PicoWrite8_32x(unsigned int a, unsigned int d);
 void PicoWrite16_32x(unsigned int a, unsigned int d);\r
 void PicoMemSetup32x(void);\r
 void Pico32xSwapDRAM(int b);\r
+void Pico32xStateLoaded(void);\r
 void p32x_poll_event(int cpu_mask, int is_vdp);\r
 \r
 // 32x/draw.c\r