sim: sim_boolean: handle SETCMM, add unit test

This commit is contained in:
Mikael Pettersson 2020-07-25 17:06:53 +02:00
parent 55f87673e3
commit bb51e0852e
3 changed files with 25 additions and 0 deletions

View File

@ -57,6 +57,7 @@
, handle_SETCAM/4
, handle_SETCM/4
, handle_SETCMI/4
, handle_SETCMM/4
, handle_SETMB/4
, handle_SETMI/4
, handle_SETMM/4
@ -622,6 +623,18 @@ handle_SETCMI(Core, Mem, IR, EA) ->
Word = (bnot EA#ea.offset) band ((1 bsl 36) - 1),
sim_core:next_pc(sim_core:set_ac(Core, AC, Word), Mem).
-spec handle_SETCMM(#core{}, sim_mem:mem(), IR :: word(), #ea{})
-> {#core{}, sim_mem:mem(), {ok, integer()} | {error, {module(), term()}}}.
handle_SETCMM(Core, Mem, IR, EA) ->
case sim_core:c(Core, Mem, EA) of
{ok, CE} ->
Word = (bnot CE) band ((1 bsl 36) - 1),
handle_ANDM_1(Core, Mem, EA, Word);
{error, Reason} ->
sim_core:page_fault(Core, Mem, ea_address(EA), read, Reason,
fun(Core1, Mem1) -> handle_SETCMM(Core1, Mem1, IR, EA) end)
end.
%% Miscellaneous ===============================================================
ea_address(#ea{section = Section, offset = Offset}) ->

View File

@ -303,6 +303,7 @@ dispatch(Core, Mem, IR, EA) ->
8#457 -> sim_boolean:handle_ORCAB(Core, Mem, IR, EA);
8#460 -> sim_boolean:handle_SETCM(Core, Mem, IR, EA);
8#461 -> sim_boolean:handle_SETCMI(Core, Mem, IR, EA);
8#462 -> sim_boolean:handle_SETCMM(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

@ -94,6 +94,7 @@
-define(OP_ORCAB, 8#457).
-define(OP_SETCM, 8#460).
-define(OP_SETCMI, 8#461).
-define(OP_SETCMM, 8#462).
%% 2.4 Boolean Functions =======================================================
@ -696,6 +697,16 @@ setcmi_test() ->
[ {#ea{section = 1, offset = 1, islocal = false}, ?COMMA2(-1, 8#070707)} % AC1 = -1,,070707
]).
setcmm_test() ->
Prog =
[ {1, 8#100, ?INSN(?OP_SETCMM, 1, 0, 0, 8#200)} % 1,,100/ SETCMM 1,200
, {1, 8#101, ?INSN_INVALID} % 1,,101/ <invalid>
, {1, 8#200, ?COMMA2(0, 8#707070)} % 1,,200/ 0,,707070
],
expect(Prog, [], {1, 8#101}, ?DEFAULT_FLAGS,
[ {#ea{section = 1, offset = 8#200, islocal = false}, ?COMMA2(-1, 8#070707)} % C(1,,200) = -1,,070707
]).
%% Common code to run short sequences ==========================================
expect(Prog, ACs, ExpectedPC, ExpectedFlags, ExpectedEs) ->