github.com/mikpe.pdp10-tools
1
0
Fork 0
mirror of https://github.com/mikpe/pdp10-tools.git synced 2026-01-22 18:42:34 +00:00
Code Issues Projects Releases Wiki Activity

sim: sim_boolean: handle ANDCM, add unit test

Browse Source
This commit is contained in:
Mikael Pettersson 2020-07-23 21:55:07 +02:00
parent 75f6823d59
commit 22ae9e1dc6
3 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
erlang/apps/sim/src/sim_boolean.erl
View File

@ -30,6 +30,7 @@
, handle_ANDCAB/4
, handle_ANDCAI/4
, handle_ANDCAM/4
, handle_ANDCM/4
, handle_ANDI/4
, handle_ANDM/4
, handle_SETMB/4
@ -233,6 +234,22 @@ handle_SETMB(Core, Mem, IR, EA) ->
fun(Core1, Mem1) -> handle_SETMB(Core1, Mem1, IR, EA) end)
end.
%% ANDCM - And Complement of Memory with AC
-spec handle_ANDCM(#core{}, sim_mem:mem(), IR :: word(), #ea{})
-> {#core{}, sim_mem:mem(), {ok, integer()} | {error, {module(), term()}}}.
handle_ANDCM(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 = CA band bnot CE,
sim_core:next_pc(sim_core:set_ac(Core, AC, Word), Mem);
{error, Reason} ->
sim_core:page_fault(Core, Mem, ea_address(EA), read, Reason,
fun(Core1, Mem1) -> handle_ANDCM(Core1, Mem1, IR, EA) end)
end.
%% Miscellaneous ===============================================================
ea_address(#ea{section = Section, offset = Offset}) ->

1
erlang/apps/sim/src/sim_core.erl
View File

@ -269,6 +269,7 @@ dispatch(Core, Mem, IR, EA) ->
8#415 -> sim_boolean:handle_SETMI(Core, Mem, IR, EA); % SETMI = MOVEI in section 0, XMOVEI elsewhere
8#416 -> sim_boolean:handle_SETMM(Core, Mem, IR, EA);
8#417 -> sim_boolean:handle_SETMB(Core, Mem, IR, EA);
8#420 -> sim_boolean:handle_ANDCM(Core, Mem, IR, EA);
_ ->
PC = (Core#core.pc_section bsl 18) bor Core#core.pc_offset,
{Core, Mem, {error, {?MODULE, {dispatch, PC, IR, EA}}}}

14
erlang/apps/sim/test/sim_boolean_tests.erl
View File

@ -60,6 +60,7 @@
-define(OP_XMOVEI, ?OP_SETMI).
-define(OP_SETMM, 8#416).
-define(OP_SETMB, 8#417).
-define(OP_ANDCM, 8#420).
%% 2.4 Boolean Functions =======================================================
@ -284,6 +285,19 @@ setmb_test() ->
, {#ea{section = 1, offset = 0, islocal = false}, 8#42} % AC0 = 42
]).
%% ANDCM - And Complement of Memory with AC
andcm_test() ->
Prog =
[ {1, 8#100, ?INSN(?OP_MOVEI, 1, 0, 0, 8#333333)} % 1,,100/ MOVEI 1,333333
, {1, 8#101, ?INSN(?OP_ANDCM, 1, 0, 0, 8#200)} % 1,,101/ ANDCM 1,200
, {1, 8#102, ?INSN_INVALID} % 1,,102/ <invalid>
, {1, 8#200, ?COMMA2(0, 8#707070)} % 1,,200/ 0,,707070
],
expect(Prog, [], {1, 8#102}, ?DEFAULT_FLAGS,
[ {#ea{section = 1, offset = 1, islocal = false}, ?COMMA2(0, 8#030303)} % AC1 = 0,,030303
]).
%% Common code to run short sequences ==========================================
expect(Prog, ACs, ExpectedPC, ExpectedFlags, ExpectedEs) ->