diff options
| author | Mike Pavone <pavone@retrodev.com> | 2013-04-30 01:00:10 -0700 |
|---|---|---|
| committer | Mike Pavone <pavone@retrodev.com> | 2013-04-30 01:00:10 -0700 |
| commit | 004b8612c6635467cf52f388087f9f0c57b80bba (patch) | |
| tree | 9757b3e6671a921f0a4508eb87a3e41fae3c4a72 | |
| parent | 9d39282488f497b490609cd3ac626c62a5dc222d (diff) | |
Implement LDIR and fix a bug in which context was not restored after a call to z80_handle_code_write
| -rw-r--r-- | z80_to_x86.c | 29 | ||||
| -rw-r--r-- | zruntime.S | 1 |
2 files changed, 27 insertions, 3 deletions
diff --git a/z80_to_x86.c b/z80_to_x86.c index f28c7b3..b5cf478 100644 --- a/z80_to_x86.c +++ b/z80_to_x86.c @@ -263,6 +263,7 @@ uint8_t * translate_z80inst(z80inst * inst, uint8_t * dst, z80_context * context x86_ea src_op, dst_op; uint8_t size; x86_z80_options *opts = context->options; + uint8_t * start = dst; dst = z80_check_cycles_int(dst, address); switch(inst->op) { @@ -424,9 +425,31 @@ uint8_t * translate_z80inst(z80inst * inst, uint8_t * dst, z80_context * context dst = mov_rdisp8r(dst, CONTEXT, zar_off(Z80_E), opts->regs[Z80_DE], SZ_W); dst = mov_rrdisp8(dst, SCRATCH1, CONTEXT, zar_off(Z80_E), SZ_W); break; - /*case Z80_LDI: - case Z80_LDIR: - case Z80_LDD: + //case Z80_LDI: + case Z80_LDIR: { + dst = zcycles(dst, 8); + dst = mov_rr(dst, opts->regs[Z80_HL], SCRATCH1, SZ_W); + dst = call(dst, (uint8_t *)z80_read_byte); + dst = mov_rr(dst, opts->regs[Z80_DE], SCRATCH2, SZ_W); + dst = call(dst, (uint8_t *)z80_read_byte); + dst = add_ir(dst, 1, opts->regs[Z80_DE], SZ_W); + dst = add_ir(dst, 1, opts->regs[Z80_HL], SZ_W); + + dst = sub_ir(dst, 1, opts->regs[Z80_BC], SZ_W); + uint8_t * cont = dst+1; + dst = jcc(dst, CC_Z, dst+2); + dst = zcycles(dst, 7); + //TODO: Figure out what the flag state should be here + //TODO: Figure out whether an interrupt can interrupt this + dst = jmp(dst, start); + *cont = dst - (cont + 1); + dst = zcycles(dst, 2); + //TODO: Implement half-carry + dst = mov_irdisp8(dst, 0, CONTEXT, zf_off(ZF_N), SZ_B); + dst = mov_irdisp8(dst, 0, CONTEXT, zf_off(ZF_PV), SZ_B); + break; + } + /*case Z80_LDD: case Z80_LDDR: case Z80_CPI: case Z80_CPIR: @@ -107,6 +107,7 @@ z80_write_ram: mov %r14d, %edi call z80_handle_code_write mov %rax, %rsi + call z80_load_context not_code: ret z80_write_bank: |