From 458ae07fcde77592e06927f0dddcd12c8d242b29 Mon Sep 17 00:00:00 2001 From: Ian C Date: Fri, 25 Aug 2006 23:28:49 +0000 Subject: Devolopment checkin. Compiles, but doesn't pass tests. --- z80.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'z80.c') diff --git a/z80.c b/z80.c index 0b74bf5..6986c96 100644 --- a/z80.c +++ b/z80.c @@ -157,10 +157,10 @@ void Z80Reset(Z80 *cpu) cpu->BC.w=0xffff; cpu->DE.w=0xffff; cpu->HL.w=0xffff; - cpu->AF_.w=0xffff; - cpu->BC_.w=0xffff; - cpu->DE_.w=0xffff; - cpu->HL_.w=0xffff; + cpu->AF_=0xffff; + cpu->BC_=0xffff; + cpu->DE_=0xffff; + cpu->HL_=0xffff; cpu->IX.w=0xffff; cpu->IY.w=0xffff; @@ -228,8 +228,6 @@ int Z80SingleStep(Z80 *cpu) { cpu->last_cb=TRUE; cpu->shift=0; - cpu->use_cb_off=FALSE; - cpu->cb_off=0; Z80_CheckInterrupt(cpu); @@ -258,10 +256,10 @@ void Z80GetState(Z80 *cpu, Z80State *state) state->DE = cpu->DE.w; state->HL = cpu->HL.w; - state->AF_ = cpu->AF_.w; - state->BC_ = cpu->BC_.w; - state->DE_ = cpu->DE_.w; - state->HL_ = cpu->HL_.w; + state->AF_ = cpu->AF_; + state->BC_ = cpu->BC_; + state->DE_ = cpu->DE_; + state->HL_ = cpu->HL_; state->IX = cpu->IX.w; state->IY = cpu->IY.w; @@ -286,10 +284,10 @@ void Z80SetState(Z80 *cpu, const Z80State *state) cpu->DE.w = state->DE; cpu->HL.w = state->HL; - cpu->AF_.w = state->AF_; - cpu->BC_.w = state->BC_; - cpu->DE_.w = state->DE_; - cpu->HL_.w = state->HL_; + cpu->AF_ = state->AF_; + cpu->BC_ = state->BC_; + cpu->DE_ = state->DE_; + cpu->HL_ = state->HL_; cpu->IX.w = state->IX; cpu->IY.w = state->IY; -- cgit v1.2.3