QPQ-AG/gmbytecode
10
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases 9 Wiki Activity

Revert bytes(N) from ABI encode it in word/tuple #149

Merged
zxq9 merged 1 commits from remove_bytes_from_aevm into master 2019-04-24 00:43:42 +09:00
Conversation 4 Commits 1 Files Changed 3 +1 -10
3 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/aeb_typerep_def.hrl
View File

@ -9,4 +9,3 @@
-define(TYPEREP_TYPEREP_TAG, 5). -define(TYPEREP_TYPEREP_TAG, 5).
-define(TYPEREP_MAP_TAG, 6). -define(TYPEREP_MAP_TAG, 6).
-define(TYPEREP_FUN_TAG, 7). -define(TYPEREP_FUN_TAG, 7).
-define(TYPEREP_BYTES_TAG, 8).

1
src/aeb_aevm_data.erl
View File

@ -8,7 +8,6 @@
| {list, type()} | {list, type()}
| {option, type()} | {option, type()}
| {tuple, [type()]} | {tuple, [type()]}
| {bytes, non_neg_integer()}
| {variant, [[type()]]}. | {variant, [[type()]]}.

9
src/aeb_heap.erl
View File

@ -122,7 +122,6 @@ to_binary1(function, Address) -> to_binary1({?TYPEREP_FUN_TAG}, Address);
to_binary1({list, T}, Address) -> to_binary1({?TYPEREP_LIST_TAG, T}, Address); to_binary1({list, T}, Address) -> to_binary1({?TYPEREP_LIST_TAG, T}, Address);
to_binary1({option, T}, Address) -> to_binary1({variant, [[], [T]]}, Address); to_binary1({option, T}, Address) -> to_binary1({variant, [[], [T]]}, Address);
to_binary1({tuple, Ts}, Address) -> to_binary1({?TYPEREP_TUPLE_TAG, Ts}, Address); to_binary1({tuple, Ts}, Address) -> to_binary1({?TYPEREP_TUPLE_TAG, Ts}, Address);
to_binary1({bytes, Len}, Address) -> to_binary1({?TYPEREP_BYTES_TAG, Len}, Address);
to_binary1({variant, Cons}, Address) -> to_binary1({?TYPEREP_VARIANT_TAG, Cons}, Address); to_binary1({variant, Cons}, Address) -> to_binary1({?TYPEREP_VARIANT_TAG, Cons}, Address);
to_binary1({map, K, V}, Address) -> to_binary1({?TYPEREP_MAP_TAG, K, V}, Address); to_binary1({map, K, V}, Address) -> to_binary1({?TYPEREP_MAP_TAG, K, V}, Address);
to_binary1({variant, Tag, Args}, Address) -> to_binary1({variant, Tag, Args}, Address) ->
@ -188,11 +187,6 @@ from_binary(_, bool, _, V) ->
0 -> false; 0 -> false;
1 -> true 1 -> true
end; end;
from_binary(_, {bytes, Len}, _Heap, V) when Len =< 32 ->
V;
from_binary(Visited, {bytes, Len}, Heap, V) ->
Words = (31 + Len) div 32,
from_binary(Visited, {tuple, lists:duplicate(Words, word)}, Heap, V);
from_binary(_, string, Heap, V) -> from_binary(_, string, Heap, V) ->
StringSize = heap_word(Heap,V), StringSize = heap_word(Heap,V),
BitAddr = 8*(V+32), BitAddr = 8*(V+32),
@ -254,8 +248,7 @@ from_binary(Visited, typerep, Heap, V) ->
?TYPEREP_TUPLE_TAG -> {tuple, Arg({list, typerep})}; ?TYPEREP_TUPLE_TAG -> {tuple, Arg({list, typerep})};
?TYPEREP_VARIANT_TAG -> {variant, Arg({list, {list, typerep}})}; ?TYPEREP_VARIANT_TAG -> {variant, Arg({list, {list, typerep}})};
?TYPEREP_MAP_TAG -> {map, Arg(typerep), Arg1(typerep, 2)}; ?TYPEREP_MAP_TAG -> {map, Arg(typerep), Arg1(typerep, 2)};
?TYPEREP_FUN_TAG -> function; ?TYPEREP_FUN_TAG -> function
?TYPEREP_BYTES_TAG -> {bytes, Arg(word)}
end. end.
map_binary_to_value(KeyType, ValType, N, Bin, Ptr) -> map_binary_to_value(KeyType, ValType, N, Bin, Ptr) ->