// taking an address of fread or fwrite causes "application could't be started" error\r
// on startup randomly depending on binary layout of executable file.\r
\r
-arearw *areaRead = (arearw *) 0; // fread; // read and write function pointers for\r
-arearw *areaWrite = (arearw *) 0; // fwrite; // gzip save state ability\r
+arearw *areaRead = (arearw *) 0; // fread; // read and write function pointers for\r
+arearw *areaWrite = (arearw *) 0; // fwrite; // gzip save state ability\r
+areaeof *areaEof = (areaeof *) 0;\r
+areaseek *areaSeek = (areaseek *) 0;\r
+areaclose *areaClose = (areaclose *) 0;\r
\r
\r
// Scan one variable and callback\r
#define SCANP(x) ScanVar(&Pico.x,sizeof(Pico.x),#x,PmovFile,PmovAction);\r
\r
// Pack the cpu into a common format:\r
-static int PackCpu(unsigned char *cpu)\r
+PICO_INTERNAL int PicoAreaPackCpu(unsigned char *cpu, int is_sub)\r
{\r
unsigned int pc=0;\r
\r
*(unsigned char *)(cpu+0x44)=(unsigned char)M68000_regs.ccr;\r
*(unsigned char *)(cpu+0x45)=(unsigned char)M68000_regs.srh;\r
*(unsigned int *)(cpu+0x48)=M68000_regs.isp;\r
+ cpu[0x4c] = M68000_regs.irq;\r
+ // stop flag?\r
#endif\r
\r
#ifdef EMU_C68K\r
- memcpy(cpu,PicoCpu.d,0x40);\r
- pc=PicoCpu.pc-PicoCpu.membase;\r
- *(unsigned int *)(cpu+0x44)=CycloneGetSr(&PicoCpu);\r
- *(unsigned int *)(cpu+0x48)=PicoCpu.osp;\r
+ struct Cyclone *context = is_sub ? &PicoCpuS68k : &PicoCpu;\r
+ memcpy(cpu,context->d,0x40);\r
+ pc=context->pc-context->membase;\r
+ *(unsigned int *)(cpu+0x44)=CycloneGetSr(context);\r
+ *(unsigned int *)(cpu+0x48)=context->osp;\r
+ cpu[0x4c] = context->irq;\r
+ cpu[0x4d] = context->state_flags & 1;\r
#endif\r
\r
#ifdef EMU_M68K\r
- memcpy(cpu,m68ki_cpu.dar,0x40);\r
- pc=m68ki_cpu.pc;\r
+ void *oldcontext = m68ki_cpu_p;\r
+ m68k_set_context(is_sub ? &PicoS68kCPU : &PicoM68kCPU);\r
+ memcpy(cpu,m68ki_cpu_p->dar,0x40);\r
+ pc=m68ki_cpu_p->pc;\r
*(unsigned int *)(cpu+0x44)=m68k_get_reg(NULL, M68K_REG_SR);\r
- *(unsigned int *)(cpu+0x48)=m68ki_cpu.sp[0];\r
+ *(unsigned int *)(cpu+0x48)=m68ki_cpu_p->sp[0];\r
+ cpu[0x4c] = CPU_INT_LEVEL>>8;\r
+ cpu[0x4d] = CPU_STOPPED;\r
+ m68k_set_context(oldcontext);\r
#endif\r
\r
*(unsigned int *)(cpu+0x40)=pc;\r
return 0;\r
}\r
\r
-static int UnpackCpu(unsigned char *cpu)\r
+PICO_INTERNAL int PicoAreaUnpackCpu(unsigned char *cpu, int is_sub)\r
{\r
- unsigned int pc=0;\r
-\r
- pc=*(unsigned int *)(cpu+0x40);\r
-\r
#ifdef EMU_A68K\r
memcpy(M68000_regs.d,cpu,0x40);\r
M68000_regs.pc=pc;\r
M68000_regs.ccr=*(unsigned char *)(cpu+0x44);\r
M68000_regs.srh=*(unsigned char *)(cpu+0x45);\r
M68000_regs.isp=*(unsigned int *)(cpu+0x48);\r
+ M68000_regs.irq = cpu[0x4c];\r
+ // stop flag?\r
#endif\r
\r
#ifdef EMU_C68K\r
- CycloneSetSr(&PicoCpu, *(unsigned int *)(cpu+0x44));\r
- PicoCpu.osp=*(unsigned int *)(cpu+0x48);\r
- memcpy(PicoCpu.d,cpu,0x40);\r
- PicoCpu.membase=0;\r
- PicoCpu.pc =PicoCpu.checkpc(pc); // Base pc\r
+ struct Cyclone *context = is_sub ? &PicoCpuS68k : &PicoCpu;\r
+ CycloneSetSr(context, *(unsigned int *)(cpu+0x44));\r
+ context->osp=*(unsigned int *)(cpu+0x48);\r
+ memcpy(context->d,cpu,0x40);\r
+ context->membase=0;\r
+ context->pc = context->checkpc(*(unsigned int *)(cpu+0x40)); // Base pc\r
+ context->irq = cpu[0x4c];\r
+ context->state_flags = 0;\r
+ if (cpu[0x4d])\r
+ context->state_flags |= 1;\r
#endif\r
\r
#ifdef EMU_M68K\r
- memcpy(m68ki_cpu.dar,cpu,0x40);\r
- m68ki_cpu.pc=pc;\r
+ void *oldcontext = m68ki_cpu_p;\r
+ m68k_set_context(is_sub ? &PicoS68kCPU : &PicoM68kCPU);\r
+ memcpy(m68ki_cpu_p->dar,cpu,0x40);\r
+ m68ki_cpu_p->pc=*(unsigned int *)(cpu+0x40);\r
m68k_set_reg(M68K_REG_SR, *(unsigned int *)(cpu+0x44));\r
- m68ki_cpu.sp[0]=*(unsigned int *)(cpu+0x48);\r
+ m68ki_cpu_p->sp[0]=*(unsigned int *)(cpu+0x48);\r
+ CPU_INT_LEVEL = cpu[0x4c] << 8;\r
+ CPU_STOPPED = cpu[0x4d];\r
+ m68k_set_context(oldcontext);\r
#endif\r
return 0;\r
}\r
{\r
Pico.m.scanline=0;\r
\r
- // Scan all the memory areas:\r
+ // Scan all the memory areas:\r
SCANP(ram) SCANP(vram) SCANP(zram) SCANP(cram) SCANP(vsram)\r
\r
// Pack, scan and unpack the cpu data:\r
- if((PmovAction&3)==1) PackCpu(cpu);\r
+ if((PmovAction&3)==1) PicoAreaPackCpu(cpu, 0);\r
//SekInit(); // notaz: do we really have to do this here?\r
//PicoMemInit();\r
SCAN_VAR(cpu,"cpu")\r
- if((PmovAction&3)==2) UnpackCpu(cpu);\r
+ if((PmovAction&3)==2) PicoAreaUnpackCpu(cpu, 0);\r
\r
SCAN_VAR(Pico.m ,"misc")\r
SCAN_VAR(Pico.video,"video")\r
\r
-\r
- if(ver == 0x0030) { // zram was being saved incorrectly in 0x0030 (byteswaped?)\r
- Byteswap(Pico.zram, 0x2000);\r
- return 0; // do not try to load sound stuff\r
- }\r
-\r
- //SCAN_VAR(Pico.s ,"sound")\r
- // notaz: save/load z80, YM2612, sn76496 states instead of Pico.s (which is unused anyway)\r
- if(PicoOpt&7) {\r
- if((PmovAction&3)==1) z80_pack(cpu_z80);\r
+ // notaz: save/load z80, YM2612, sn76496 states instead of Pico.s (which is unused anyway)\r
+ if(PicoOpt&7) {\r
+ if((PmovAction&3)==1) z80_pack(cpu_z80);\r
ret = SCAN_VAR(cpu_z80,"cpu_z80")\r
- // do not unpack if we fail to load z80 state\r
- if((PmovAction&3)==2) {\r
+ // do not unpack if we fail to load z80 state\r
+ if((PmovAction&3)==2) {\r
if(ret) z80_reset();\r
else z80_unpack(cpu_z80);\r
}\r
- }\r
- if(PicoOpt&3)\r
+ }\r
+ if(PicoOpt&3)\r
ScanVar(sn76496_regs,28*4,"SN76496state", PmovFile, PmovAction); // regs and other stuff\r
- if(PicoOpt&1) {\r
+ if(PicoOpt&1) {\r
ScanVar(ym2612_regs, 0x200+4, "YM2612state", PmovFile, PmovAction); // regs + addr line\r
- if((PmovAction&3)==2) YM2612PicoStateLoad(); // reload YM2612 state from it's regs\r
- }\r
+ if((PmovAction&3)==2) YM2612PicoStateLoad(); // reload YM2612 state from it's regs\r
+ }\r
}\r
\r
return 0;\r
int minimum=0;\r
unsigned char head[32];\r
\r
+ if (PicoMCD & 1)\r
+ {\r
+ if (PmovAction&1) return PicoCdSaveState(PmovFile);\r
+ if (PmovAction&2) return PicoCdLoadState(PmovFile);\r
+ }\r
+\r
memset(head,0,sizeof(head));\r
\r
// Find out minimal compatible version:\r
notaz.gp2x.de / picodrive.git / blobdiff