Merge pull request #2679 from aeternity/fate-compiler-optimizations

Allow writing to FATE function argument
aeternity · Aug 22, 2019 · 7b852bc · 7b852bc
2 parents 40f495a + 3e80dad
commit 7b852bc
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/apps/aefate/src/aefa_fate.erl b/apps/aefate/src/aefa_fate.erl
@@ -42,7 +42,7 @@
 
 %% Memory handling.
 -export([ lookup_var/2
-        , store_var/3]).
+        , store_var/3 ]).
 
 %% Stack handling.
 -export([ dup/1
@@ -203,8 +203,6 @@ abort(bad_store_map_id, ES) ->
     ?t("Maps: Map does not exist", [], ES);
 abort({type_error, cons}, ES) ->
     ?t("Type error in cons: creating polymorphic list", [], ES);
-abort({cannot_write_to_arg, N}, ES) ->
-    ?t("Arguments are read only: ~p", [N], ES);
 abort({undefined_var, Var}, ES) ->
     ?t("Undefined var: ~p", [Var], ES);
 abort({bad_return_type, Val, Type}, ES) ->

diff --git a/apps/aefate/src/aefa_fate_op.erl b/apps/aefate/src/aefa_fate_op.erl
@@ -1405,8 +1405,8 @@ write({stack, 0}, Val, ES) ->
     aefa_engine_state:push_accumulator(Val, ES);
 write({var, _} = Name,  Val, ES) ->
     aefa_fate:store_var(Name, Val, ES);
-write({arg, N}, _, ES) ->
-    aefa_fate:abort({cannot_write_to_arg, N}, ES).
+write({arg, _} = Arg, Val, ES) ->
+    aefa_fate:store_var(Arg, Val, ES).
 
 
 %% ------------------------------------------------------

diff --git a/apps/aefate/test/aefa_sophia_test.erl b/apps/aefate/test/aefa_sophia_test.erl
@@ -77,13 +77,14 @@ compile_contract(Code, Options) ->
         {error, {type_errors, Err}}
     end.
 
+-define(CALL_GAS, 1000000).
 
 make_call_spec(Contract, Function0, Arguments) ->
     Function = aeb_fate_code:symbol_identifier(Function0),
     EncArgs  = list_to_tuple([aefate_test_utils:encode(A) || A <- Arguments]),
     Calldata = {tuple, {Function, {tuple, EncArgs}}},
     #{ contract => pad_contract_name(Contract),
-       gas      => 1000000,
+       gas      => ?CALL_GAS,
        value    => 0,
        call     => aeb_fate_encoding:serialize(Calldata),
        store    => aect_contracts_store:new() }.
@@ -104,11 +105,12 @@ run_call(Code, Fun, Args) ->
     Cache = compile_contracts([{<<"test">>, Code}]),
     case run(Cache, <<"test">>, list_to_binary(Fun), Args) of
         {ok, ES} ->
-            Trace = aefa_engine_state:trace(ES),
-            Red   = fun({_, {reductions, R}}) -> R end,
+            GasUsed    = ?CALL_GAS - aefa_engine_state:gas(ES),
+            Trace      = aefa_engine_state:trace(ES),
+            Red        = fun({_, {reductions, R}}) -> R end,
             Reductions = Red(hd(Trace)) - Red(lists:last(Trace)),
             Steps      = length(Trace),
-            io:format("~p steps (~p reductions)\n", [Steps, Reductions]),
+            io:format("~p steps / ~p gas / ~p reductions\n", [Steps, GasUsed, Reductions]),
             aefa_engine_state:accumulator(ES);
         {error, Err, ES} ->
             io:format("~s\n", [Err]),

diff --git a/apps/aevm/src/aevm_ae_primops.erl b/apps/aevm/src/aevm_ae_primops.erl
@@ -136,7 +136,7 @@ types(?PRIM_CALL_AENS_CLAIM,_HeapValue,_Store,_State) ->
     {[word, string, word, sign_t()], tuple0_t()};
 types(?PRIM_CALL_AENS_PRECLAIM,_HeapValue,_Store,_State) ->
     {[word, word, sign_t()], tuple0_t()};
-types(?PRIM_CALL_AENS_RESOLVE, HeapValue, Store, State) ->
+types(?PRIM_CALL_AENS_RESOLVE, HeapValue, _Store, State) ->
     %% The out type is given in the third argument
     T = {tuple, [word, word, word, typerep]},
     {ok, Bin} = aevm_eeevm_state:heap_value_to_binary(T, HeapValue, State),