# HG changeset patch
# User Mike Pavone <pavone@retrodev.com>
# Date 1368149781 25200
# Node ID cf7ecda060c7a7f8192f7a13a1b1b8ff003140d1
# Parent  56fcbfb8767aeee60068a5048d389b7d1889f187
Properly handle instructions that use boty IYH and IYL

diff -r 56fcbfb8767a -r cf7ecda060c7 z80_to_x86.c
--- a/z80_to_x86.c	Thu May 09 00:33:06 2013 -0700
+++ b/z80_to_x86.c	Thu May 09 18:36:21 2013 -0700
@@ -73,8 +73,14 @@
 	} else {
 		ea->mode = MODE_REG_DIRECT;
 		if (inst->reg == Z80_IYH) {
-			ea->base = opts->regs[Z80_IYL];
-			dst = ror_ir(dst, 8, opts->regs[Z80_IY], SZ_W);
+			if ((inst->addr_mode & 0x1F) == Z80_REG && inst->ea_reg == Z80_IYL) {
+				dst = mov_rr(dst, opts->regs[Z80_IY], SCRATCH1, SZ_W);
+				dst = ror_ir(dst, 8, SCRATCH1, SZ_W);
+				ea->base = SCRATCH1;
+			} else {
+				ea->base = opts->regs[Z80_IYL];
+				dst = ror_ir(dst, 8, opts->regs[Z80_IY], SZ_W);
+			}
 		} else if(opts->regs[inst->reg] >= 0) {
 			ea->base = opts->regs[inst->reg];
 			if (ea->base >= AH && ea->base <= BH) {
@@ -103,7 +109,13 @@
 uint8_t * z80_save_reg(uint8_t * dst, z80inst * inst, x86_z80_options * opts)
 {
 	if (inst->reg == Z80_IYH) {
-		dst = ror_ir(dst, 8, opts->regs[Z80_IY], SZ_W);
+		if ((inst->addr_mode & 0x1F) == Z80_REG && inst->ea_reg == Z80_IYL) {
+			dst = ror_ir(dst, 8, opts->regs[Z80_IY], SZ_W);
+			dst = mov_rr(dst, SCRATCH1, opts->regs[Z80_IYL], SZ_B);
+			dst = ror_ir(dst, 8, opts->regs[Z80_IY], SZ_W);
+		} else {
+			dst = ror_ir(dst, 8, opts->regs[Z80_IY], SZ_W);
+		}
 	} else if (opts->regs[inst->reg] >= AH && opts->regs[inst->reg] <= BH) {
 		if ((inst->addr_mode & 0x1F) == Z80_REG) {
 			uint8_t other_reg = opts->regs[inst->ea_reg];
@@ -128,8 +140,14 @@
 	{
 	case Z80_REG:
 		if (inst->ea_reg == Z80_IYH) {
-			ea->base = opts->regs[Z80_IYL];
-			dst = ror_ir(dst, 8, opts->regs[Z80_IY], SZ_W);
+			if (inst->reg == Z80_IYL) {
+				dst = mov_rr(dst, opts->regs[Z80_IY], SCRATCH1, SZ_W);
+				dst = ror_ir(dst, 8, SCRATCH1, SZ_W);
+				ea->base = SCRATCH1;
+			} else {
+				ea->base = opts->regs[Z80_IYL];
+				dst = ror_ir(dst, 8, opts->regs[Z80_IY], SZ_W);
+			}
 		} else {
 			ea->base = opts->regs[inst->ea_reg];
 			if (ea->base >= AH && ea->base <= BH && inst->reg != Z80_UNUSED && inst->reg != Z80_USE_IMMED) {
@@ -222,7 +240,13 @@
 {
 	if ((inst->addr_mode & 0x1F) == Z80_REG) {
 		if (inst->ea_reg == Z80_IYH) {
-			dst = ror_ir(dst, 8, opts->regs[Z80_IY], SZ_W);
+			if (inst->reg == Z80_IYL) {
+				dst = ror_ir(dst, 8, opts->regs[Z80_IY], SZ_W);
+				dst = mov_rr(dst, SCRATCH1, opts->regs[Z80_IYL], SZ_B);
+				dst = ror_ir(dst, 8, opts->regs[Z80_IY], SZ_W);
+			} else {
+				dst = ror_ir(dst, 8, opts->regs[Z80_IY], SZ_W);
+			}
 		} else if (inst->reg != Z80_UNUSED && inst->reg != Z80_USE_IMMED && opts->regs[inst->ea_reg] >= AH && opts->regs[inst->ea_reg] <= BH) {
 			uint8_t other_reg = opts->regs[inst->reg];
 			if (other_reg >= R8 || (other_reg >= RSP && other_reg <= RDI)) {