X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=pico%2Fpico_int.h;h=c206aa8e313d0ef03ed998ffe4fc813bd6cfc5d2;hb=2446536be520914616403876d7e49621ac6f4b95;hp=68a77c0b11c8a48aa3be542df05fc055bd5a0ebd;hpb=b8a1c09ad1ef0b807c2eb1632d34e6bfae14b633;p=picodrive.git

diff --git a/pico/pico_int.h b/pico/pico_int.h
index 68a77c0..c206aa8 100644
--- a/pico/pico_int.h
+++ b/pico/pico_int.h
@@ -1,10 +1,11 @@
-// Pico Library - Internal Header File
-
-// (c) Copyright 2004 Dave, All rights reserved.
-// (c) Copyright 2006-2009 Grazvydas "notaz" Ignotas, all rights reserved.
-// Free for non-commercial use.
-
-// For commercial use, separate licencing terms must be obtained.
+/*
+ * PicoDrive - Internal Header File
+ * (c) Copyright Dave, 2004
+ * (C) notaz, 2006-2010
+ *
+ * This work is licensed under the terms of MAME license.
+ * See COPYING file in the top-level directory.
+ */
 
 #ifndef PICO_INTERNAL_INCLUDED
 #define PICO_INTERNAL_INCLUDED
@@ -34,7 +35,7 @@ extern "C" {
 
 // ----------------------- 68000 CPU -----------------------
 #ifdef EMU_C68K
-#include "../cpu/Cyclone/Cyclone.h"
+#include "../cpu/cyclone/Cyclone.h"
 extern struct Cyclone PicoCpuCM68k, PicoCpuCS68k;
 #define SekCyclesLeftNoMCD PicoCpuCM68k.cycles // cycles left for this run
 #define SekCyclesLeft \
@@ -45,7 +46,7 @@ extern struct Cyclone PicoCpuCM68k, PicoCpuCS68k;
 #define SekEndTimesliceS68k(after) PicoCpuCS68k.cycles=after
 #define SekPc (PicoCpuCM68k.pc-PicoCpuCM68k.membase)
 #define SekPcS68k (PicoCpuCS68k.pc-PicoCpuCS68k.membase)
-#define SekDar(x) PicoCpuCM68k.d[x]
+#define SekDar(x) (x < 8 ? PicoCpuCM68k.d[x] : PicoCpuCM68k.a[x - 8])
 #define SekSr     CycloneGetSr(&PicoCpuCM68k)
 #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; } }
@@ -72,7 +73,7 @@ extern M68K_CONTEXT PicoCpuFM68k, PicoCpuFS68k;
 #define SekEndTimesliceS68k(after) PicoCpuFS68k.io_cycle_counter=after
 #define SekPc     fm68k_get_pc(&PicoCpuFM68k)
 #define SekPcS68k fm68k_get_pc(&PicoCpuFS68k)
-#define SekDar(x) PicoCpuFM68k.dreg[x].D
+#define SekDar(x) (x < 8 ? PicoCpuFM68k.dreg[x].D : PicoCpuFM68k.areg[x - 8].D)
 #define SekSr     PicoCpuFM68k.sr
 #define SekSetStop(x) { \
 	PicoCpuFM68k.execinfo &= ~FM68K_HALTED; \
@@ -178,14 +179,7 @@ extern int dbg_irq_level;
 
 // ----------------------- Z80 CPU -----------------------
 
-#if defined(_USE_MZ80)
-#include "../cpu/mz80/mz80.h"
-
-#define z80_run(cycles)    { mz80GetElapsedTicks(1); mz80_run(cycles) }
-#define z80_run_nr(cycles) mz80_run(cycles)
-#define z80_int()          mz80int(0)
-
-#elif defined(_USE_DRZ80)
+#if defined(_USE_DRZ80)
 #include "../cpu/DrZ80/drz80.h"
 
 extern struct DrZ80 drZ80;
@@ -215,6 +209,8 @@ extern struct DrZ80 drZ80;
 
 #endif
 
+#define Z80_STATE_SIZE 0x60
+
 extern int z80stopCycle;         /* in 68k cycles */
 extern int z80_cycle_cnt;        /* 'done' z80 cycles before z80_run() */
 extern int z80_cycle_aim;
@@ -305,6 +301,13 @@ struct PicoMisc
   unsigned int  frame_count;   // 1c for movies and idle det
 };
 
+struct PicoMS
+{
+  unsigned char carthw[0x10];
+  unsigned char io_ctl;
+  unsigned char pad[0x4f];
+};
+
 // some assembly stuff depend on these, do not touch!
 struct Pico
 {
@@ -314,9 +317,8 @@ struct Pico
     unsigned char  vramb[0x4000]; // VRAM in SMS mode
   };
   unsigned char zram[0x2000];  // 0x20000 Z80 ram
-  unsigned char ioports[0x10];
-  unsigned char sms_io_ctl;
-  unsigned char pad[0xef];     // unused
+  unsigned char ioports[0x10]; // XXX: fix asm and mv
+  unsigned char pad[0xf0];     // unused
   unsigned short cram[0x40];   // 0x22100
   unsigned short vsram[0x40];  // 0x22180
 
@@ -325,6 +327,7 @@ struct Pico
 
   struct PicoMisc m;
   struct PicoVideo video;
+  struct PicoMS ms;
 };
 
 // sram
@@ -437,6 +440,8 @@ typedef struct
 #define P32XV_PRI   (1<< 7)
 #define P32XV_Mx    (3<< 0) // display mode mask
 
+#define P32XV_SFT   (1<< 0)
+
 #define P32XV_VBLK  (1<<15)
 #define P32XV_HBLK  (1<<14)
 #define P32XV_PEN   (1<<13)
@@ -469,11 +474,13 @@ typedef struct
 #define SH2_DRCBLK_RAM_SHIFT 1
 #define SH2_DRCBLK_DA_SHIFT  1
 
+#define SH2_WRITE_SHIFT 25
+
 struct Pico32x
 {
   unsigned short regs[0x20];
-  unsigned short vdp_regs[0x10];
-  unsigned short sh2_regs[3];
+  unsigned short vdp_regs[0x10]; // 0x40
+  unsigned short sh2_regs[3];    // 0x60
   unsigned char pending_fb;
   unsigned char dirty_pal;
   unsigned int emu_flags;
@@ -483,6 +490,7 @@ struct Pico32x
   unsigned short dmac_fifo[DMAC_FIFO_LEN];
   unsigned int dmac_ptr;
   unsigned int pwm_irq_sample_cnt;
+  unsigned int reserved[9];
 };
 
 struct Pico32xMem
@@ -492,7 +500,10 @@ struct Pico32xMem
   unsigned short drcblk_ram[1 << (18 - SH2_DRCBLK_RAM_SHIFT)];
 #endif
   unsigned short dram[2][0x20000/2];    // AKA fb
-  unsigned char  m68k_rom[0x10000];     // 0x100; using M68K_BANK_SIZE
+  union {
+    unsigned char  m68k_rom[0x100];
+    unsigned char  m68k_rom_bank[0x10000]; // M68K_BANK_SIZE
+  };
   unsigned char  data_array[2][0x1000]; // cache in SH2s (can be used as RAM)
 #ifdef DRC_SH2
   unsigned short drcblk_da[2][1 << (12 - SH2_DRCBLK_DA_SHIFT)];
@@ -506,14 +517,8 @@ struct Pico32xMem
 };
 
 // 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
-PICO_INTERNAL int PicoCdSaveState(void *file);
-PICO_INTERNAL int PicoCdLoadState(void *file);
-
 typedef struct {
 	int chunk;
 	int size;
@@ -522,19 +527,9 @@ typedef struct {
 extern carthw_state_chunk *carthw_chunks;
 #define CHUNK_CARTHW 64
 
-// area.c
-typedef size_t (arearw)(void *p, size_t _size, size_t _n, void *file);
-typedef size_t (areaeof)(void *file);
-typedef int    (areaseek)(void *file, long offset, int whence);
-typedef int    (areaclose)(void *file);
-extern arearw  *areaRead;  // external read and write function pointers for
-extern arearw  *areaWrite; // gzip save state ability
-extern areaeof *areaEof;
-extern areaseek *areaSeek;
-extern areaclose *areaClose;
-
 // cart.c
-void Byteswap(void *dst, const void *src, int len);
+extern int PicoCartResize(int newsize);
+extern void Byteswap(void *dst, const void *src, int len);
 extern void (*PicoCartMemSetup)(void);
 extern void (*PicoCartUnloadHook)(void);
 
@@ -545,10 +540,14 @@ int CM_compareRun(int cyc, int is_sub);
 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);
+void FinalizeLine555(int sh, int line);
+extern int (*PicoScanBegin)(unsigned int num);
+extern int (*PicoScanEnd)(unsigned int num);
 extern int DrawScanline;
 #define MAX_LINE_SPRITES 29
 extern unsigned char HighLnSpr[240][3 + MAX_LINE_SPRITES];
+extern void *DrawLineDestBase;
+extern int DrawLineDestIncrement;
 
 // draw2.c
 PICO_INTERNAL void PicoFrameFull();
@@ -557,7 +556,7 @@ PICO_INTERNAL void PicoFrameFull();
 void PicoFrameStartMode4(void);
 void PicoLineMode4(int line);
 void PicoDoHighPal555M4(void);
-void PicoDrawSetColorFormatMode4(int which);
+void PicoDrawSetOutputMode4(pdso_t which);
 
 // memory.c
 PICO_INTERNAL void PicoMemSetup(void);
@@ -606,6 +605,8 @@ PICO_INTERNAL void SekInit(void);
 PICO_INTERNAL int  SekReset(void);
 PICO_INTERNAL void SekState(int *data);
 PICO_INTERNAL void SekSetRealTAS(int use_real);
+PICO_INTERNAL void SekPackCpu(unsigned char *cpu, int is_sub);
+PICO_INTERNAL void SekUnpackCpu(const unsigned char *cpu, int is_sub);
 void SekStepM68k(void);
 void SekInitIdleDet(void);
 void SekFinishIdleDet(void);
@@ -665,8 +666,8 @@ 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_pack(void *data);
+PICO_INTERNAL int  z80_unpack(const void *data);
 PICO_INTERNAL void z80_reset(void);
 PICO_INTERNAL void z80_exit(void);
 
@@ -686,13 +687,24 @@ PICO_INTERNAL void PsndGetSamplesMS(void);
 extern int PsndDacLine;
 
 // sms.c
+#ifndef NO_SMS
 void PicoPowerMS(void);
 void PicoResetMS(void);
 void PicoMemSetupMS(void);
+void PicoStateLoadedMS(void);
 void PicoFrameMS(void);
 void PicoFrameDrawOnlyMS(void);
+#else
+#define PicoPowerMS()
+#define PicoResetMS()
+#define PicoMemSetupMS()
+#define PicoStateLoadedMS()
+#define PicoFrameMS()
+#define PicoFrameDrawOnlyMS()
+#endif
 
 // 32x/32x.c
+#ifndef NO_32X
 extern struct Pico32x Pico32x;
 void Pico32xInit(void);
 void PicoPower32x(void);
@@ -700,7 +712,7 @@ void PicoReset32x(void);
 void Pico32xStartup(void);
 void PicoUnload32x(void);
 void PicoFrame32x(void);
-void p32x_update_irls(void);
+void p32x_update_irls(int nested_call);
 void p32x_reset_sh2s(void);
 
 // 32x/memory.c
@@ -711,18 +723,41 @@ 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);
+void Pico32xStateLoaded(void);
 void p32x_poll_event(int cpu_mask, int is_vdp);
 
 // 32x/draw.c
 void FinalizeLine32xRGB555(int sh, int line);
+void PicoDraw32xLayer(int offs, int lines, int mdbg);
+void PicoDraw32xLayerMdOnly(int offs, int lines);
+extern int (*PicoScan32xBegin)(unsigned int num);
+extern int (*PicoScan32xEnd)(unsigned int num);
+enum {
+  PDM32X_OFF,
+  PDM32X_32X_ONLY,
+  PDM32X_BOTH,
+};
+extern int Pico32xDrawMode;
 
 // 32x/pwm.c
 unsigned int p32x_pwm_read16(unsigned int a);
 void p32x_pwm_write16(unsigned int a, unsigned int d);
 void p32x_pwm_update(int *buf32, int length, int stereo);
-void p32x_timers_do(int new_line);
+void p32x_timers_do(int line_call);
 void p32x_timers_recalc(void);
 extern int pwm_frame_smp_cnt;
+#else
+#define Pico32xInit()
+#define PicoPower32x()
+#define PicoReset32x()
+#define PicoFrame32x()
+#define PicoUnload32x()
+#define Pico32xStateLoaded()
+#define PicoDraw32xSetFrameMode(...)
+#define FinalizeLine32xRGB555 NULL
+#define p32x_pwm_update(...)
+#define p32x_timers_recalc()
+#endif
 
 /* avoid dependency on newer glibc */
 static __inline int isspace_(int c)
@@ -765,7 +800,6 @@ static __inline int isspace_(int c)
 #define EL_ANOMALY 0x80000000 /* some unexpected conditions (during emulation) */
 
 #if EL_LOGMASK
-extern void lprintf(const char *fmt, ...);
 #define elprintf(w,f,...) \
 { \
 	if ((w) & EL_LOGMASK) \
@@ -777,6 +811,18 @@ extern void lprintf(const char *fmt, ...);
 #define elprintf(w,f,...)
 #endif
 
+// profiling
+#ifdef PPROF
+#include <platform/linux/pprof.h>
+#else
+#define pprof_init()
+#define pprof_finish()
+#define pprof_start(x)
+#define pprof_end(...)
+#define pprof_end_sub(...)
+#endif
+
+// misc
 #ifdef _MSC_VER
 #define cdprintf
 #else