QPQ-AG/sophia
10
0
Fork 0
Code Issues 41 Pull Requests 5 Actions Packages Projects Releases 16 Wiki Activity

Rewrite for clarity and Dialyzer

Browse Source
This commit is contained in:
Tobias Lindahl 2019-05-23 09:21:08 +02:00
parent 30e3acfe94
commit fa2de31d79
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/aeso_fcode_to_fate.erl
View File

@ -112,7 +112,7 @@ compile(FCode, Options) ->
SFuns = functions_to_scode(ContractName, Functions, Options), SFuns = functions_to_scode(ContractName, Functions, Options),
SFuns1 = optimize_scode(SFuns, Options), SFuns1 = optimize_scode(SFuns, Options),
SFuns2 = add_default_init_function(SFuns1, StateType), SFuns2 = add_default_init_function(SFuns1, StateType),
FateCode = to_basic_blocks(SFuns2, aeb_fate_code:new(), Options), FateCode = to_basic_blocks(SFuns2),
debug(compile, Options, "~s\n", [aeb_fate_asm:pp(FateCode)]), debug(compile, Options, "~s\n", [aeb_fate_asm:pp(FateCode)]),
FateCode. FateCode.
@ -1178,13 +1178,16 @@ desugar(I) -> [I].
%% -- Phase III -------------------------------------------------------------- %% -- Phase III --------------------------------------------------------------
%% Constructing basic blocks %% Constructing basic blocks
to_basic_blocks(Funs, FateCode, Options) -> to_basic_blocks(Funs) ->
lists:foldl(fun({Name, {Sig, Code}}, Acc) -> to_basic_blocks(maps:to_list(Funs), aeb_fate_code:new()).
BB = bb(Name, Code ++ [aeb_fate_ops:return()], Options),
aeb_fate_code:insert_fun(Name, Sig, BB, Acc)
end, FateCode, maps:to_list(Funs)).
bb(_Name, Code, _Options) -> to_basic_blocks([{Name, {Sig, Code}}|Left], Acc) ->
BB = bb(Name, Code ++ [aeb_fate_ops:return()]),
to_basic_blocks(Left, aeb_fate_code:insert_fun(Name, Sig, BB, Acc));
to_basic_blocks([], Acc) ->
Acc.
bb(_Name, Code) ->
Blocks0 = blocks(Code), Blocks0 = blocks(Code),
Blocks1 = optimize_blocks(Blocks0), Blocks1 = optimize_blocks(Blocks0),
Blocks = lists:flatmap(fun split_calls/1, Blocks1), Blocks = lists:flatmap(fun split_calls/1, Blocks1),