From 97ce9c742df38b772b185b432536c8383334a2c5 Mon Sep 17 00:00:00 2001
From: Mikael Pettersson <mikpelinux@gmail.com>
Date: Thu, 16 Jul 2020 18:08:37 +0200
Subject: [PATCH] sim: sim_moves: handle MOVMM, add unit test

---
 erlang/apps/sim/src/sim_core.erl         |  1 +
 erlang/apps/sim/src/sim_moves.erl        |  9 +++++++++
 erlang/apps/sim/test/sim_moves_tests.erl | 12 ++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/erlang/apps/sim/src/sim_core.erl b/erlang/apps/sim/src/sim_core.erl
index 21a10ef..a360484 100644
--- a/erlang/apps/sim/src/sim_core.erl
+++ b/erlang/apps/sim/src/sim_core.erl
@@ -245,6 +245,7 @@ dispatch(Core, Mem, IR, EA) ->
     8#213 -> sim_moves:handle_MOVNS(Core, Mem, IR, EA);
     8#214 -> sim_moves:handle_MOVM(Core, Mem, IR, EA);
     8#215 -> sim_moves:handle_MOVEI(Core, Mem, IR, EA); % MOVMI = MOVEI
+    8#216 -> sim_moves:handle_MOVMM(Core, Mem, IR, EA);
     8#250 -> sim_moves:handle_EXCH(Core, Mem, IR, EA);
     _ ->
       PC = (Core#core.pc_section bsl 18) bor Core#core.pc_offset,
diff --git a/erlang/apps/sim/src/sim_moves.erl b/erlang/apps/sim/src/sim_moves.erl
index 3a8558e..8c63cb9 100644
--- a/erlang/apps/sim/src/sim_moves.erl
+++ b/erlang/apps/sim/src/sim_moves.erl
@@ -30,6 +30,7 @@
         , handle_MOVEM/4
         , handle_MOVES/4
         , handle_MOVM/4
+        , handle_MOVMM/4
         , handle_MOVN/4
         , handle_MOVNI/4
         , handle_MOVNM/4
@@ -247,6 +248,14 @@ handle_MOVM(Core, Mem, IR, EA) ->
                           fun(Core1, Mem1) -> handle_MOVM(Core1, Mem1, IR, EA) end)
   end.
 
+-spec handle_MOVMM(#core{}, sim_mem:mem(), IR :: word(), #ea{})
+      -> {#core{}, sim_mem:mem(), {ok, integer()} | {error, {module(), term()}}}.
+handle_MOVMM(Core, Mem, IR, EA) ->
+  AC = IR band 8#17,
+  CA = sim_core:get_ac(Core, AC),
+  {Magnitude, Flags} = magnitude(CA),
+  handle_MOVNM(Core, Mem, Magnitude, Flags, EA).
+
 %% Miscellaneous ===============================================================
 
 ea_address(#ea{section = Section, offset = Offset}) ->
diff --git a/erlang/apps/sim/test/sim_moves_tests.erl b/erlang/apps/sim/test/sim_moves_tests.erl
index acb5258..e57ecd3 100644
--- a/erlang/apps/sim/test/sim_moves_tests.erl
+++ b/erlang/apps/sim/test/sim_moves_tests.erl
@@ -57,6 +57,7 @@
 -define(OP_MOVNS, 8#213).
 -define(OP_MOVM, 8#214).
 -define(OP_MOVMI, 8#215).
+-define(OP_MOVMM, 8#216).
 -define(OP_EXCH, 8#250).
 
 %% 2.1.1 Exchange Instruction ==================================================
@@ -325,6 +326,17 @@ movmi_test() ->
          [ {#ea{section = 1, offset = 1, islocal = false}, 8#200} % AC1 = 200
          ]).
 
+movmm_test() ->
+  Prog =
+    [ {1, 8#100, ?INSN(?OP_MOVNI, 1, 0, 0, 8#42)}   % 1,,100/ MOVNI 1,42
+    , {1, 8#101, ?INSN(?OP_MOVMM, 1, 0, 0, 8#150)}  % 1,,101/ MOVMM 1,150
+    , {1, 8#102, ?INSN_INVALID}                     % 1,,102/ <invalid>
+    , {1, 8#150, 8#27}                              % 1,,150/ 0,,27
+    ],
+  expect(Prog, [], {1, 8#102}, ?DEFAULT_FLAGS,
+         [ {#ea{section = 1, offset = 8#150, islocal = false}, 8#42} % C(1,,150) = 42
+         ]).
+
 %% Common code to run short sequences ==========================================
 
 expect(Prog, ACs, ExpectedPC, ExpectedFlags, ExpectedEs) ->