# HG changeset patch
# User Mike Pavone <pavone@retrodev.com>
# Date 1367301525 25200
# Node ID ce7ce2b9c2df8e3db850a0f8749e11bfb9fa8905
# Parent  572b935dd03020bcecc5ccaef961501616df4061
Fix decoding of address in JP and JPCC instructions in the Z80 core

diff -r 572b935dd030 -r ce7ce2b9c2df z80inst.c
--- a/z80inst.c	Mon Apr 29 22:52:05 2013 -0700
+++ b/z80inst.c	Mon Apr 29 22:58:45 2013 -0700
@@ -1249,7 +1249,7 @@
 	}
 	if ((decoded->addr_mode & 0x1F) == Z80_IMMED && decoded->op != Z80_RST && decoded->op != Z80_IM) {
 		decoded->immed = *(++istream);
-		if ((decoded->reg >= Z80_BC && decoded->reg < Z80_UNUSED) || decoded->op == Z80_CALL || decoded->op == Z80_CALLCC) {
+		if ((decoded->reg >= Z80_BC && decoded->reg < Z80_UNUSED) || decoded->op == Z80_CALL || decoded->op == Z80_CALLCC || decoded->op == Z80_JP || decoded->op == Z80_JPCC) {
 			decoded->immed |= *(++istream) << 8;
 		} else if (decoded->immed & 0x80) {
 			decoded->immed |= 0xFF00;