Merge pull request #305 from ewasm/generator-add-gaslimit

Replace special handling of i64 for CALL with a dedicated gasLimit type
ewasm · Aug 1, 2018 · 2bdcb3b · 2bdcb3b
2 parents 1a0304f + 0022c42
commit 2bdcb3b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/index.js b/index.js
@@ -38,8 +38,8 @@ const depMap = new Map([
   ['BLOCKHASH', ['check_overflow', 'callback_256']],
   ['SHA3', ['memusegas', 'bswap_m256', 'check_overflow', 'keccak']],
   ['CALL', ['bswap_m256', 'memusegas', 'check_overflow_i64', 'check_overflow', 'memset', 'callback_32']],
-  ['DELEGATECALL', ['callback', 'memusegas', 'check_overflow', 'memset']],
-  ['CALLCODE', ['bswap_m256', 'callback', 'memusegas', 'check_overflow', 'check_overflow_i64', 'memset', 'callback_32']],
+  ['DELEGATECALL', ['callback', 'memusegas', 'check_overflow_i64', 'check_overflow', 'memset']],
+  ['CALLCODE', ['bswap_m256', 'callback', 'memusegas', 'check_overflow_i64', 'check_overflow', 'check_overflow_i64', 'memset', 'callback_32']],
   ['CREATE', ['bswap_m256', 'bswap_m160', 'callback_160', 'memusegas', 'check_overflow']],
   ['RETURN', ['memusegas', 'check_overflow']],
   ['BALANCE', ['bswap_m256', 'callback_128']],

diff --git a/wasm/generateInterface.js b/wasm/generateInterface.js
@@ -12,6 +12,7 @@ const wasmTypes = {
   length: 'i32',
   ipointer: 'i32',
   opointer: 'i32',
+  gasLimit: 'i64',
   // FIXME: these are handled wrongly currently
   address: 'i32',
   i128: 'i32',
@@ -139,19 +140,19 @@ const interfaceManifest = {
   CALL: {
     name: 'call',
     async: true,
-    input: ['i64', 'address', 'i128', 'readOffset', 'length'],
+    input: ['gasLimit', 'address', 'i128', 'readOffset', 'length'],
     output: ['i32']
   },
   CALLCODE: {
     name: 'callCode',
     async: true,
-    input: ['i64', 'address', 'i128', 'readOffset', 'length'],
+    input: ['gasLimit', 'address', 'i128', 'readOffset', 'length'],
     output: ['i32']
   },
   DELEGATECALL: {
     name: 'callDelegate',
     async: true,
-    input: ['i32', 'address', 'i128', 'readOffset', 'length', 'writeOffset', 'length'],
+    input: ['gasLimit', 'address', 'i128', 'readOffset', 'length', 'writeOffset', 'length'],
     output: ['i32']
   },
   SSTORE: {
@@ -263,7 +264,7 @@ function generateManifest (interfaceManifest, opts) {
         // the wasm memory offset is a new item on the EVM stack
         spOffset++
         call += `(i32.add (get_global $sp) (i32.const ${spOffset * 32}))`
-      } else if (input === 'i64' && opcode === 'CALL') {
+      } else if (input === 'gasLimit') {
         // i64 param for CALL is the gas
         // add 2300 gas subsidy
         // for now this only works if the gas is a 64-bit value
@@ -281,7 +282,7 @@ function generateManifest (interfaceManifest, opts) {
         call += checkOverflowStackItem64(spOffset)
       } else if (input === 'i32') {
         call += checkOverflowStackItem256(spOffset)
-      } else if (input === 'i64' && opcode !== 'CALL') {
+      } else if (input === 'i64') {
         call += checkOverflowStackItem64(spOffset)
       } else if (input === 'writeOffset' || input === 'readOffset') {
         lastOffset = input

diff --git a/wasm/wast-async.json b/wasm/wast-async.json
@@ -96,8 +96,8 @@
     "imports": "(import \"ethereum\" \"callCode\" (func $callCode (param i64 i32 i32 i32 i32 i32) (result i32)))"
   },
   "DELEGATECALL": {
-    "wast": ";; generated by ./wasm/generateInterface.js\n(func $DELEGATECALL (param $callback i32)(local $offset0 i32)(local $length0 i32)(local $offset1 i32)(local $length1 i32) (set_local $offset0 (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 (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    (call $memusegas (get_local $offset0) (get_local $length0))\n    (set_local $offset0 (i32.add (get_global $memstart) (get_local $offset0)))(set_local $offset1 (call $check_overflow\n          (i64.load (i32.add (get_global $sp) (i32.const -160)))\n          (i64.load (i32.add (get_global $sp) (i32.const -152)))\n          (i64.load (i32.add (get_global $sp) (i32.const -144)))\n          (i64.load (i32.add (get_global $sp) (i32.const -136)))))(set_local $length1 (call $check_overflow\n          (i64.load (i32.add (get_global $sp) (i32.const -192)))\n          (i64.load (i32.add (get_global $sp) (i32.const -184)))\n          (i64.load (i32.add (get_global $sp) (i32.const -176)))\n          (i64.load (i32.add (get_global $sp) (i32.const -168)))))\n    (call $memusegas (get_local $offset1) (get_local $length1))\n    (set_local $offset1 (i32.add (get_global $memstart) (get_local $offset1))) (i64.store\n      (i32.add (get_global $sp) (i32.const -192))\n      (i64.extend_u/i32\n        (i32.eqz (call $callDelegate(call $check_overflow\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 $offset1)(get_local $length1)(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\" \"callDelegate\" (func $callDelegate (param i32 i32 i32 i32 i32 i32 i32 i32) (result i32)))"
+    "wast": ";; generated by ./wasm/generateInterface.js\n(func $DELEGATECALL (param $callback i32)(local $offset0 i32)(local $length0 i32)(local $offset1 i32)(local $length1 i32) (set_local $offset0 (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 (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    (call $memusegas (get_local $offset0) (get_local $length0))\n    (set_local $offset0 (i32.add (get_global $memstart) (get_local $offset0)))(set_local $offset1 (call $check_overflow\n          (i64.load (i32.add (get_global $sp) (i32.const -160)))\n          (i64.load (i32.add (get_global $sp) (i32.const -152)))\n          (i64.load (i32.add (get_global $sp) (i32.const -144)))\n          (i64.load (i32.add (get_global $sp) (i32.const -136)))))(set_local $length1 (call $check_overflow\n          (i64.load (i32.add (get_global $sp) (i32.const -192)))\n          (i64.load (i32.add (get_global $sp) (i32.const -184)))\n          (i64.load (i32.add (get_global $sp) (i32.const -176)))\n          (i64.load (i32.add (get_global $sp) (i32.const -168)))))\n    (call $memusegas (get_local $offset1) (get_local $length1))\n    (set_local $offset1 (i32.add (get_global $memstart) (get_local $offset1))) (i64.store\n      (i32.add (get_global $sp) (i32.const -192))\n      (i64.extend_u/i32\n        (i32.eqz (call $callDelegate(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 $offset1)(get_local $length1)(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\" \"callDelegate\" (func $callDelegate (param i64 i32 i32 i32 i32 i32 i32 i32) (result i32)))"
   },
   "SSTORE": {
     "wast": ";; generated by ./wasm/generateInterface.js\n(func $SSTORE (param $callback i32)  (call $storageStore(get_global $sp)(i32.add (get_global $sp) (i32.const -32))(get_local $callback)))",

diff --git a/wasm/wast.json b/wasm/wast.json
@@ -96,8 +96,8 @@
     "imports": "(import \"ethereum\" \"callCode\" (func $callCode (param i64 i32 i32 i32 i32) (result i32)))"
   },
   "DELEGATECALL": {
-    "wast": ";; generated by ./wasm/generateInterface.js\n(func $DELEGATECALL (local $offset0 i32)(local $length0 i32)(local $offset1 i32)(local $length1 i32) (set_local $offset0 (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 (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    (call $memusegas (get_local $offset0) (get_local $length0))\n    (set_local $offset0 (i32.add (get_global $memstart) (get_local $offset0)))(set_local $offset1 (call $check_overflow\n          (i64.load (i32.add (get_global $sp) (i32.const -160)))\n          (i64.load (i32.add (get_global $sp) (i32.const -152)))\n          (i64.load (i32.add (get_global $sp) (i32.const -144)))\n          (i64.load (i32.add (get_global $sp) (i32.const -136)))))(set_local $length1 (call $check_overflow\n          (i64.load (i32.add (get_global $sp) (i32.const -192)))\n          (i64.load (i32.add (get_global $sp) (i32.const -184)))\n          (i64.load (i32.add (get_global $sp) (i32.const -176)))\n          (i64.load (i32.add (get_global $sp) (i32.const -168)))))\n    (call $memusegas (get_local $offset1) (get_local $length1))\n    (set_local $offset1 (i32.add (get_global $memstart) (get_local $offset1))) (i64.store\n      (i32.add (get_global $sp) (i32.const -192))\n      (i64.extend_u/i32\n        (i32.eqz (call $callDelegate(call $check_overflow\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 $offset1)(get_local $length1)) ;; 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\" \"callDelegate\" (func $callDelegate (param i32 i32 i32 i32 i32 i32 i32) (result i32)))"
+    "wast": ";; generated by ./wasm/generateInterface.js\n(func $DELEGATECALL (local $offset0 i32)(local $length0 i32)(local $offset1 i32)(local $length1 i32) (set_local $offset0 (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 (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    (call $memusegas (get_local $offset0) (get_local $length0))\n    (set_local $offset0 (i32.add (get_global $memstart) (get_local $offset0)))(set_local $offset1 (call $check_overflow\n          (i64.load (i32.add (get_global $sp) (i32.const -160)))\n          (i64.load (i32.add (get_global $sp) (i32.const -152)))\n          (i64.load (i32.add (get_global $sp) (i32.const -144)))\n          (i64.load (i32.add (get_global $sp) (i32.const -136)))))(set_local $length1 (call $check_overflow\n          (i64.load (i32.add (get_global $sp) (i32.const -192)))\n          (i64.load (i32.add (get_global $sp) (i32.const -184)))\n          (i64.load (i32.add (get_global $sp) (i32.const -176)))\n          (i64.load (i32.add (get_global $sp) (i32.const -168)))))\n    (call $memusegas (get_local $offset1) (get_local $length1))\n    (set_local $offset1 (i32.add (get_global $memstart) (get_local $offset1))) (i64.store\n      (i32.add (get_global $sp) (i32.const -192))\n      (i64.extend_u/i32\n        (i32.eqz (call $callDelegate(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 $offset1)(get_local $length1)) ;; 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\" \"callDelegate\" (func $callDelegate (param i64 i32 i32 i32 i32 i32 i32) (result i32)))"
   },
   "SSTORE": {
     "wast": ";; generated by ./wasm/generateInterface.js\n(func $SSTORE   (call $storageStore(get_global $sp)(i32.add (get_global $sp) (i32.const -32))))",