From 53b3d9cf9d52b35e891d88ff05ad6c084e5058c9 Mon Sep 17 00:00:00 2001
From: Thomas Harte <thomas.harte@gmail.com>
Date: Sun, 17 Mar 2019 14:34:16 -0400
Subject: [PATCH] Implements a few more MOVE variants, plus MOVEA.

---
 .../Implementation/68000Implementation.hpp    |  5 ++
 .../68000/Implementation/68000Storage.cpp     | 48 ++++++++++++++++---
 .../68000/Implementation/68000Storage.hpp     |  2 +
 3 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/Processors/68000/Implementation/68000Implementation.hpp b/Processors/68000/Implementation/68000Implementation.hpp
index bdf6e9a0d..ba31eea5f 100644
--- a/Processors/68000/Implementation/68000Implementation.hpp
+++ b/Processors/68000/Implementation/68000Implementation.hpp
@@ -161,6 +161,11 @@ template <class T, bool dtack_is_implicit> void Processor<T, dtack_is_implicit>:
 						active_program_->source->full -= 4;
 						active_program_->destination->full -= 4;
 					break;
+
+					case MicroOp::Action::SignExtendDestinationWord:
+						active_program_->destination->halves.high.full =
+							(active_program_->destination->halves.low.full & 0x8000) ? 0xffff : 0x0000;
+					break;
 				}
 
 				// If we've got to a micro-op that includes bus steps, break out of this loop.
diff --git a/Processors/68000/Implementation/68000Storage.cpp b/Processors/68000/Implementation/68000Storage.cpp
index 7c62920b1..98fec40f4 100644
--- a/Processors/68000/Implementation/68000Storage.cpp
+++ b/Processors/68000/Implementation/68000Storage.cpp
@@ -295,19 +295,53 @@ struct ProcessorStorageConstructor {
 							const int destination_mode = (instruction >> 6) & 7;
 							const int destination_register = (instruction >> 9) & 7;
 
-							if(!source_mode) {
-								storage_.instructions[instruction].source = &storage_.data_[source_register];
+							switch(source_mode) {
+								case 0:	// Dn
+									storage_.instructions[instruction].source = &storage_.data_[source_register];
+								break;
+
+								case 1:	// An
+									storage_.instructions[instruction].source = &storage_.address_[source_register];
+								break;
+
+								default: // (An), (An)+, -(An), (d16, An), (d8, An Xn), (xxx).W, (xxx).L
+									storage_.instructions[instruction].source = &storage_.bus_data_[0];
+								break;
 							}
 
 							if(!destination_mode) {
 								storage_.instructions[instruction].destination = &storage_.data_[destination_register];
 							}
 
-							// TODO: all other types of mode.
-							if(!destination_mode && !source_mode) {
-								storage_.all_micro_ops_.emplace_back(Action::PerformOperation, &arbitrary_base + assemble_program("np"));
-								storage_.all_micro_ops_.emplace_back();
-							} else {
+							const bool is_byte_access = mapping.operation == Operation::MOVEb;
+							const int both_modes = (source_mode << 4) | destination_mode;
+							switch(both_modes) {
+								case 0x00:	// MOVE Ds, Dd
+								case 0x10:	// MOVE As, Dd
+									storage_.all_micro_ops_.emplace_back(Action::PerformOperation, &arbitrary_base + assemble_program("np"));
+									storage_.all_micro_ops_.emplace_back();
+								break;
+
+								case 0x01:	// MOVEA Ds, Ad
+									if(is_byte_access) continue;
+
+									storage_.all_micro_ops_.emplace_back(Action::PerformOperation, &arbitrary_base + assemble_program("np"));
+									storage_.all_micro_ops_.emplace_back(
+										(mapping.operation == Operation::MOVEw) ? Action::SignExtendDestinationWord : Action::None
+									);
+								break;
+
+								case 0x20: // MOVE (As), Dd
+									if(mapping.operation == Operation::MOVEl) {
+										continue;
+									} else {
+										storage_.all_micro_ops_.emplace_back(Action::None, &arbitrary_base + assemble_program("nr np", { &storage_.address_[source_register].full }, !is_byte_access));
+										storage_.all_micro_ops_.emplace_back(Action::PerformOperation);
+									}
+								break;
+
+								default:
+									// TODO: all other types of mode.
 								continue;
 							}
 						} break;
diff --git a/Processors/68000/Implementation/68000Storage.hpp b/Processors/68000/Implementation/68000Storage.hpp
index 3f38974f8..602bc13d4 100644
--- a/Processors/68000/Implementation/68000Storage.hpp
+++ b/Processors/68000/Implementation/68000Storage.hpp
@@ -99,6 +99,8 @@ class ProcessorStorage {
 				PredecrementSourceAndDestination1,
 				PredecrementSourceAndDestination2,
 				PredecrementSourceAndDestination4,
+
+				SignExtendDestinationWord,
 			} action = Action::None;
 			BusStep *bus_program = nullptr;