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

Use new adt for fate code

Browse Source
This commit is contained in:
Tobias Lindahl 2019-05-21 17:59:05 +02:00
parent 53a5c70994
commit 4f4cf0eaa9
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/aeso_fcode_to_fate.erl
View File

@ -111,13 +111,13 @@ compile(FCode, Options) ->
functions := Functions } = FCode, functions := Functions } = FCode,
SFuns = functions_to_scode(ContractName, Functions, Options), SFuns = functions_to_scode(ContractName, Functions, Options),
SFuns1 = optimize_scode(SFuns, Options), SFuns1 = optimize_scode(SFuns, Options),
BBFuns = to_basic_blocks(SFuns1, Options), FateCode = to_basic_blocks(SFuns1, aeb_fate_code:new(), Options),
FateCode = #{ functions => BBFuns,
symbols => #{},
annotations => #{} },
debug(compile, Options, "~s\n", [aeb_fate_asm:pp(FateCode)]), debug(compile, Options, "~s\n", [aeb_fate_asm:pp(FateCode)]),
FateCode. FateCode.
make_function_id(X) ->
aeb_fate_code:symbol_identifier(make_function_name(X)).
make_function_name(init) -> <<"init">>; make_function_name(init) -> <<"init">>;
make_function_name({entrypoint, Name}) -> Name; make_function_name({entrypoint, Name}) -> Name;
make_function_name({local_fun, Xs}) -> list_to_binary("." ++ string:join(Xs, ".")). make_function_name({local_fun, Xs}) -> list_to_binary("." ++ string:join(Xs, ".")).
@ -225,7 +225,7 @@ to_scode(Env, {'let', X, Expr, Body}) ->
to_scode(Env1, Body) ]; to_scode(Env1, Body) ];
to_scode(Env, {def, Fun, Args}) -> to_scode(Env, {def, Fun, Args}) ->
FName = make_function_name(Fun), FName = make_function_id(Fun),
Lbl = aeb_fate_data:make_string(FName), Lbl = aeb_fate_data:make_string(FName),
call_to_scode(Env, local_call(Env, ?i(Lbl)), Args); call_to_scode(Env, local_call(Env, ?i(Lbl)), Args);
to_scode(Env, {funcall, Fun, Args}) -> to_scode(Env, {funcall, Fun, Args}) ->
@ -236,7 +236,7 @@ to_scode(Env, {builtin, B, Args}) ->
to_scode(Env, {remote, Ct, Fun, [{builtin, call_gas_left, _}, Value | Args]}) -> to_scode(Env, {remote, Ct, Fun, [{builtin, call_gas_left, _}, Value | Args]}) ->
%% Gas is not limited. %% Gas is not limited.
Lbl = make_function_name(Fun), Lbl = make_function_id(Fun),
Call = if Env#env.tailpos -> aeb_fate_ops:call_tr(?a, Lbl, ?a); Call = if Env#env.tailpos -> aeb_fate_ops:call_tr(?a, Lbl, ?a);
true -> aeb_fate_ops:call_r(?a, Lbl, ?a) true -> aeb_fate_ops:call_r(?a, Lbl, ?a)
end, end,
@ -244,14 +244,14 @@ to_scode(Env, {remote, Ct, Fun, [{builtin, call_gas_left, _}, Value | Args]}) ->
to_scode(Env, {remote, Ct, Fun, [Gas, Value | Args]}) -> to_scode(Env, {remote, Ct, Fun, [Gas, Value | Args]}) ->
%% Gas is limited. %% Gas is limited.
Lbl = make_function_name(Fun), Lbl = make_function_id(Fun),
Call = if Env#env.tailpos -> aeb_fate_ops:call_gtr(?a, Lbl, ?a, ?a); Call = if Env#env.tailpos -> aeb_fate_ops:call_gtr(?a, Lbl, ?a, ?a);
true -> aeb_fate_ops:call_gr(?a, Lbl, ?a, ?a) true -> aeb_fate_ops:call_gr(?a, Lbl, ?a, ?a)
end, end,
call_to_scode(Env, Call, [Ct, Value, Gas | Args]); call_to_scode(Env, Call, [Ct, Value, Gas | Args]);
to_scode(Env, {closure, Fun, FVs}) -> to_scode(Env, {closure, Fun, FVs}) ->
to_scode(Env, {tuple, [{lit, {string, make_function_name(Fun)}}, FVs]}); to_scode(Env, {tuple, [{lit, {string, make_function_id(Fun)}}, FVs]});
to_scode(Env, {switch, Case}) -> to_scode(Env, {switch, Case}) ->
split_to_scode(Env, Case). split_to_scode(Env, Case).
@ -1163,10 +1163,11 @@ desugar(I) -> [I].
%% -- Phase III -------------------------------------------------------------- %% -- Phase III --------------------------------------------------------------
%% Constructing basic blocks %% Constructing basic blocks
to_basic_blocks(Funs, Options) -> to_basic_blocks(Funs, FateCode, Options) ->
maps:from_list([ {Name, {{Args, Res}, lists:foldl(fun({Name, {Sig, Code}}, Acc) ->
bb(Name, Code ++ [aeb_fate_code:return()], Options)}} BB = bb(Name, Code ++ [aeb_fate_ops:return()], Options),
|| {Name, {{Args, Res}, Code}} <- maps:to_list(Funs) ]). aeb_fate_code:insert_fun(Name, Sig, BB, Acc)
end, FateCode, maps:to_list(Funs)).
bb(_Name, Code, _Options) -> bb(_Name, Code, _Options) ->
Blocks0 = blocks(Code), Blocks0 = blocks(Code),