From df0474f9c1859f3eaffde43de2dec70ffd16a76e Mon Sep 17 00:00:00 2001
From: Mikael Pettersson <mikpelinux@gmail.com>
Date: Fri, 24 Jul 2020 23:03:00 +0200
Subject: [PATCH] sim: sim_boolean: handle ANDCBI, add unit test

---
 erlang/apps/sim/src/sim_boolean.erl        |  9 +++++++++
 erlang/apps/sim/src/sim_core.erl           |  1 +
 erlang/apps/sim/test/sim_boolean_tests.erl | 11 +++++++++++
 3 files changed, 21 insertions(+)

diff --git a/erlang/apps/sim/src/sim_boolean.erl b/erlang/apps/sim/src/sim_boolean.erl
index 8dd1d14..5cccf69 100644
--- a/erlang/apps/sim/src/sim_boolean.erl
+++ b/erlang/apps/sim/src/sim_boolean.erl
@@ -31,6 +31,7 @@
         , handle_ANDCAI/4
         , handle_ANDCAM/4
         , handle_ANDCB/4
+        , handle_ANDCBI/4
         , handle_ANDCM/4
         , handle_ANDCMB/4
         , handle_ANDCMI/4
@@ -418,6 +419,14 @@ handle_ANDCB(Core, Mem, IR, EA) ->
                           fun(Core1, Mem1) -> handle_ANDCA(Core1, Mem1, IR, EA) end)
   end.
 
+-spec handle_ANDCBI(#core{}, sim_mem:mem(), IR :: word(), #ea{})
+      -> {#core{}, sim_mem:mem(), {ok, integer()} | {error, {module(), term()}}}.
+handle_ANDCBI(Core, Mem, IR, EA) ->
+  AC = IR band 8#17,
+  CA = sim_core:get_ac(Core, AC),
+  Word = ((bnot CA) band (bnot EA#ea.offset)) band ((1 bsl 36) - 1),
+  sim_core:next_pc(sim_core:set_ac(Core, AC, Word), Mem).
+
 %% Miscellaneous ===============================================================
 
 ea_address(#ea{section = Section, offset = Offset}) ->
diff --git a/erlang/apps/sim/src/sim_core.erl b/erlang/apps/sim/src/sim_core.erl
index fcf3e61..607def5 100644
--- a/erlang/apps/sim/src/sim_core.erl
+++ b/erlang/apps/sim/src/sim_core.erl
@@ -286,6 +286,7 @@ dispatch(Core, Mem, IR, EA) ->
     8#436 -> sim_boolean:handle_IORM(Core, Mem, IR, EA);
     8#437 -> sim_boolean:handle_IORB(Core, Mem, IR, EA);
     8#440 -> sim_boolean:handle_ANDCB(Core, Mem, IR, EA);
+    8#441 -> sim_boolean:handle_ANDCBI(Core, Mem, IR, EA);
     _ ->
       PC = (Core#core.pc_section bsl 18) bor Core#core.pc_offset,
       {Core, Mem, {error, {?MODULE, {dispatch, PC, IR, EA}}}}
diff --git a/erlang/apps/sim/test/sim_boolean_tests.erl b/erlang/apps/sim/test/sim_boolean_tests.erl
index 7bd4363..0866484 100644
--- a/erlang/apps/sim/test/sim_boolean_tests.erl
+++ b/erlang/apps/sim/test/sim_boolean_tests.erl
@@ -77,6 +77,7 @@
 -define(OP_IORM, 8#436).
 -define(OP_IORB, 8#437).
 -define(OP_ANDCB, 8#440).
+-define(OP_ANDCBI, 8#441).
 
 %% 2.4 Boolean Functions =======================================================
 
@@ -488,6 +489,16 @@ andcb_test() ->
          [ {#ea{section = 1, offset = 1, islocal = false}, ?COMMA2(-1, 0)} % AC1 = -1,,0
          ]).
 
+andcbi_test() ->
+  Prog =
+    [ {1, 8#100, ?INSN(?OP_MOVEI, 1, 0, 0, 8#707070)}  % 1,,100/ MOVEI 1,333333
+    , {1, 8#101, ?INSN(?OP_ANDCBI, 1, 0, 0, 8#070707)} % 1,,101/ ANDCBI 1,707070
+    , {1, 8#102, ?INSN_INVALID}                        % 1,,102/ <invalid>
+    ],
+  expect(Prog, [], {1, 8#102}, ?DEFAULT_FLAGS,
+         [ {#ea{section = 1, offset = 1, islocal = false}, ?COMMA2(-1, 0)} % AC1 = -1,,0
+         ]).
+
 %% Common code to run short sequences ==========================================
 
 expect(Prog, ACs, ExpectedPC, ExpectedFlags, ExpectedEs) ->