X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico_int.h;h=848da5dfa4773f1fbfe8ab82a4515b2e315d7933;hb=0e4bde9b2d981c264343aa66809f2f26ce7843c8;hp=743ecb48fbd08641e5180109a2f4b4674ac339c5;hpb=e42a47e2086e6512519dd86af420363498302f49;p=picodrive.git

diff --git a/pico/pico_int.h b/pico/pico_int.h
index 743ecb4..848da5d 100644
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -117,37 +117,25 @@ extern m68ki_cpu_core PicoCpuMM68k, PicoCpuMS68k;
 #define SekNotPolling     PicoCpuMM68k.not_polling
 #define SekNotPollingS68k PicoCpuMS68k.not_polling
 
-#define SekInterrupt(irq) { \
-	void *oldcontext = m68ki_cpu_p; \
-	m68k_set_context(&PicoCpuMM68k); \
-	m68k_set_irq(irq); \
-	m68k_set_context(oldcontext); \
-}
-#define SekIrqLevel (PicoCpuMM68k.int_level >> 8)
+// avoid m68k_set_irq() for delaying to work
+#define SekInterrupt(irq)  PicoCpuMM68k.int_level = (irq) << 8
+#define SekIrqLevel        (PicoCpuMM68k.int_level >> 8)
 
 #endif
 #endif // EMU_M68K
 
-// while running, cnt represents target of current timeslice
-// while not in SekRun(), it's actual cycles done
-// (but always use SekCyclesDone() if you need current position)
-// cnt may change if timeslice is ended prematurely or extended,
-// so we use SekCycleAim for the actual target
-extern unsigned int SekCycleCnt;
-extern unsigned int SekCycleAim;
-
 // number of cycles done (can be checked anywhere)
-#define SekCyclesDone()  (SekCycleCnt - SekCyclesLeft)
+#define SekCyclesDone()  (Pico.t.m68c_cnt - SekCyclesLeft)
 
 // burn cycles while not in SekRun() and while in
-#define SekCyclesBurn(c)    SekCycleCnt += c
+#define SekCyclesBurn(c)    Pico.t.m68c_cnt += c
 #define SekCyclesBurnRun(c) { \
   SekCyclesLeft -= c; \
 }
 
 // note: sometimes may extend timeslice to delay an irq
 #define SekEndRun(after) { \
-  SekCycleCnt -= SekCyclesLeft - (after); \
+  Pico.t.m68c_cnt -= SekCyclesLeft - (after); \
   SekCyclesLeft = after; \
 }
 
@@ -211,20 +199,13 @@ extern struct DrZ80 drZ80;
 
 #define Z80_STATE_SIZE 0x60
 
-extern unsigned int last_z80_sync;
-extern int z80_cycle_cnt;        /* 'done' z80 cycles before z80_run() */
-extern int z80_cycle_aim;
-extern int z80_scanline;
-extern int z80_scanline_cycles;  /* cycles done until z80_scanline */
-
 #define z80_resetCycles() \
-  last_z80_sync = SekCyclesDone(); \
-  z80_cycle_cnt = z80_cycle_aim = z80_scanline = z80_scanline_cycles = 0;
+  Pico.t.z80c_cnt = Pico.t.z80c_aim = Pico.t.z80_scanline = 0
 
 #define z80_cyclesDone() \
-  (z80_cycle_aim - z80_cyclesLeft)
+  (Pico.t.z80c_aim - z80_cyclesLeft)
 
-#define cycles_68k_to_z80(x) ((x)*957 >> 11)
+#define cycles_68k_to_z80(x) ((x) * 3823 >> 13)
 
 // ----------------------- SH2 CPU -----------------------
 
@@ -306,6 +287,7 @@ extern SH2 sh2s[2];
 #define SR_EMPT       (1 << 9)
 // not part of real SR
 #define PVS_ACTIVE    (1 << 16)
+#define PVS_VB2       (1 << 17) // ignores forced blanking
 
 struct PicoVideo
 {
@@ -366,15 +348,16 @@ struct PicoEState
   void *DrawLineDest;          // draw destination
   unsigned char *HighCol;
   int *HighPreSpr;
-  void *Pico_video;
-  void *Pico_vram;
+  struct Pico *Pico;
+  void *PicoMem_vram;
+  void *PicoMem_cram;
   int  *PicoOpt;
   unsigned char *Draw2FB;
   unsigned short HighPal[0x100];
 };
 
-// some assembly stuff depend on these, do not touch!
-struct Pico
+// some assembly stuff still depends on these, do not touch!
+struct PicoMem
 {
   unsigned char ram[0x10000];  // 0x00000 scratch ram
   union {                      // vram is byteswapped for easier reads when drawing
@@ -386,14 +369,6 @@ struct Pico
   unsigned char pad[0xf0];     // unused
   unsigned short cram[0x40];   // 0x22100
   unsigned short vsram[0x40];  // 0x22180
-
-  unsigned char *rom;          // 0x22200
-  unsigned int romsize;        // 0x22204 (on 32bits)
-
-  struct PicoMisc m;
-  struct PicoVideo video;
-  struct PicoMS ms;
-  struct PicoEState est;
 };
 
 // sram
@@ -403,7 +378,7 @@ struct Pico
 #define SRF_ENABLED  (1 << 0)
 #define SRF_EEPROM   (1 << 1)
 
-struct PicoSRAM
+struct PicoCartSave
 {
   unsigned char *data;		// actual data
   unsigned int start;		// start address in 68k address space
@@ -419,6 +394,38 @@ struct PicoSRAM
   unsigned int size;
 };
 
+struct PicoTiming
+{
+  // while running, cnt represents target of current timeslice
+  // while not in SekRun(), it's actual cycles done
+  // (but always use SekCyclesDone() if you need current position)
+  // _cnt may change if timeslice is ended prematurely or extended,
+  // so we use _aim for the actual target
+  unsigned int m68c_cnt;
+  unsigned int m68c_aim;
+  unsigned int m68c_frame_start;        // m68k cycles
+  unsigned int m68c_line_start;
+
+  unsigned int z80c_cnt;                // z80 cycles done (this frame)
+  unsigned int z80c_aim;
+  int z80_scanline;
+};
+
+// run tools/mkoffsets pico/pico_int_o32.h if you change these
+// careful with savestate compat
+struct Pico
+{
+  struct PicoVideo video;
+  struct PicoMisc m;
+  struct PicoTiming t;
+  struct PicoCartSave sv;
+  struct PicoEState est;
+  struct PicoMS ms;
+
+  unsigned char *rom;
+  unsigned int romsize;
+};
+
 // MCD
 #define PCM_MIXBUF_LEN ((12500000 / 384) / 50 + 1)
 
@@ -697,7 +704,7 @@ void pcd_state_loaded_mem(void);
 
 // pico.c
 extern struct Pico Pico;
-extern struct PicoSRAM SRam;
+extern struct PicoMem PicoMem;
 extern int PicoPadInt[2];
 extern int emustatus;
 extern void (*PicoResetHook)(void);
@@ -807,7 +814,6 @@ void ym2612_unpack_state(void);
 
 
 // videoport.c
-extern int line_base_cycles;
 PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d);
 PICO_INTERNAL_ASM unsigned int PicoVideoRead(unsigned int a);
 unsigned char PicoVideoRead8DataH(void);
@@ -896,7 +902,7 @@ void p32x_event_schedule_sh2(SH2 *sh2, enum p32x_event event, int after);
 void p32x_schedule_hint(SH2 *sh2, int m68k_cycles);
 
 // 32x/memory.c
-struct Pico32xMem *Pico32xMem;
+extern 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);
@@ -1092,3 +1098,4 @@ void pevt_dump(void);
 
 #endif // PICO_INTERNAL_INCLUDED
 
+// vim:shiftwidth=2:ts=2:expandtab