+/*
+ * PicoDrive
+ * (C) notaz, 2007-2010
+ *
+ * This work is licensed under the terms of MAME license.
+ * See COPYING file in the top-level directory.
+ */
+
#include <stddef.h>
#include "pico_int.h"
#include "memory.h"
void z80_reset(void)
{
#ifdef _USE_DRZ80
- // FIXME: reset is not correct
- memset(&drZ80, 0, 0x54);
+ drZ80.Z80I = 0;
+ drZ80.Z80IM = 0;
+ drZ80.Z80IF = 0;
+ drZ80.z80irqvector = 0xff0000; // RST 38h
+ drZ80.Z80PC_BASE = drZ80.Z80PC = z80_read_map[0] << 1;
+ // others not changed, undefined on cold boot
+/*
drZ80.Z80F = (1<<2); // set ZFlag
drZ80.Z80F2 = (1<<2); // set ZFlag
drZ80.Z80IX = 0xFFFF << 16;
drZ80.Z80IY = 0xFFFF << 16;
- drZ80.Z80I = 0;
- drZ80.Z80IM = 0; // 1?
- drZ80.z80irqvector = 0xff0000; // RST 38h
- drZ80.Z80PC_BASE = drZ80.Z80PC = z80_read_map[0] << 1;
+*/
// drZ80 is locked in single bank
drz80_sp_base = (PicoAHW & PAHW_SMS) ? 0xc000 : 0x0000;
drZ80.Z80SP_BASE = z80_read_map[drz80_sp_base >> Z80_MEM_SHIFT] << 1;
if (PicoAHW & PAHW_SMS)
drZ80.Z80SP = drZ80.Z80SP_BASE + 0xdff0; // simulate BIOS
+ // XXX: since we use direct SP pointer, it might make sense to force it to RAM,
+ // but we'll rely on built-in stack protection for now
#endif
#ifdef _USE_CZ80
Cz80_Reset(&CZ80);
- Cz80_Set_Reg(&CZ80, CZ80_IX, 0xffff);
- Cz80_Set_Reg(&CZ80, CZ80_IY, 0xffff);
if (PicoAHW & PAHW_SMS)
Cz80_Set_Reg(&CZ80, CZ80_SP, 0xdff0);
#endif
}
#elif defined(_USE_CZ80)
if (*(int *)data == 0x00007a43) { // "Cz" save?
- memcpy(&CZ80, data+8, offsetof(cz80_struc, BasePC));
- Cz80_Set_Reg(&CZ80, CZ80_PC, *(int *)(data+4));
+ memcpy(&CZ80, (int*)data+8, offsetof(cz80_struc, BasePC));
+ Cz80_Set_Reg(&CZ80, CZ80_PC, *(int *)((int*)data+4));
return 0;
}
#endif
#define DRR16(n) (drZ80.Z80##n >> 16)
#define DRR16H(n) (drZ80.Z80##n >> 24)
#define DRR16L(n) ((drZ80.Z80##n >> 16) & 0xff)
- s->m.a = DRR8(A); s->m.f = DRR8(F);
+ s->m.a = DRR8(A); s->m.f = drZ80.Z80F;
s->m.b = DRR16H(BC); s->m.c = DRR16L(BC);
s->m.d = DRR16H(DE); s->m.e = DRR16L(DE);
s->m.h = DRR16H(HL); s->m.l = DRR16L(HL);
- s->a.a = DRR8(A2); s->a.f = DRR8(F2);
+ s->a.a = DRR8(A2); s->a.f = drZ80.Z80F2;
s->a.b = DRR16H(BC2); s->a.c = DRR16L(BC2);
s->a.d = DRR16H(DE2); s->a.e = DRR16L(DE2);
s->a.h = DRR16H(HL2); s->a.l = DRR16L(HL2);
#define DRW8(n, v) drZ80.Z80##n = (u32)(v) << 24
#define DRW16(n, v) drZ80.Z80##n = (u32)(v) << 16
#define DRW16HL(n, h, l) drZ80.Z80##n = ((u32)(h) << 24) | ((u32)(l) << 16)
- DRW8(A, s->m.a); DRW8(F, s->m.f);
+ DRW8(A, s->m.a); drZ80.Z80F = s->m.f;
DRW16HL(BC, s->m.b, s->m.c);
DRW16HL(DE, s->m.d, s->m.e);
DRW16HL(HL, s->m.h, s->m.l);
- DRW8(A2, s->a.a); DRW8(F2, s->a.f);
+ DRW8(A2, s->a.a); drZ80.Z80F2 = s->a.f;
DRW16HL(BC2, s->a.b, s->a.c);
DRW16HL(DE2, s->a.d, s->a.e);
DRW16HL(HL2, s->a.h, s->a.l);