Clean up logic to make code more readable

Author: lrettig

wasm/generateInterface.js

@@ -248,7 +248,7 @@ function generateManifest (interfaceManifest, opts) {
            (i64.load (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8})))
            (i64.load (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 2})))
            (i64.load (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 3}))))`
-      } else if (input === 'i64' && opcode !== 'CALL') {
+      } else if (input === 'i64') {
         call += `(call $check_overflow_i64
            (i64.load (i32.add (get_global $sp) (i32.const ${spOffset * 32})))
            (i64.load (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8})))
@@ -263,11 +263,7 @@ function generateManifest (interfaceManifest, opts) {
       (i64.load (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 2})))
       (i64.load (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 3})))))`
         call += `(get_local $offset${numOfLocals})`
-      } else if (input === 'length' && (opcode === 'CALL' || opcode === 'CALLCODE')) {
-        // CALLs in EVM have 7 arguments
-        // but in ewasm CALLs only have 5 arguments
-        // so delete the bottom two stack elements, after processing the 5th argument
-
+      } else if (input === 'length') {
         locals += `(local $length${numOfLocals} i32)`
         body += `(set_local $length${numOfLocals} 
     (call $check_overflow 
@@ -282,25 +278,13 @@ 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} 
-    (call $check_overflow 
-      (i64.load (i32.add (get_global $sp) (i32.const ${spOffset * 32})))
-      (i64.load (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8})))
-      (i64.load (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 2})))
-      (i64.load (i32.add (get_global $sp) (i32.const ${spOffset * 32 + 8 * 3})))))
-
-    (call $memusegas (get_local $offset${numOfLocals}) (get_local $length${numOfLocals}))
-    (set_local $offset${numOfLocals} (i32.add (get_global $memstart) (get_local $offset${numOfLocals})))`
-
-        call += `(get_local $length${numOfLocals})`
-        numOfLocals++
+        // CALLs in EVM have 7 arguments
+        // but in ewasm CALLs only have 5 arguments
+        // so delete the bottom two stack elements, after processing the 5th argument
+        if (opcode === 'CALL' || opcode === 'CALLCODE') {
+          spOffset--
+          spOffset--
+        }
       }
       spOffset--
     })
@@ -350,20 +334,16 @@ function generateManifest (interfaceManifest, opts) {
         call += '(get_local $callback)'
       }
 
+      let wrapper
       if (opcode === 'CALL' || opcode === 'CALLCODE' || opcode === 'DELEGATECALL') {
-        call =
-          `(i64.store
-      (i32.add (get_global $sp) (i32.const ${spOffset * 32}))
-      (i64.extend_u/i32
-        (i32.eqz ${call}) ;; flip CALL result from EEI to EVM convention (0 -> 1, 1,2,.. -> 1)
-      )))`
+        // flip CALL result from EEI to EVM convention (0 -> 1, 1,2,.. -> 0)
+        wrapper = `(i32.eqz ${call})`
       } else {
-        call =
-          `(i64.store
-      (i32.add (get_global $sp) (i32.const ${spOffset * 32}))
-      (i64.extend_u/i32
-        ${call})))`
+        wrapper = call
       }
+      call = `(i64.store
+    (i32.add (get_global $sp) (i32.const ${spOffset * 32}))
+    (i64.extend_u/i32 ${wrapper})))`
 
       call += `
     ;; zero out mem