sim: sim_boolean: handle ANDCAM, add unit test

This commit is contained in:
Mikael Pettersson 2020-07-23 14:44:09 +02:00
parent 44b8bed409
commit 0da7e91bac
3 changed files with 28 additions and 0 deletions

View File

@ -28,6 +28,7 @@
, handle_ANDB/4
, handle_ANDCA/4
, handle_ANDCAI/4
, handle_ANDCAM/4
, handle_ANDI/4
, handle_ANDM/4
, handle_SETZ/4
@ -161,6 +162,20 @@ handle_ANDCAI(Core, Mem, IR, EA) ->
Word = EA#ea.offset band bnot CA,
sim_core:next_pc(sim_core:set_ac(Core, AC, Word), Mem).
-spec handle_ANDCAM(#core{}, sim_mem:mem(), IR :: word(), #ea{})
-> {#core{}, sim_mem:mem(), {ok, integer()} | {error, {module(), term()}}}.
handle_ANDCAM(Core, Mem, IR, EA) ->
case sim_core:c(Core, Mem, EA) of
{ok, CE} ->
AC = IR band 8#17,
CA = sim_core:get_ac(Core, AC),
Word = CE band bnot CA,
handle_ANDM_1(Core, Mem, EA, Word);
{error, Reason} ->
sim_core:page_fault(Core, Mem, ea_address(EA), read, Reason,
fun(Core1, Mem1) -> handle_ANDCAM(Core1, Mem1, IR, EA) end)
end.
%% Miscellaneous ===============================================================
ea_address(#ea{section = Section, offset = Offset}) ->

View File

@ -263,6 +263,7 @@ dispatch(Core, Mem, IR, EA) ->
8#407 -> sim_boolean:handle_ANDB(Core, Mem, IR, EA);
8#410 -> sim_boolean:handle_ANDCA(Core, Mem, IR, EA);
8#411 -> sim_boolean:handle_ANDCAI(Core, Mem, IR, EA);
8#412 -> sim_boolean:handle_ANDCAM(Core, Mem, IR, EA);
_ ->
PC = (Core#core.pc_section bsl 18) bor Core#core.pc_offset,
{Core, Mem, {error, {?MODULE, {dispatch, PC, IR, EA}}}}

View File

@ -53,6 +53,7 @@
-define(OP_ANDB, 8#407).
-define(OP_ANDCA, 8#410).
-define(OP_ANDCAI, 8#411).
-define(OP_ANDCAM, 8#412).
%% 2.4 Boolean Functions =======================================================
@ -169,6 +170,17 @@ andcai_test() ->
[ {#ea{section = 1, offset = 1, islocal = false}, 8#030303} % AC1 = 0,,030303
]).
andcam_test() ->
Prog =
[ {1, 8#100, ?INSN(?OP_MOVEI, 1, 0, 0, 8#707070)} % 1,,100/ MOVEI 1,707070
, {1, 8#101, ?INSN(?OP_ANDCAM, 1, 0, 0, 8#200)} % 1,,101/ ANDCAM 1,200
, {1, 8#102, ?INSN_INVALID} % 1,,102/ <invalid>
, {1, 8#200, ?COMMA2(-1, 8#333333)} % 1,,200/ -1,,333333
],
expect(Prog, [], {1, 8#102}, ?DEFAULT_FLAGS,
[ {#ea{section = 1, offset = 8#200, islocal = false}, ?COMMA2(-1, 8#030303)} % C(1,,200) = -1,,030303
]).
%% Common code to run short sequences ==========================================
expect(Prog, ACs, ExpectedPC, ExpectedFlags, ExpectedEs) ->