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

Revert "Add DBG_CALL and DBG_RETURN"

Browse Source 
This reverts commit c406c6feb09b6a5bb859c38d634f08208c901e5a.
This commit is contained in:
Gaith Hallak 2023-03-17 18:11:53 +03:00
parent 7e3d8ea102
commit 61ffa8f849
3 changed files with 13 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rebar.config
View File

@ -2,7 +2,7 @@
{erl_opts, [debug_info]}.
{deps, [ {aebytecode, {git, "https://github.com/aeternity/aebytecode.git", {ref, "a620c9c"}}}
{deps, [ {aebytecode, {git, "https://github.com/aeternity/aebytecode.git", {ref, "69a1c41"}}}
, {getopt, "1.0.1"}
, {eblake2, "1.0.0"}
, {jsx, {git, "https://github.com/talentdeficit/jsx.git", {tag, "2.8.0"}}}

2
rebar.lock
View File

@ -1,7 +1,7 @@
{"1.2.0",
[{<<"aebytecode">>,
{git,"https://github.com/aeternity/aebytecode.git",
{ref,"a620c9c34b1c0ace77253ec0eabe6ac0b8e77ad2"}},
{ref,"69a1c41a4fc31c6449bf077532c22de23f2bbe83"}},
0},
{<<"aeserialization">>,
{git,"https://github.com/aeternity/aeserialization.git",

47
src/aeso_fcode_to_fate.erl
View File

@ -96,7 +96,6 @@ make_function_id(X) ->
aeb_fate_code:symbol_identifier(make_function_name(X)).
make_function_name(event) -> <<"Chain.event">>;
make_function_name(lambda) -> <<"?lambda">>;
make_function_name({entrypoint, Name}) -> Name;
make_function_name({local_fun, Xs}) -> list_to_binary("." ++ string:join(Xs, ".")).
@ -354,21 +353,18 @@ to_scode1(Env = #env{ current_function = Fun, tailpos = true }, {def, Ann, Fun,
aeb_fate_ops:store({var, I}, ?a)],
{[I | Is], Acc1, Env2}
end, {[], [], Env}, Args),
SCode = [ dbg_loc(Env, Ann),
[ dbg_loc(Env, Ann),
Code,
[ aeb_fate_ops:store({arg, I}, {var, J})
|| {I, J} <- lists:zip(lists:seq(0, length(Vars) - 1),
lists:reverse(Vars)) ],
loop ],
dbg_call_return(Env, dbg_call(Fun, true), SCode);
loop ];
to_scode1(Env, {def, Ann, Fun, Args}) ->
FName = make_function_id(Fun),
Lbl = aeb_fate_data:make_string(FName),
SCode = call_to_scode(Env, local_call(Env, ?i(Lbl)), Args),
[ dbg_loc(Env, Ann) | dbg_call_return(Env, dbg_call(Fun, false), SCode) ];
[ dbg_loc(Env, Ann) | call_to_scode(Env, local_call(Env, ?i(Lbl)), Args) ];
to_scode1(Env, {funcall, Ann, Fun, Args}) ->
SCode = call_to_scode(Env, [to_scode(Env, Fun), local_call(Env, ?a)], Args),
[ dbg_loc(Env, Ann) | dbg_call_return(Env, dbg_call(lambda, false), SCode) ];
[ dbg_loc(Env, Ann) | call_to_scode(Env, [to_scode(Env, Fun), local_call(Env, ?a)], Args) ];
to_scode1(Env, {builtin, Ann, B, Args}) ->
[ dbg_loc(Env, Ann) | builtin_to_scode(Env, B, Args) ];
@ -395,7 +391,7 @@ to_scode1(Env, {remote, Ann, ArgsT, RetT, Ct, Fun, [Gas, Value, Protected | Args
Call = aeb_fate_ops:call_pgr(?a, Lbl, ArgType, RetType, ?a, ?a, ?a),
call_to_scode(Env, Call, [Ct, Value, Gas, Protected | Args])
end,
[ dbg_loc(Env, Ann) | dbg_call_return(Env, dbg_call_r(?a, Fun), SCode) ];
[ dbg_loc(Env, Ann) | SCode ];
to_scode1(Env, {get_state, Ann, Reg}) ->
[ dbg_loc(Env, Ann), push(?s(Reg)) ];
@ -784,16 +780,8 @@ dbg_undef(Undef, {switch, Arg, Type, Alts, Catch}) ->
NewCatch = dbg_undef(Undef, Catch),
NewSwitch = {switch, Arg, Type, NewAlts, NewCatch},
NewSwitch;
dbg_undef(Undef, []) ->
[Undef];
dbg_undef(Undef, SCode) when is_list(SCode) ->
FlatSCode = lists:flatten(SCode),
case lists:last(FlatSCode) of
'DBG_RETURN' ->
dbg_undef(Undef, lists:droplast(FlatSCode)) ++ ['DBG_RETURN'];
_ ->
lists:droplast(FlatSCode) ++ [dbg_undef(Undef, lists:last(FlatSCode))]
end;
lists:droplast(SCode) ++ [dbg_undef(Undef, lists:last(SCode))];
dbg_undef(Undef, SCode) when is_tuple(SCode); is_atom(SCode) ->
[Mnemonic | _] =
case is_tuple(SCode) of
@ -806,22 +794,6 @@ dbg_undef(Undef, SCode) when is_tuple(SCode); is_atom(SCode) ->
false -> [SCode, Undef]
end.
dbg_call_return(Env, Call, SCode) ->
case proplists:get_value(debug_info, Env#env.options, false) of
false -> SCode;
true ->
Flat = flatten(SCode),
lists:droplast(Flat) ++ [Call, lists:last(Flat), 'DBG_RETURN']
end.
dbg_call(Fun, IsTailCall) ->
Name = binary_to_list(make_function_name(Fun)),
[{'DBG_CALL', {immediate, Name}, {immediate, IsTailCall}}].
dbg_call_r(PK, Fun) ->
Name = binary_to_list(make_function_name(Fun)),
[{'DBG_CALL_R', PK, {immediate, Name}}].
%% -- Phase II ---------------------------------------------------------------
%% Optimize
@ -960,9 +932,6 @@ attributes(I) ->
{'DBG_LOC', _, _} -> Impure(none, []);
{'DBG_DEF', _, _} -> Impure(none, []);
{'DBG_UNDEF', _, _} -> Impure(none, []);
{'DBG_CALL', _, _} -> Impure(none, []);
{'DBG_CALL_R', _, _} -> Impure(none, []);
'DBG_RETURN' -> Impure(none, []);
{'RETURNR', A} -> Impure(pc, A);
{'CALL', A} -> Impure(?a, [A]);
{'CALL_R', A, _, B, C, D} -> Impure(?a, [A, B, C, D]);
@ -1905,9 +1874,7 @@ split_calls(Ref, [I | Code], Acc, Blocks) when element(1, I) == 'CALL';
element(1, I) == 'CREATE';
element(1, I) == 'CLONE';
element(1, I) == 'CLONE_G';
element(1, I) == 'jumpif';
element(1, I) == 'CALL_T' andalso Code =/= [];
I == loop andalso Code =/= [] ->
element(1, I) == 'jumpif' ->
split_calls(make_ref(), Code, [], [{Ref, lists:reverse([I | Acc])} | Blocks]);
split_calls(Ref, [{'ABORT', _} = I | _Code], Acc, Blocks) ->
lists:reverse([{Ref, lists:reverse([I | Acc])} | Blocks]);