From dd55e25ba32d790eb37e173e6a2b0b59fae143b7 Mon Sep 17 00:00:00 2001
From: Toni Wilen <twilen@winuae.net>
Date: Wed, 18 Apr 2018 17:43:57 +0300
Subject: [PATCH] Fix MOVE16 disassembly.

---
 newcpu.cpp | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/newcpu.cpp b/newcpu.cpp
index 8bbef03c..6b1f909e 100644
--- a/newcpu.cpp
+++ b/newcpu.cpp
@@ -7573,6 +7573,31 @@ void m68k_disasm_2 (TCHAR *buf, int bufsize, uaecptr pc, uaecptr *nextpc, int cn
 				TCHAR *p = instrname + _tcslen(instrname);
 				_stprintf(p, _T(",(A%d)"), opcode & 7);
 			}
+		} else if (lookup->mnemo == i_MOVE16) {
+			TCHAR *p = instrname + _tcslen(instrname);
+			if (opcode & 0x20) {
+				_stprintf(p, _T("(A%d)+,(A%d)+"), opcode & 7, (extra >> 12) & 7);
+				pc += 2;
+			} else {
+				uae_u32 addr = get_long_debug(pc + 2);
+				int ay = opcode & 7;
+				pc += 4;
+				switch ((opcode >> 3) & 3)
+				{
+				case 0:
+					_stprintf(p, _T("(A%d)+,$%08x"), ay, addr);
+					break;
+				case 1:
+					_stprintf(p, _T("$%08x,(A%d)+"), addr, ay);
+					break;
+				case 2:
+					_stprintf(p, _T("(A%d),$%08x"), ay, addr);
+					break;
+				case 3:
+					_stprintf(p, _T("$%08x,(A%d)"), addr, ay);
+					break;
+				}
+			}
 		} else if (lookup->mnemo == i_FPP) {
 			TCHAR *p;
 			int ins = extra & 0x3f;
-- 
2.47.3