unsigned long z80_read_map [0x10000 >> Z80_MEM_SHIFT];
unsigned long z80_write_map[0x10000 >> Z80_MEM_SHIFT];
-void MEMH_FUNC z80_map_set(unsigned long *map, int start_addr, int end_addr,
- void *func_or_mh, int is_func)
-{
- unsigned long addr = (unsigned long)func_or_mh;
- int mask = (1 << Z80_MEM_SHIFT) - 1;
- int i;
-
- if ((start_addr & mask) != 0 || (end_addr & mask) != mask)
- elprintf(EL_STATUS|EL_ANOMALY, "z80_map_set: tried to map bad range: %04x-%04x",
- start_addr, end_addr);
-
- if (addr & 1) {
- elprintf(EL_STATUS|EL_ANOMALY, "z80_map_set: ptr is not aligned: %08lx", addr);
- return;
- }
-
- for (i = start_addr >> Z80_MEM_SHIFT; i <= end_addr >> Z80_MEM_SHIFT; i++)
- if (is_func)
- map[i] = (addr >> 1) | (1 << (sizeof(addr) * 8 - 1));
- else
- map[i] = (addr - (i << Z80_MEM_SHIFT)) >> 1;
-}
-
#ifdef _USE_MZ80
// memhandlers for mz80 core
#endif
#ifdef _USE_DRZ80
-
struct DrZ80 drZ80;
-
-static unsigned int DrZ80_rebasePC(unsigned short a)
-{
- drZ80.Z80PC_BASE = (unsigned int) Pico.zram;
- return drZ80.Z80PC_BASE + a;
-}
-
-static unsigned int DrZ80_rebaseSP(unsigned short a)
-{
- drZ80.Z80SP_BASE = (unsigned int) Pico.zram;
- return drZ80.Z80SP_BASE + a;
-}
#endif
#endif
#ifdef _USE_DRZ80
memset(&drZ80, 0, sizeof(drZ80));
- drZ80.z80_rebasePC=DrZ80_rebasePC;
- drZ80.z80_rebaseSP=DrZ80_rebaseSP;
+ drZ80.z80_rebasePC=NULL; // unused, handled by xmap
+ drZ80.z80_rebaseSP=NULL;
drZ80.z80_read8 =(void *)z80_read_map;
drZ80.z80_read16 =NULL;
drZ80.z80_write8 =(void *)z80_write_map;
drZ80.Z80IY = 0xFFFF << 16;
drZ80.Z80IM = 0; // 1?
drZ80.z80irqvector = 0xff0000; // RST 38h
- drZ80.Z80PC = drZ80.z80_rebasePC(0);
- drZ80.Z80SP = drZ80.z80_rebaseSP(0x2000); // 0xf000 ?
+ drZ80.Z80PC_BASE = drZ80.Z80PC = z80_read_map[0] << 1;
+ // drZ80 is locked in single bank
+ drZ80.Z80SP_BASE = ((PicoAHW & PAHW_SMS) ?
+ z80_read_map[0xc000 >> Z80_MEM_SHIFT] : z80_read_map[0]) << 1;
+// drZ80.Z80SP = drZ80.z80_rebaseSP(0x2000); // 0xf000 ?
#endif
#ifdef _USE_CZ80
Cz80_Reset(&CZ80);
Cz80_Set_Reg(&CZ80, CZ80_IY, 0xffff);
Cz80_Set_Reg(&CZ80, CZ80_SP, 0x2000);
#endif
- Pico.m.z80_fakeval = 0; // for faking when Z80 is disabled
}
+// XXX TODO: should better use universal z80 save format
PICO_INTERNAL void z80_pack(unsigned char *data)
{
#if defined(_USE_MZ80)
memcpy(data+4, &mz80.z80clockticks, sizeof(mz80)-5*4); // don't save base&memhandlers
#elif defined(_USE_DRZ80)
*(int *)data = 0x015A7244; // "DrZ" v1
- drZ80.Z80PC = drZ80.z80_rebasePC(drZ80.Z80PC-drZ80.Z80PC_BASE);
- drZ80.Z80SP = drZ80.z80_rebaseSP(drZ80.Z80SP-drZ80.Z80SP_BASE);
+// drZ80.Z80PC = drZ80.z80_rebasePC(drZ80.Z80PC-drZ80.Z80PC_BASE);
+// drZ80.Z80SP = drZ80.z80_rebaseSP(drZ80.Z80SP-drZ80.Z80SP_BASE);
memcpy(data+4, &drZ80, 0x54);
#elif defined(_USE_CZ80)
*(int *)data = 0x00007a43; // "Cz"
}
#elif defined(_USE_DRZ80)
if (*(int *)data == 0x015A7244) { // "DrZ" v1 save?
+ int pc, sp;
memcpy(&drZ80, data+4, 0x54);
+ pc = (drZ80.Z80PC - drZ80.Z80PC_BASE) & 0xffff;
+ sp = (drZ80.Z80SP - drZ80.Z80SP_BASE) & 0xffff;
// update bases
- drZ80.Z80PC = drZ80.z80_rebasePC(drZ80.Z80PC-drZ80.Z80PC_BASE);
- drZ80.Z80SP = drZ80.z80_rebaseSP(drZ80.Z80SP-drZ80.Z80SP_BASE);
+ drZ80.Z80PC_BASE = z80_read_map[pc >> Z80_MEM_SHIFT];
+ if (drZ80.Z80PC & (1<<31)) {
+ elprintf(EL_STATUS|EL_ANOMALY, "bad PC in z80 save: %04x", pc);
+ drZ80.Z80PC_BASE = drZ80.Z80PC = z80_read_map[0];
+ } else {
+ drZ80.Z80PC_BASE <<= 1;
+ drZ80.Z80PC = drZ80.Z80PC_BASE + pc;
+ }
+ drZ80.Z80SP_BASE = z80_read_map[sp >> Z80_MEM_SHIFT];
+ if (drZ80.Z80SP & (1<<31)) {
+ elprintf(EL_STATUS|EL_ANOMALY, "bad SP in z80 save: %04x", sp);
+ drZ80.Z80SP_BASE = z80_read_map[0];
+ drZ80.Z80SP = drZ80.Z80SP_BASE + (1 << Z80_MEM_SHIFT);
+ } else {
+ drZ80.Z80SP_BASE <<= 1;
+ drZ80.Z80SP = drZ80.Z80SP_BASE + sp;
+ }
} else {
z80_reset();
drZ80.Z80IM = 1;