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 +4 -5
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 701a24553a - Show all commits

9
src/aeso_fcode_to_fate.erl
View File

@ -1703,11 +1703,10 @@ block(Blk = #blk{code = [I | Code]}, Acc, Blocks, BlockAcc) ->
optimize_blocks(Blocks) -> optimize_blocks(Blocks) ->
%% We need to look at the last instruction a lot, so reverse all blocks. %% We need to look at the last instruction a lot, so reverse all blocks.
Rev = fun(Bs) -> [ {Ref, lists:reverse(Code)} || {Ref, Code} <- Bs ] end, Rev = fun(Bs) -> [ {Ref, lists:reverse(Code)} || {Ref, Code} <- Bs ] end,
RBlocks = Rev(Blocks), RBlocks = [{Ref, crop_jumps(Code)} || {Ref, Code} <- Blocks],
RBlockMap = maps:from_list(RBlocks), RBlockMap = maps:from_list(RBlocks),
io:format("REORDERING ~p\n\n", [RBlocks]), io:format("REORDERING ~p\n\n", [RBlocks]),
RBlocks0 = [{Ref, crop_jumps(Code)} || {Ref, Code} <- RBlocks], RBlocks1 = reorder_blocks(RBlocks, []),
RBlocks1 = reorder_blocks(RBlocks0, []),
RBlocks2 = [ {Ref, inline_block(RBlockMap, Ref, Code)} || {Ref, Code} <- RBlocks1 ], RBlocks2 = [ {Ref, inline_block(RBlockMap, Ref, Code)} || {Ref, Code} <- RBlocks1 ],
RBlocks3 = shortcut_jump_chains(RBlocks2), RBlocks3 = shortcut_jump_chains(RBlocks2),
RBlocks4 = remove_dead_blocks(RBlocks3), RBlocks4 = remove_dead_blocks(RBlocks3),
@ -1787,9 +1786,9 @@ tweak_returns(['RETURN' | Code = [{'EXIT', _} | _]]) -> Code;
tweak_returns(['RETURN' | Code = [loop | _]]) -> Code; tweak_returns(['RETURN' | Code = [loop | _]]) -> Code;
tweak_returns(Code) -> Code. tweak_returns(Code) -> Code.
%% Remove instructions that appear after jumps %% Remove instructions that appear after jumps. Returns reversed code.
crop_jumps(Code) -> crop_jumps(Code) ->
crop_jumps(Code, []). crop_jumps(lists:reverse(Code), []).
crop_jumps([], Acc) -> crop_jumps([], Acc) ->
lists:reverse(Acc); lists:reverse(Acc);
crop_jumps([I = {jump, _}|_], Acc) -> crop_jumps([I = {jump, _}|_], Acc) ->