More logic cleanup

Author: lrettig

wasm/generateInterface.js

@@ -334,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