Add proper input field for callReturnMemory* instead of workarounds (…

…it is not fully supported yet)

wasm/generateInterface.js

@@ -13,6 +13,8 @@ const wasmTypes = {
   ipointer: 'i32',
   opointer: 'i32',
   gasLimit: 'i64',
+  callReturnMemoryOffset: 'i32',
+  callReturnMemorySize: 'i32',
   // FIXME: these are handled wrongly currently
   address: 'i32',
   i128: 'i32',
@@ -140,19 +142,19 @@ const interfaceManifest = {
   CALL: {
     name: 'call',
     async: true,
-    input: ['gasLimit', 'address', 'i128', 'readOffset', 'length'],
+    input: ['gasLimit', 'address', 'i128', 'readOffset', 'length', 'callReturnMemoryOffset', 'callReturnMemorySize'],
     output: ['i32']
   },
   CALLCODE: {
     name: 'callCode',
     async: true,
-    input: ['gasLimit', 'address', 'i128', 'readOffset', 'length'],
+    input: ['gasLimit', 'address', 'i128', 'readOffset', 'length', 'callReturnMemoryOffset', 'callReturnMemorySize'],
     output: ['i32']
   },
   DELEGATECALL: {
     name: 'callDelegate',
     async: true,
-    input: ['gasLimit', 'address', 'i128', 'readOffset', 'length', 'writeOffset', 'length'],
+    input: ['gasLimit', 'address', 'i128', 'readOffset', 'length', 'writeOffset', 'length', 'callReturnMemoryOffset', 'callReturnMemorySize'],
     output: ['i32']
   },
   SSTORE: {
@@ -207,7 +209,8 @@ function generateManifest (interfaceManifest, opts) {
   for (let opcode in interfaceManifest) {
     const op = interfaceManifest[opcode]
     // Translate input types to native wasm types
-    let inputs = op.input.map(type => toWasmType(type))
+    // callReturnMemoryOffset and callReturnMemorySize are actually output and must be ignored here
+    let inputs = op.input.filter(type => type !== 'callReturnMemoryOffset' && type !== 'callReturnMemorySize').map(type => toWasmType(type))
     // Also add output types which are non-basic because they need to be passed as inputs
     inputs = inputs.concat(op.output.filter(type => type !== 'i32' && type !== 'i64').map(type => toWasmType(type)))
     let params = ''
@@ -289,6 +292,12 @@ function generateManifest (interfaceManifest, opts) {
         locals += `(local $offset${numOfLocals} i32)`
         body += `(set_local $offset${numOfLocals} ${checkOverflowStackItem256(spOffset)})`
         call += `(get_local $offset${numOfLocals})`
+      } else if (input === 'callReturnMemoryOffset' || input === 'callReturnMemorySize') {
+        // FIXME: this should actually insert a wrapper for invoking returndatacopy
+        //        with these arguments in the postprocessing step
+
+        // Remove (ignore) this stack item here
+        spOffset--
       } else if (input === 'length' && (opcode === 'CALL' || opcode === 'CALLCODE')) {
         // CALLs in EVM have 7 arguments
         // but in ewasm CALLs only have 5 arguments
@@ -303,12 +312,6 @@ function generateManifest (interfaceManifest, opts) {
 
         call += `(get_local $length${numOfLocals})`
         numOfLocals++
-
-        // delete 6th stack element
-        spOffset--
-
-        // delete 7th stack element
-        spOffset--
       } else if (input === 'length' && (opcode !== 'CALL' && opcode !== 'CALLCODE')) {
         locals += `(local $length${numOfLocals} i32)`
         body += `(set_local $length${numOfLocals} ${checkOverflowStackItem256(spOffset)})`
@@ -376,6 +379,8 @@ function generateManifest (interfaceManifest, opts) {
         (i32.eqz ${call}) ;; flip CALL result from EEI to EVM convention (0 -> 1, 1,2,.. -> 1)
       )))`
 
+      // FIXME: add callReturnMemory* handling here
+
       } else {
         call =
           `(i64.store