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

17
src/aeso_fcode_to_fate.erl
View File

@ -1706,8 +1706,8 @@ optimize_blocks(Blocks) ->
RBlocks = Rev(Blocks), RBlocks = Rev(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]),
RBlocks1 = reorder_blocks(RBlocks, []), RBlocks0 = [{Ref, crop_jumps(Code)} || {Ref, Code} <- RBlocks],
io:format("REORDERED ~p\n\n", [RBlocks1]), 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,12 +1787,19 @@ 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
crop_jumps(Code) ->
crop_jumps(Code, []).
crop_jumps([], Acc) ->
lists:reverse(Acc);
crop_jumps([I = {jump, _}|_], Acc) ->
lists:reverse([I|Acc]);
crop_jumps([I|Code], Acc) ->
crop_jumps(Code, [I|Acc]).
%% -- Split basic blocks at CALL instructions -- %% -- Split basic blocks at CALL instructions --
%% Calls can only return to a new basic block. Also splits at JUMPIF instructions. %% Calls can only return to a new basic block. Also splits at JUMPIF instructions.
split_calls({Ref, Code}) ->
split_calls(Ref, Code, [], []).
split_calls(Ref, [], Acc, Blocks) -> split_calls(Ref, [], Acc, Blocks) ->
lists:reverse([{Ref, lists:reverse(Acc)} | Blocks]); lists:reverse([{Ref, lists:reverse(Acc)} | Blocks]);
split_calls(Ref, [I | Code], Acc, Blocks) when element(1, I) == 'CALL'; split_calls(Ref, [I | Code], Acc, Blocks) when element(1, I) == 'CALL';