From 95495580cd30444775cd5adabc623f64f6efb88f Mon Sep 17 00:00:00 2001 From: Mikael Pettersson Date: Sat, 17 Oct 2020 16:32:57 +0200 Subject: [PATCH] sim_core: export calculate_ea/5 --- erlang/apps/sim/src/sim_core.erl | 8 ++++++++ erlang/rebar.config | 1 + 2 files changed, 9 insertions(+) diff --git a/erlang/apps/sim/src/sim_core.erl b/erlang/apps/sim/src/sim_core.erl index 5c6a63c..c351302 100644 --- a/erlang/apps/sim/src/sim_core.erl +++ b/erlang/apps/sim/src/sim_core.erl @@ -28,6 +28,7 @@ , run/2 , next_pc/2 , skip/2 + , calculate_ea/5 , page_fault/6 , c/3 , cset/4 @@ -142,6 +143,13 @@ insn_fetch2(Core, Mem, MB) -> calculate_ea(Core, Mem, MB, ESection, fun(Core1, Mem1, EA) -> dispatch(Core1, Mem1, IR, EA) end). +-spec calculate_ea(Core :: #core{}, + Mem :: sim_mem:mem(), + MB :: word(), + ESection :: word(), + Cont :: fun((#core{}, sim_mem:mem(), #ea{}) + -> {#core{}, sim_mem:mem(), {ok, integer()} | {error, {module(), term()}}})) + -> {#core{}, sim_mem:mem(), {ok, integer()} | {error, {module(), term()}}}. calculate_ea(Core, Mem, MB, ESection, Cont) -> local_format_address_word(Core, Mem, MB, ESection, Cont). diff --git a/erlang/rebar.config b/erlang/rebar.config index 46a72d3..b8e158e 100644 --- a/erlang/rebar.config +++ b/erlang/rebar.config @@ -71,6 +71,7 @@ %% actual unused exports , {pdp10_opcodes, cpu_device_from_name, 2} , {pdp10_opcodes, models_from_name, 1} + , {sim_core, calculate_ea, 5} ]}. {escript_emu_args, "%%! +sbtu +A1 +Bd -noshell -smp auto\n"}.