Refactored memory-slice parameters.

Author: artob

lib/Clar2EVM/compile.ml

@@ -148,14 +148,14 @@ and compile_public_function ?(response_only=false) features env index (name, _,
     else compile_body_with_any_return
   in
   let body = compile_body body |> List.concat in
-  let postlude = [      (* (ok ...) or (err ...) expected on top of stack *)
-    EVM.zero;           (* offset = memory address 0 *)
-    EVM.MSTORE;         (* MSTORE offset, value *)
-    EVM.from_int 0x20;  (* length = 256 bits *)
-    EVM.zero;           (* offset = memory address 0 *)
-    EVM.RETURN;         (* RETURN offset, length *)
-    EVM.STOP;           (* redundant, but a good marker for EOF *)
-  ] in
+  let postlude =        (* (ok ...) or (err ...) expected on top of stack *)
+    [
+      EVM.zero;         (* offset = memory address 0 *)
+      EVM.MSTORE;       (* MSTORE offset, value *)
+    ]
+    @ EVM.return' (0, 32)
+    @ EVM.stop          (* redundant, but a good marker for EOF *)
+  in
   (1 + index, prelude @ body @ postlude)
 
 and compile_private_function _features env index (_, _, body) =
@@ -295,7 +295,7 @@ and compile_expression env = function
   | UnwrapPanic input ->
     let input = compile_expression env input in
     input @ compile_branch [EVM.DUP 1; EVM.ISZERO]
-      [EVM.POP; EVM.zero; EVM.zero; EVM.REVERT]
+      (EVM.pop @ EVM.revert (0, 0))
       [EVM.SLOAD]
 
   | VarGet var ->
@@ -332,7 +332,7 @@ and compile_expression env = function
     | Clarity.Buff _ | Int | Uint ->
       let input_size = size_of_expression value in
       let input_mstore = compile_mstore_of_expression env value in
-      input_mstore @ EVM.staticcall_hash160 0 input_size 0 @ EVM.pop
+      input_mstore @ EVM.staticcall_hash160 (0, input_size) 0 @ EVM.pop
     | t -> unsupported_function "hash160" t
     end
 
@@ -341,7 +341,7 @@ and compile_expression env = function
     | Clarity.Buff _ | Int | Uint ->
       let input_size = size_of_expression value in
       let value = compile_expression env value in
-      EVM.mstore 0 value @ EVM.sha3 0 input_size
+      EVM.mstore 0 value @ EVM.sha3 (0, input_size)
     | t -> unsupported_function "keccak256" t
   end
 
@@ -367,7 +367,7 @@ and compile_expression env = function
     | Clarity.Buff _ | Int | Uint ->
       let input_size = size_of_expression value in
       let input_mstore = compile_mstore_of_expression env value in
-      input_mstore @ EVM.staticcall_sha256 0 input_size 0 @ EVM.pop
+      input_mstore @ EVM.staticcall_sha256 (0, input_size) 0 @ EVM.pop
     | t -> unsupported_function "sha256" t
   end
 
@@ -413,7 +413,7 @@ and compile_static_print_call value =
   let payload = EVM.ABI.encode_with_signature signature args in
   let payload_size = String.length payload in
   let mstore = EVM.mstore_bytes 0 payload in
-  mstore @ EVM.staticcall log_addr 0 payload_size 0 0 @ EVM.pop
+  mstore @ EVM.staticcall log_addr (0, payload_size) (0, 0) @ EVM.pop
 
 and compile_mstore_of_expression ?(offset=0) env expr =
   EVM.mstore offset (compile_expression env expr)

lib/EVM/construct.ml

@@ -4,6 +4,8 @@ type addr = string
 
 type ptr = int
 
+type slice = ptr * int
+
 let rec addr_of_int z =
   match from_int z with PUSH (_, s) -> s | _ -> unreachable ()
 
@@ -101,13 +103,22 @@ let origin = [ORIGIN]
 
 let pop = [POP]
 
-let sha3 input_ptr input_size = [from_int input_size; from_int input_ptr; SHA3]
+let return' = function
+  | data_ptr, data_size when data_ptr = data_size -> [from_int data_size; DUP 1; RETURN]
+  | data_ptr, data_size -> [from_int data_size; from_int data_ptr; RETURN]
+
+let revert = function
+  | data_ptr, data_size when data_ptr = data_size -> [from_int data_size; DUP 1; REVERT]
+  | data_ptr, data_size -> [from_int data_size; from_int data_ptr; REVERT]
+
+let sha3 = function
+  | input_ptr, input_size -> [from_int input_size; from_int input_ptr; SHA3]
 
 let sload key = [from_int key; SLOAD]
 
 let sstore key val' = val' @ [from_int key; SSTORE]
 
-let staticcall ?(gas=0) addr input_ptr input_size output_ptr output_size =
+let staticcall ?(gas=0) addr (input_ptr, input_size) (output_ptr, output_size) =
   [
     from_int output_size;
     from_ptr output_ptr;
@@ -118,11 +129,11 @@ let staticcall ?(gas=0) addr input_ptr input_size output_ptr output_size =
     STATICCALL (* gas, addr, argsOffset, argsLength, retOffset, retLength *)
   ]
 
-let staticcall_hash160 input_ptr input_size output_ptr =
-  staticcall (addr_of_int 0x03) input_ptr input_size output_ptr 32
+let staticcall_hash160 (input_ptr, input_size) output_ptr =
+  staticcall (addr_of_int 0x03) (input_ptr, input_size) (output_ptr, 32)
 
-let staticcall_sha256 input_ptr input_size output_ptr =
-  staticcall (addr_of_int 0x02) input_ptr input_size output_ptr 32
+let staticcall_sha256 (input_ptr, input_size) output_ptr =
+  staticcall (addr_of_int 0x02) (input_ptr, input_size) (output_ptr, 32)
 
 let stop = [STOP]
 

lib/EVM/construct.mli

@@ -4,6 +4,8 @@ type addr = string
 
 type ptr = int
 
+type slice = ptr * int
+
 val addr_of_int : int -> addr
 
 val ptr_of_int : int -> ptr
@@ -74,17 +76,21 @@ val origin : opcode list
 
 val pop : opcode list
 
-val sha3 : ptr -> int -> opcode list
+val return' : slice -> opcode list
+
+val revert : slice -> opcode list
+
+val sha3 : slice -> opcode list
 
 val sload : int -> opcode list
 
 val sstore : int -> opcode list -> opcode list
 
-val staticcall : ?gas:int -> addr -> ptr -> int -> ptr -> int -> opcode list
+val staticcall : ?gas:int -> addr -> slice -> slice -> opcode list
 
-val staticcall_hash160 : ptr -> int -> ptr -> opcode list
+val staticcall_hash160 : slice -> ptr -> opcode list
 
-val staticcall_sha256 : ptr -> int -> ptr -> opcode list
+val staticcall_sha256 : slice -> ptr -> opcode list
 
 val stop : opcode list
 

test/contracts.t

@@ -27,11 +27,11 @@ kv-store.clar:
 panic.clar:
 
   $ clarc -t opcode ../../../../../etc/examples/panic.clar
-  PUSH1 0x00 PUSH1 0x00 SSTORE PUSH1 0x63 DUP1 PUSH1 0x10 PUSH1 0x00 CODECOPY
+  PUSH1 0x00 PUSH1 0x00 SSTORE PUSH1 0x62 DUP1 PUSH1 0x10 PUSH1 0x00 CODECOPY
   PUSH1 0x00 RETURN PUSH1 0xe0 PUSH1 0x02 EXP PUSH1 0x00 CALLDATALOAD DIV DUP1
-  PUSH4 0xc2187034 EQ PUSH1 0x3b JUMPI DUP1 PUSH4 0x4700d305 EQ PUSH1 0x50
-  JUMPI STOP JUMPDEST PUSH1 0x00 SLOAD DUP1 ISZERO ISZERO PC PUSH1 0x10 ADD
-  JUMPI POP PUSH1 0x00 PUSH1 0x00 REVERT PC PUSH1 0x07 ADD JUMP JUMPDEST SLOAD
+  PUSH4 0xc2187034 EQ PUSH1 0x3a JUMPI DUP1 PUSH4 0x4700d305 EQ PUSH1 0x4f
+  JUMPI STOP JUMPDEST PUSH1 0x00 SLOAD DUP1 ISZERO ISZERO PC PUSH1 0x0f ADD
+  JUMPI POP PUSH1 0x00 DUP1 REVERT PC PUSH1 0x07 ADD JUMP JUMPDEST SLOAD
   JUMPDEST SWAP1 JUMP STOP JUMPDEST POP PC PUSH1 0x07 ADD PUSH1 0x1e JUMP
   JUMPDEST PUSH1 0x01 PUSH1 0x00 MSTORE PUSH1 0x20 PUSH1 0x00 RETURN STOP
   JUMPDEST POP PC PUSH1 0x07 ADD PUSH1 0x1e JUMP JUMPDEST PUSH1 0x00 MSTORE

test/functions.t

@@ -452,6 +452,13 @@ unwrap-err!:
 
 unwrap-panic:
 
+  $ clarc -t opcode -f only-function=test <<EOF
+  > (define-read-only (test) (unwrap-panic none))
+  > EOF
+  PUSH1 0x00 DUP1 ISZERO ISZERO PC PUSH1 0x0f ADD JUMPI POP PUSH1 0x00 DUP1
+  REVERT PC PUSH1 0x07 ADD JUMP JUMPDEST SLOAD JUMPDEST PUSH1 0x00 MSTORE
+  PUSH1 0x20 PUSH1 0x00 RETURN STOP
+
 unwrap!:
 
 use-trait: