Merge pull request #276 from ewasm/call-wast-fix

fix call wast for removing stack elements

Author: axic

wasm/generateInterface.js

@@ -286,22 +286,9 @@ function generateManifest (interfaceManifest, opts) {
 
         // delete 6th stack element
         spOffset--
-        call += `
-      ;; zero out mem
-      (i64.store (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 4})) (i64.const 0))
-      (i64.store (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 3})) (i64.const 0))
-      (i64.store (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 2})) (i64.const 0))
-      (i64.store (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 1})) (i64.const 0))`
 
         // delete 7th stack element
         spOffset--
-        call += `
-      ;; zero out mem
-      (i64.store (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 4})) (i64.const 0))
-      (i64.store (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 3})) (i64.const 0))
-      (i64.store (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 2})) (i64.const 0))
-      (i64.store (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 1})) (i64.const 0))`
-
       } else if (input === 'length' && (opcode !== 'CALL' && opcode !== 'CALLCODE')) {
         locals += `(local $length${numOfLocals} i32)`
         body += `(set_local $length${numOfLocals} 
@@ -372,6 +359,7 @@ function generateManifest (interfaceManifest, opts) {
       (i64.extend_u/i32
         (i32.eqz ${call}) ;; flip CALL result from EEI to EVM convention (0 -> 1, 1,2,.. -> 1)
       )))`
+
       } else {
         call =
           `(i64.store

wasm/wast-async.json

@@ -88,11 +88,11 @@
     "imports": "(import \"ethereum\" \"create\" (func $create (param i32 i32 i32 i32 i32) ))"
   },
   "CALL": {
-    "wast": ";; generated by ./wasm/generateInterface.js\n(func $CALL (param $callback i32)(local $offset0 i32)(local $length0 i32) (set_local $offset0 \n    (call $check_overflow\n      (i64.load (i32.add (get_global $sp) (i32.const -96)))\n      (i64.load (i32.add (get_global $sp) (i32.const -88)))\n      (i64.load (i32.add (get_global $sp) (i32.const -80)))\n      (i64.load (i32.add (get_global $sp) (i32.const -72)))))(set_local $length0 \n    (call $check_overflow \n      (i64.load (i32.add (get_global $sp) (i32.const -128)))\n      (i64.load (i32.add (get_global $sp) (i32.const -120)))\n      (i64.load (i32.add (get_global $sp) (i32.const -112)))\n      (i64.load (i32.add (get_global $sp) (i32.const -104)))))\n\n    (call $memusegas (get_local $offset0) (get_local $length0))\n    (set_local $offset0 (i32.add (get_global $memstart) (get_local $offset0))) (i64.store\n      (i32.add (get_global $sp) (i32.const -192))\n      (i64.extend_u/i32\n        (i32.eqz (call $call(call $check_overflow_i64\n           (i64.load (i32.add (get_global $sp) (i32.const 0)))\n           (i64.load (i32.add (get_global $sp) (i32.const 8)))\n           (i64.load (i32.add (get_global $sp) (i32.const 16)))\n           (i64.load (i32.add (get_global $sp) (i32.const 24))))(i32.add (get_global $sp) (i32.const -32))(i32.add (get_global $sp) (i32.const -64))(get_local $offset0)(get_local $length0)\n      ;; zero out mem\n      (i64.store (i32.add (get_global $sp) (i32.const -128)) (i64.const 0))\n      (i64.store (i32.add (get_global $sp) (i32.const -136)) (i64.const 0))\n      (i64.store (i32.add (get_global $sp) (i32.const -144)) (i64.const 0))\n      (i64.store (i32.add (get_global $sp) (i32.const -152)) (i64.const 0))\n      ;; zero out mem\n      (i64.store (i32.add (get_global $sp) (i32.const -160)) (i64.const 0))\n      (i64.store (i32.add (get_global $sp) (i32.const -168)) (i64.const 0))\n      (i64.store (i32.add (get_global $sp) (i32.const -176)) (i64.const 0))\n      (i64.store (i32.add (get_global $sp) (i32.const -184)) (i64.const 0))(get_local $callback)) ;; flip CALL result from EEI to EVM convention (0 -> 1, 1,2,.. -> 1)\n      )))\n    ;; zero out mem\n    (i64.store (i32.add (get_global $sp) (i32.const -168)) (i64.const 0))\n    (i64.store (i32.add (get_global $sp) (i32.const -176)) (i64.const 0))\n    (i64.store (i32.add (get_global $sp) (i32.const -184)) (i64.const 0)))",
+    "wast": ";; generated by ./wasm/generateInterface.js\n(func $CALL (param $callback i32)(local $offset0 i32)(local $length0 i32) (set_local $offset0 \n    (call $check_overflow\n      (i64.load (i32.add (get_global $sp) (i32.const -96)))\n      (i64.load (i32.add (get_global $sp) (i32.const -88)))\n      (i64.load (i32.add (get_global $sp) (i32.const -80)))\n      (i64.load (i32.add (get_global $sp) (i32.const -72)))))(set_local $length0 \n    (call $check_overflow \n      (i64.load (i32.add (get_global $sp) (i32.const -128)))\n      (i64.load (i32.add (get_global $sp) (i32.const -120)))\n      (i64.load (i32.add (get_global $sp) (i32.const -112)))\n      (i64.load (i32.add (get_global $sp) (i32.const -104)))))\n\n    (call $memusegas (get_local $offset0) (get_local $length0))\n    (set_local $offset0 (i32.add (get_global $memstart) (get_local $offset0))) (i64.store\n      (i32.add (get_global $sp) (i32.const -192))\n      (i64.extend_u/i32\n        (i32.eqz (call $call(call $check_overflow_i64\n           (i64.load (i32.add (get_global $sp) (i32.const 0)))\n           (i64.load (i32.add (get_global $sp) (i32.const 8)))\n           (i64.load (i32.add (get_global $sp) (i32.const 16)))\n           (i64.load (i32.add (get_global $sp) (i32.const 24))))(i32.add (get_global $sp) (i32.const -32))(i32.add (get_global $sp) (i32.const -64))(get_local $offset0)(get_local $length0)(get_local $callback)) ;; flip CALL result from EEI to EVM convention (0 -> 1, 1,2,.. -> 1)\n      )))\n    ;; zero out mem\n    (i64.store (i32.add (get_global $sp) (i32.const -168)) (i64.const 0))\n    (i64.store (i32.add (get_global $sp) (i32.const -176)) (i64.const 0))\n    (i64.store (i32.add (get_global $sp) (i32.const -184)) (i64.const 0)))",
     "imports": "(import \"ethereum\" \"call\" (func $call (param i64 i32 i32 i32 i32 i32) (result i32)))"
   },
   "CALLCODE": {
-    "wast": ";; generated by ./wasm/generateInterface.js\n(func $CALLCODE (param $callback i32)(local $offset0 i32)(local $length0 i32) (set_local $offset0 \n    (call $check_overflow\n      (i64.load (i32.add (get_global $sp) (i32.const -96)))\n      (i64.load (i32.add (get_global $sp) (i32.const -88)))\n      (i64.load (i32.add (get_global $sp) (i32.const -80)))\n      (i64.load (i32.add (get_global $sp) (i32.const -72)))))(set_local $length0 \n    (call $check_overflow \n      (i64.load (i32.add (get_global $sp) (i32.const -128)))\n      (i64.load (i32.add (get_global $sp) (i32.const -120)))\n      (i64.load (i32.add (get_global $sp) (i32.const -112)))\n      (i64.load (i32.add (get_global $sp) (i32.const -104)))))\n\n    (call $memusegas (get_local $offset0) (get_local $length0))\n    (set_local $offset0 (i32.add (get_global $memstart) (get_local $offset0))) (i64.store\n      (i32.add (get_global $sp) (i32.const -192))\n      (i64.extend_u/i32\n        (i32.eqz (call $callCode(call $check_overflow_i64\n           (i64.load (i32.add (get_global $sp) (i32.const 0)))\n           (i64.load (i32.add (get_global $sp) (i32.const 8)))\n           (i64.load (i32.add (get_global $sp) (i32.const 16)))\n           (i64.load (i32.add (get_global $sp) (i32.const 24))))(i32.add (get_global $sp) (i32.const -32))(i32.add (get_global $sp) (i32.const -64))(get_local $offset0)(get_local $length0)\n      ;; zero out mem\n      (i64.store (i32.add (get_global $sp) (i32.const -128)) (i64.const 0))\n      (i64.store (i32.add (get_global $sp) (i32.const -136)) (i64.const 0))\n      (i64.store (i32.add (get_global $sp) (i32.const -144)) (i64.const 0))\n      (i64.store (i32.add (get_global $sp) (i32.const -152)) (i64.const 0))\n      ;; zero out mem\n      (i64.store (i32.add (get_global $sp) (i32.const -160)) (i64.const 0))\n      (i64.store (i32.add (get_global $sp) (i32.const -168)) (i64.const 0))\n      (i64.store (i32.add (get_global $sp) (i32.const -176)) (i64.const 0))\n      (i64.store (i32.add (get_global $sp) (i32.const -184)) (i64.const 0))(get_local $callback)) ;; flip CALL result from EEI to EVM convention (0 -> 1, 1,2,.. -> 1)\n      )))\n    ;; zero out mem\n    (i64.store (i32.add (get_global $sp) (i32.const -168)) (i64.const 0))\n    (i64.store (i32.add (get_global $sp) (i32.const -176)) (i64.const 0))\n    (i64.store (i32.add (get_global $sp) (i32.const -184)) (i64.const 0)))",
+    "wast": ";; generated by ./wasm/generateInterface.js\n(func $CALLCODE (param $callback i32)(local $offset0 i32)(local $length0 i32) (set_local $offset0 \n    (call $check_overflow\n      (i64.load (i32.add (get_global $sp) (i32.const -96)))\n      (i64.load (i32.add (get_global $sp) (i32.const -88)))\n      (i64.load (i32.add (get_global $sp) (i32.const -80)))\n      (i64.load (i32.add (get_global $sp) (i32.const -72)))))(set_local $length0 \n    (call $check_overflow \n      (i64.load (i32.add (get_global $sp) (i32.const -128)))\n      (i64.load (i32.add (get_global $sp) (i32.const -120)))\n      (i64.load (i32.add (get_global $sp) (i32.const -112)))\n      (i64.load (i32.add (get_global $sp) (i32.const -104)))))\n\n    (call $memusegas (get_local $offset0) (get_local $length0))\n    (set_local $offset0 (i32.add (get_global $memstart) (get_local $offset0))) (i64.store\n      (i32.add (get_global $sp) (i32.const -192))\n      (i64.extend_u/i32\n        (i32.eqz (call $callCode(call $check_overflow_i64\n           (i64.load (i32.add (get_global $sp) (i32.const 0)))\n           (i64.load (i32.add (get_global $sp) (i32.const 8)))\n           (i64.load (i32.add (get_global $sp) (i32.const 16)))\n           (i64.load (i32.add (get_global $sp) (i32.const 24))))(i32.add (get_global $sp) (i32.const -32))(i32.add (get_global $sp) (i32.const -64))(get_local $offset0)(get_local $length0)(get_local $callback)) ;; flip CALL result from EEI to EVM convention (0 -> 1, 1,2,.. -> 1)\n      )))\n    ;; zero out mem\n    (i64.store (i32.add (get_global $sp) (i32.const -168)) (i64.const 0))\n    (i64.store (i32.add (get_global $sp) (i32.const -176)) (i64.const 0))\n    (i64.store (i32.add (get_global $sp) (i32.const -184)) (i64.const 0)))",
     "imports": "(import \"ethereum\" \"callCode\" (func $callCode (param i64 i32 i32 i32 i32 i32) (result i32)))"
   },
   "DELEGATECALL": {

wasm/wast.json

@@ -88,11 +88,11 @@
     "imports": "(import \"ethereum\" \"create\" (func $create (param i32 i32 i32 i32) ))"
   },
   "CALL": {
-    "wast": ";; generated by ./wasm/generateInterface.js\n(func $CALL (local $offset0 i32)(local $length0 i32) (set_local $offset0 \n    (call $check_overflow\n      (i64.load (i32.add (get_global $sp) (i32.const -96)))\n      (i64.load (i32.add (get_global $sp) (i32.const -88)))\n      (i64.load (i32.add (get_global $sp) (i32.const -80)))\n      (i64.load (i32.add (get_global $sp) (i32.const -72)))))(set_local $length0 \n    (call $check_overflow \n      (i64.load (i32.add (get_global $sp) (i32.const -128)))\n      (i64.load (i32.add (get_global $sp) (i32.const -120)))\n      (i64.load (i32.add (get_global $sp) (i32.const -112)))\n      (i64.load (i32.add (get_global $sp) (i32.const -104)))))\n\n    (call $memusegas (get_local $offset0) (get_local $length0))\n    (set_local $offset0 (i32.add (get_global $memstart) (get_local $offset0))) (i64.store\n      (i32.add (get_global $sp) (i32.const -192))\n      (i64.extend_u/i32\n        (i32.eqz (call $call(call $check_overflow_i64\n           (i64.load (i32.add (get_global $sp) (i32.const 0)))\n           (i64.load (i32.add (get_global $sp) (i32.const 8)))\n           (i64.load (i32.add (get_global $sp) (i32.const 16)))\n           (i64.load (i32.add (get_global $sp) (i32.const 24))))(i32.add (get_global $sp) (i32.const -32))(i32.add (get_global $sp) (i32.const -64))(get_local $offset0)(get_local $length0)\n      ;; zero out mem\n      (i64.store (i32.add (get_global $sp) (i32.const -128)) (i64.const 0))\n      (i64.store (i32.add (get_global $sp) (i32.const -136)) (i64.const 0))\n      (i64.store (i32.add (get_global $sp) (i32.const -144)) (i64.const 0))\n      (i64.store (i32.add (get_global $sp) (i32.const -152)) (i64.const 0))\n      ;; zero out mem\n      (i64.store (i32.add (get_global $sp) (i32.const -160)) (i64.const 0))\n      (i64.store (i32.add (get_global $sp) (i32.const -168)) (i64.const 0))\n      (i64.store (i32.add (get_global $sp) (i32.const -176)) (i64.const 0))\n      (i64.store (i32.add (get_global $sp) (i32.const -184)) (i64.const 0))) ;; flip CALL result from EEI to EVM convention (0 -> 1, 1,2,.. -> 1)\n      )))\n    ;; zero out mem\n    (i64.store (i32.add (get_global $sp) (i32.const -168)) (i64.const 0))\n    (i64.store (i32.add (get_global $sp) (i32.const -176)) (i64.const 0))\n    (i64.store (i32.add (get_global $sp) (i32.const -184)) (i64.const 0)))",
+    "wast": ";; generated by ./wasm/generateInterface.js\n(func $CALL (local $offset0 i32)(local $length0 i32) (set_local $offset0 \n    (call $check_overflow\n      (i64.load (i32.add (get_global $sp) (i32.const -96)))\n      (i64.load (i32.add (get_global $sp) (i32.const -88)))\n      (i64.load (i32.add (get_global $sp) (i32.const -80)))\n      (i64.load (i32.add (get_global $sp) (i32.const -72)))))(set_local $length0 \n    (call $check_overflow \n      (i64.load (i32.add (get_global $sp) (i32.const -128)))\n      (i64.load (i32.add (get_global $sp) (i32.const -120)))\n      (i64.load (i32.add (get_global $sp) (i32.const -112)))\n      (i64.load (i32.add (get_global $sp) (i32.const -104)))))\n\n    (call $memusegas (get_local $offset0) (get_local $length0))\n    (set_local $offset0 (i32.add (get_global $memstart) (get_local $offset0))) (i64.store\n      (i32.add (get_global $sp) (i32.const -192))\n      (i64.extend_u/i32\n        (i32.eqz (call $call(call $check_overflow_i64\n           (i64.load (i32.add (get_global $sp) (i32.const 0)))\n           (i64.load (i32.add (get_global $sp) (i32.const 8)))\n           (i64.load (i32.add (get_global $sp) (i32.const 16)))\n           (i64.load (i32.add (get_global $sp) (i32.const 24))))(i32.add (get_global $sp) (i32.const -32))(i32.add (get_global $sp) (i32.const -64))(get_local $offset0)(get_local $length0)) ;; flip CALL result from EEI to EVM convention (0 -> 1, 1,2,.. -> 1)\n      )))\n    ;; zero out mem\n    (i64.store (i32.add (get_global $sp) (i32.const -168)) (i64.const 0))\n    (i64.store (i32.add (get_global $sp) (i32.const -176)) (i64.const 0))\n    (i64.store (i32.add (get_global $sp) (i32.const -184)) (i64.const 0)))",
     "imports": "(import \"ethereum\" \"call\" (func $call (param i64 i32 i32 i32 i32) (result i32)))"
   },
   "CALLCODE": {
-    "wast": ";; generated by ./wasm/generateInterface.js\n(func $CALLCODE (local $offset0 i32)(local $length0 i32) (set_local $offset0 \n    (call $check_overflow\n      (i64.load (i32.add (get_global $sp) (i32.const -96)))\n      (i64.load (i32.add (get_global $sp) (i32.const -88)))\n      (i64.load (i32.add (get_global $sp) (i32.const -80)))\n      (i64.load (i32.add (get_global $sp) (i32.const -72)))))(set_local $length0 \n    (call $check_overflow \n      (i64.load (i32.add (get_global $sp) (i32.const -128)))\n      (i64.load (i32.add (get_global $sp) (i32.const -120)))\n      (i64.load (i32.add (get_global $sp) (i32.const -112)))\n      (i64.load (i32.add (get_global $sp) (i32.const -104)))))\n\n    (call $memusegas (get_local $offset0) (get_local $length0))\n    (set_local $offset0 (i32.add (get_global $memstart) (get_local $offset0))) (i64.store\n      (i32.add (get_global $sp) (i32.const -192))\n      (i64.extend_u/i32\n        (i32.eqz (call $callCode(call $check_overflow_i64\n           (i64.load (i32.add (get_global $sp) (i32.const 0)))\n           (i64.load (i32.add (get_global $sp) (i32.const 8)))\n           (i64.load (i32.add (get_global $sp) (i32.const 16)))\n           (i64.load (i32.add (get_global $sp) (i32.const 24))))(i32.add (get_global $sp) (i32.const -32))(i32.add (get_global $sp) (i32.const -64))(get_local $offset0)(get_local $length0)\n      ;; zero out mem\n      (i64.store (i32.add (get_global $sp) (i32.const -128)) (i64.const 0))\n      (i64.store (i32.add (get_global $sp) (i32.const -136)) (i64.const 0))\n      (i64.store (i32.add (get_global $sp) (i32.const -144)) (i64.const 0))\n      (i64.store (i32.add (get_global $sp) (i32.const -152)) (i64.const 0))\n      ;; zero out mem\n      (i64.store (i32.add (get_global $sp) (i32.const -160)) (i64.const 0))\n      (i64.store (i32.add (get_global $sp) (i32.const -168)) (i64.const 0))\n      (i64.store (i32.add (get_global $sp) (i32.const -176)) (i64.const 0))\n      (i64.store (i32.add (get_global $sp) (i32.const -184)) (i64.const 0))) ;; flip CALL result from EEI to EVM convention (0 -> 1, 1,2,.. -> 1)\n      )))\n    ;; zero out mem\n    (i64.store (i32.add (get_global $sp) (i32.const -168)) (i64.const 0))\n    (i64.store (i32.add (get_global $sp) (i32.const -176)) (i64.const 0))\n    (i64.store (i32.add (get_global $sp) (i32.const -184)) (i64.const 0)))",
+    "wast": ";; generated by ./wasm/generateInterface.js\n(func $CALLCODE (local $offset0 i32)(local $length0 i32) (set_local $offset0 \n    (call $check_overflow\n      (i64.load (i32.add (get_global $sp) (i32.const -96)))\n      (i64.load (i32.add (get_global $sp) (i32.const -88)))\n      (i64.load (i32.add (get_global $sp) (i32.const -80)))\n      (i64.load (i32.add (get_global $sp) (i32.const -72)))))(set_local $length0 \n    (call $check_overflow \n      (i64.load (i32.add (get_global $sp) (i32.const -128)))\n      (i64.load (i32.add (get_global $sp) (i32.const -120)))\n      (i64.load (i32.add (get_global $sp) (i32.const -112)))\n      (i64.load (i32.add (get_global $sp) (i32.const -104)))))\n\n    (call $memusegas (get_local $offset0) (get_local $length0))\n    (set_local $offset0 (i32.add (get_global $memstart) (get_local $offset0))) (i64.store\n      (i32.add (get_global $sp) (i32.const -192))\n      (i64.extend_u/i32\n        (i32.eqz (call $callCode(call $check_overflow_i64\n           (i64.load (i32.add (get_global $sp) (i32.const 0)))\n           (i64.load (i32.add (get_global $sp) (i32.const 8)))\n           (i64.load (i32.add (get_global $sp) (i32.const 16)))\n           (i64.load (i32.add (get_global $sp) (i32.const 24))))(i32.add (get_global $sp) (i32.const -32))(i32.add (get_global $sp) (i32.const -64))(get_local $offset0)(get_local $length0)) ;; flip CALL result from EEI to EVM convention (0 -> 1, 1,2,.. -> 1)\n      )))\n    ;; zero out mem\n    (i64.store (i32.add (get_global $sp) (i32.const -168)) (i64.const 0))\n    (i64.store (i32.add (get_global $sp) (i32.const -176)) (i64.const 0))\n    (i64.store (i32.add (get_global $sp) (i32.const -184)) (i64.const 0)))",
     "imports": "(import \"ethereum\" \"callCode\" (func $callCode (param i64 i32 i32 i32 i32) (result i32)))"
   },
   "DELEGATECALL": {