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

Add loop operator in fcode #889

Open
zxq9 wants to merge 27 commits from loop-op into master
pull from: loop-op
merge into: QPQ-AG:master
Conversation 3 Commits 27 Files Changed 2 +5 -4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5c14fc3fe6 - Show all commits

9
src/aeso_fcode_to_fate.erl
View File

@ -376,14 +376,15 @@ to_scode1(Env, {loop, Init, It, Expr}) ->
ContRef = make_ref(), ContRef = make_ref(),
BreakRef = make_ref(), BreakRef = make_ref(),
{ItV, Env1} = bind_local(It, Env), {ItV, Env1} = bind_local(It, Env),
InitS = to_scode(notail(Env), Init) ++ [{jump, ContRef}], InitS = [to_scode(notail(Env), Init),
{jump, ContRef}],
ExprS = [aeb_fate_ops:store({var, ItV}, {stack, 0}), ExprS = [aeb_fate_ops:store({var, ItV}, {stack, 0}),
to_scode(bind_loop(ContRef, BreakRef, ItV, Env1), Expr), to_scode(bind_loop(ContRef, BreakRef, ItV, Env1), Expr),
{jump, BreakRef}], {jump, BreakRef}],
[{loop, InitS, It, ExprS, ContRef, BreakRef}]; [{loop, InitS, It, ExprS, ContRef, BreakRef}];
to_scode1(Env = #env{cont_ref = ContRef}, {continue, Expr}) -> to_scode1(Env = #env{cont_ref = ContRef}, {continue, Expr}) ->
ExprS = to_scode1(notail(Env), Expr), [to_scode1(notail(Env), Expr),
ExprS ++ [{jump, ContRef}]; {jump, ContRef}];
to_scode1(Env, {break, Expr}) -> to_scode1(Env, {break, Expr}) ->
to_scode1(Env, Expr); to_scode1(Env, Expr);
to_scode1(Env, {switch, Case}) -> to_scode1(Env, {switch, Case}) ->
@ -1727,7 +1728,6 @@ reorder_blocks(Ref, Code, Blocks, Acc) ->
[{'EXIT', _}|_] -> reorder_blocks(Blocks, Acc1); [{'EXIT', _}|_] -> reorder_blocks(Blocks, Acc1);
[{'ABORT', _}|_] -> reorder_blocks(Blocks, Acc1); [{'ABORT', _}|_] -> reorder_blocks(Blocks, Acc1);
[{switch, _, _}|_] -> reorder_blocks(Blocks, Acc1); [{switch, _, _}|_] -> reorder_blocks(Blocks, Acc1);
[{jumpif, _, _}|_] -> reorder_blocks(Blocks, Acc1);
[{jump, L}|_] -> [{jump, L}|_] ->
NotL = fun({L1, _}) -> L1 /= L end, NotL = fun({L1, _}) -> L1 /= L end,
case lists:splitwith(NotL, Blocks) of case lists:splitwith(NotL, Blocks) of
@ -1783,6 +1783,7 @@ tweak_returns(['RETURN', {'PUSH', A} | Code]) -> [{'RETURNR', A} | Code
tweak_returns(['RETURN' | Code = [{'CALL_T', _} | _]]) -> Code; tweak_returns(['RETURN' | Code = [{'CALL_T', _} | _]]) -> Code;
tweak_returns(['RETURN' | Code = [{'ABORT', _} | _]]) -> Code; tweak_returns(['RETURN' | Code = [{'ABORT', _} | _]]) -> Code;
tweak_returns(['RETURN' | Code = [{'EXIT', _} | _]]) -> Code; tweak_returns(['RETURN' | Code = [{'EXIT', _} | _]]) -> Code;
tweak_returns(['RETURN' | Code = [{jump, _} | _]]) -> Code;
tweak_returns(['RETURN' | Code = [loop | _]]) -> Code; tweak_returns(['RETURN' | Code = [loop | _]]) -> Code;
tweak_returns(Code) -> Code. tweak_returns(Code) -> Code.