# HG changeset patch
# User Michael Pavone <pavone@retrodev.com>
# Date 1489389838 25200
# Node ID 78416556ae0277219bd6323778321202bff9b14e
# Parent  2d8b9d40f5ea95cf2c5c8536fc7807d87b9410e3
Properly treat invalid addressing modes for PEA/LEA as invalid instructinos

diff -r 2d8b9d40f5ea -r 78416556ae02 68kinst.c
--- a/68kinst.c	Thu Mar 09 23:50:46 2017 -0800
+++ b/68kinst.c	Mon Mar 13 00:23:58 2017 -0700
@@ -656,7 +656,11 @@
 			decoded->dst.addr_mode = MODE_AREG;
 			decoded->dst.params.regs.pri = m68k_reg_quick_field(*istream);
 			istream = m68k_decode_op(istream, decoded->extra.size, &(decoded->src));
-			if (!istream || decoded->src.addr_mode == MODE_REG) {
+			if (
+				!istream || decoded->src.addr_mode == MODE_REG || decoded->src.addr_mode == MODE_AREG 
+				|| decoded->src.addr_mode == MODE_AREG_POSTINC || decoded->src.addr_mode == MODE_AREG_PREDEC
+				|| decoded->src.addr_mode == MODE_IMMEDIATE
+			) {
 				decoded->op = M68K_INVALID;
 				break;
 			}
@@ -844,7 +848,11 @@
 								decoded->op = M68K_PEA;
 								decoded->extra.size = OPSIZE_LONG;
 								istream = m68k_decode_op(istream, OPSIZE_LONG, &(decoded->src));
-								if (!istream) {
+								if (
+									!istream || decoded->src.addr_mode == MODE_REG || decoded->src.addr_mode == MODE_AREG 
+									|| decoded->src.addr_mode == MODE_AREG_POSTINC || decoded->src.addr_mode == MODE_AREG_PREDEC
+									|| decoded->src.addr_mode == MODE_IMMEDIATE
+								) {
 									decoded->op = M68K_INVALID;
 									break;
 								}