diff --git a/Emakefile b/Emakefile new file mode 100644 index 0000000..68c7b67 --- /dev/null +++ b/Emakefile @@ -0,0 +1 @@ +{"src/*", [debug_info, {i, "include/"}, {outdir, "ebin/"}]}. diff --git a/rebar.lock b/rebar.lock index b97f975..d6d1c2d 100644 --- a/rebar.lock +++ b/rebar.lock @@ -5,7 +5,7 @@ 0}, {<<"base58">>, {git,"https://git.qpq.swiss/QPQ-AG/erl-base58.git", - {ref,"b6c41ff2f86f679675b95a780bfc6475e973d796"}}, + {ref,"e6aa62eeae3d4388311401f06e4b939bf4e94b9c"}}, 1}, {<<"eblake2">>,{pkg,<<"eblake2">>,<<"1.0.0">>},0}, {<<"enacl">>, diff --git a/rebar3 b/rebar3 index a83d554..1955cd7 100755 Binary files a/rebar3 and b/rebar3 differ diff --git a/src/gmb_fate_generate_ops.erl b/src/gmb_fate_generate_ops.erl index d6fb66e..230f471 100644 --- a/src/gmb_fate_generate_ops.erl +++ b/src/gmb_fate_generate_ops.erl @@ -237,7 +237,7 @@ ops_defs() -> , { 'BAND', 16#ab, false, true, true, ?GAS(10), [a, a, a], bin_and, {integer, integer}, integer, "Arg0 := Arg1 & Arg2"} , { 'BOR', 16#ac, false, true, true, ?GAS(10), [a, a, a], bin_or, {integer, integer}, integer, "Arg0 := Arg1 | Arg2"} , { 'BXOR', 16#ad, false, true, true, ?GAS(10), [a, a, a], bin_xor, {integer, integer}, integer, "Arg0 := Arg1 ^ Arg2"} - , { 'BNOT', 16#gm, false, true, true, ?GAS(10), [a, a], bin_not, {integer}, integer, "Arg0 := ~Arg1"} + , { 'BNOT', 16#ae, false, true, true, ?GAS(10), [a, a], bin_not, {integer}, integer, "Arg0 := ~Arg1"} , { 'BSL', 16#af, false, true, true, ?GAS(10), [a, a, a], bin_sl, {integer, integer}, integer, "Arg0 := Arg1 << Arg2"} , { 'BSR', 16#b0, false, true, true, ?GAS(10), [a, a, a], bin_sr, {integer, integer}, integer, "Arg0 := Arg1 >> Arg2"} , { 'BYTES_SPLIT_ANY', 16#b1, false, true, true, ?GAS(10), [a, a, a], bytes_split_any, {bytes, integer}, variant, "Arg0 := bytes_split_any(Arg1, Arg2), where a positive Arg2 is the length of the first chunk, and a negative Arg2 is the length of the second chunk. Returns None if byte array is not long enough."} diff --git a/test/asm_code/immediates.fate b/test/asm_code/immediates.fate index b0d2706..ad373ea 100644 --- a/test/asm_code/immediates.fate +++ b/test/asm_code/immediates.fate @@ -68,9 +68,6 @@ FUNCTION tuple() : {tuple, [integer, boolean, string, {tuple, [integer, integer] FUNCTION address() : address RETURNR @ak_nv5B93FPzRHrGNmMdTDfGdd5xGZvep3MVSpJqzcQmMp59bBCv -FUNCTION oracle() : oracle - RETURNR @ok_nv5B93FPzRHrGNmMdTDfGdd5xGZvep3MVSpJqzcQmMp59bBCv - FUNCTION contract() : contract RETURNR @ct_nv5B93FPzRHrGNmMdTDfGdd5xGZvep3MVSpJqzcQmMp59bBCv diff --git a/test/asm_code/oracles.fate b/test/asm_code/oracles.fate deleted file mode 100644 index 0b05f6a..0000000 --- a/test/asm_code/oracles.fate +++ /dev/null @@ -1,32 +0,0 @@ -;; CONTRACT oracles - -FUNCTION register (address, integer, {variant, [{tuple, [integer]}, {tuple, [integer]}]}) : oracle - ORACLE_REGISTER a #AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== arg0 arg1 arg2 'string '{variant, [{tuple, []}, {tuple, [integer]}]} - RETURN - -FUNCTION query (oracle, integer, string) : oracle_query - ORACLE_QUERY a arg0 arg1 arg2 (| [1,1] | 0 | (100) |) (| [1,1] | 0 | (100) |) 'string '{variant, [{tuple, []}, {tuple, [integer]}]} - RETURN - -FUNCTION bogus_query () : oracle_query - RETURNR @oq_nv5B93FPzRHrGNmMdTDfGdd5xGZvep3MVSpJqzcQmMp59bBCv - -FUNCTION respond (oracle, integer, string) : {tuple, []} - ORACLE_RESPOND #AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== arg0 arg1 arg2 'string '{variant, [{tuple, []}, {tuple, [integer]}]} - RETURNR {} - -FUNCTION extend (oracle, {variant, [{tuple, [integer]}, {tuple, [integer]}]}) : {tuple, []} - ORACLE_EXTEND #AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA== arg0 arg1 - RETURNR {} - -FUNCTION get_question (oracle, oracle_query) : string - ORACLE_GET_QUESTION a arg0 arg1 'string '{variant, [{tuple, []}, {tuple, [integer]}]} - RETURN - -FUNCTION get_answer (oracle, oracle_query) : {variant, [{tuple, []}, {tuple, [string]}]} - ORACLE_GET_ANSWER a arg1 arg2 'string '{variant, [{tuple, []}, {tuple, [integer]}]} - RETURN - -FUNCTION query_fee (oracle) : integer - ORACLE_QUERY_FEE a arg0 - RETURN diff --git a/test/gmb_fate_asm_test.erl b/test/gmb_fate_asm_test.erl index 53855f7..19bb080 100644 --- a/test/gmb_fate_asm_test.erl +++ b/test/gmb_fate_asm_test.erl @@ -49,7 +49,6 @@ sources() -> , "mapofmap" , "immediates" , "names" - , "oracles" , "meta" ]. diff --git a/zomp.meta b/zomp.meta index 6550af5..2b362b2 100644 --- a/zomp.meta +++ b/zomp.meta @@ -10,7 +10,7 @@ {key_name,none}. {license,skip}. {modules,[]}. -{name,"AE Bytecode"}. +{name,"Gajumaru Bytecode"}. {package_id,{"otpr","gmbytecode",{3,2,1}}}. {prefix,none}. {repo_url,"https://git.qpq.swiss/QPQ-AG/gmbytecode"}.