From c1f0eed0a3d4a4002d50a5f9c2fb9adf55a3ff8a Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Wed, 26 Oct 2022 12:39:40 -0400
Subject: [PATCH] Decode MOVE from CCR.

---
 InstructionSets/M68k/Decoder.cpp     | 14 ++++++++++++++
 InstructionSets/M68k/Instruction.cpp |  1 +
 2 files changed, 15 insertions(+)

diff --git a/InstructionSets/M68k/Decoder.cpp b/InstructionSets/M68k/Decoder.cpp
index 83c3e55a5..3ac170c67 100644
--- a/InstructionSets/M68k/Decoder.cpp
+++ b/InstructionSets/M68k/Decoder.cpp
@@ -502,6 +502,11 @@ template <typename Predecoder<model>::OpT op> uint32_t Predecoder<model>::invali
 			return ~OneOperandMask<
 				Imm
 			>::value;
+
+		case OpT(Operation::MOVEfromCCR):
+			return ~OneOperandMask<
+				AlterableAddressingModesNoAn
+			>::value;
 	}
 
 	//
@@ -992,6 +997,12 @@ template <typename Predecoder<model>::OpT op, bool validate> Preinstruction Pred
 		//
 		case OpT(Operation::RTD):
 			return validated<op, validate>(AddressingMode::ImmediateData);
+
+		//
+		// MARK: MOVE from CCR.
+		//
+		case OpT(Operation::MOVEfromCCR):
+			return validated<op, validate>(combined_mode(ea_mode, ea_register), ea_register);
 	}
 
 	//
@@ -1357,6 +1368,9 @@ Preinstruction Predecoder<model>::decode4(uint16_t instruction) {
 		// 4-94 (p198)
 		case 0xc40:	DecodeReq(model >= Model::M68020, Op::DIVSl);
 
+		// 4-121 (p225)
+		case 0x2c0: DecodeReq(model >= Model::M68010, Op::MOVEfromCCR);
+
 		default:	break;
 	}
 
diff --git a/InstructionSets/M68k/Instruction.cpp b/InstructionSets/M68k/Instruction.cpp
index 1c76e97cc..588051ab9 100644
--- a/InstructionSets/M68k/Instruction.cpp
+++ b/InstructionSets/M68k/Instruction.cpp
@@ -102,6 +102,7 @@ const char *_to_string(Operation operation, bool is_quick) {
 		case Operation::MOVEtoSR:		return "MOVEtoSR";
 		case Operation::MOVEfromSR:		return "MOVEfromSR";
 		case Operation::MOVEtoCCR:		return "MOVEtoCCR";
+		case Operation::MOVEfromCCR:	return "MOVEfromCCR";
 		case Operation::MOVEtoUSP:		return "MOVEtoUSP";
 		case Operation::MOVEfromUSP:	return "MOVEfromUSP";