porffor 0.2.0-6aff0fa → 0.2.0-767de65

package/compiler/{codeGen.js → codegen.js}

@@ -8,6 +8,7 @@ import { log } from "./log.js";
 import parse from "./parse.js";
 import * as Rhemyn from "../rhemyn/compile.js";
 import Prefs from './prefs.js';
+import { TYPES, TYPE_NAMES } from './types.js';
 
 let globals = {};
 let globalInd = 0;
@@ -24,35 +25,37 @@ const debug = str => {
   const logChar = n => {
     code.push(...number(n));
 
-    code.push(Opcodes.call);
-    code.push(...unsignedLEB128(0));
+    code.push([ Opcodes.call, 0 ]);
   };
 
   for (let i = 0; i < str.length; i++) {
     logChar(str.charCodeAt(i));
   }
 
-  logChar('\n'.charCodeAt(0));
+  logChar(10); // new line
 
   return code;
 };
 
-const todo = msg => {
-  class TodoError extends Error {
-    constructor(message) {
-      super(message);
-      this.name = 'TodoError';
-    }
+class TodoError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = 'TodoError';
   }
+}
+const todo = (scope, msg, expectsValue = undefined) => {
+  switch (Prefs.todoTime ?? 'runtime') {
+    case 'compile':
+      throw new TodoError(msg);
 
-  throw new TodoError(`todo: ${msg}`);
-
-  const code = [];
-
-  code.push(...debug(`todo! ` + msg));
-  code.push(Opcodes.unreachable);
+    case 'runtime':
+      return internalThrow(scope, 'TodoError', msg, expectsValue);
 
-  return code;
+      // return [
+      //   ...debug(`todo! ${msg}`),
+      //   [ Opcodes.unreachable ]
+      // ];
+  }
 };
 
 const isFuncType = type => type === 'FunctionDeclaration' || type === 'FunctionExpression' || type === 'ArrowFunctionExpression';
@@ -105,7 +108,7 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
       return generateUnary(scope, decl);
 
     case 'UpdateExpression':
-      return generateUpdate(scope, decl);
+      return generateUpdate(scope, decl, global, name, valueUnused);
 
     case 'IfStatement':
       return generateIf(scope, decl);
@@ -116,6 +119,9 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
     case 'WhileStatement':
       return generateWhile(scope, decl);
 
+    case 'DoWhileStatement':
+      return generateDoWhile(scope, decl);
+
     case 'ForOfStatement':
       return generateForOf(scope, decl);
 
@@ -125,6 +131,9 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
     case 'ContinueStatement':
       return generateContinue(scope, decl);
 
+    case 'LabeledStatement':
+      return generateLabel(scope, decl);
+
     case 'EmptyStatement':
       return generateEmpty(scope, decl);
 
@@ -138,7 +147,7 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
       return generateTry(scope, decl);
 
     case 'DebuggerStatement':
-      // todo: add fancy terminal debugger?
+      // todo: hook into terminal debugger
       return [];
 
     case 'ArrayExpression':
@@ -152,10 +161,16 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
       const funcsBefore = funcs.length;
       generate(scope, decl.declaration);
 
-      if (funcsBefore === funcs.length) throw new Error('no new func added in export');
+      if (funcsBefore !== funcs.length) {
+        // new func added
+        const newFunc = funcs[funcs.length - 1];
+        newFunc.export = true;
+      }
+
+      // if (funcsBefore === funcs.length) throw new Error('no new func added in export');
 
-      const newFunc = funcs[funcs.length - 1];
-      newFunc.export = true;
+      // const newFunc = funcs[funcs.length - 1];
+      // newFunc.export = true;
 
       return [];
 
@@ -202,33 +217,42 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
         },
 
         __Porffor_bs: str => [
-          ...makeString(scope, str, undefined, undefined, true),
+          ...makeString(scope, str, global, name, true),
 
-          ...number(TYPES._bytestring, Valtype.i32),
-          setLastType(scope)
+          ...(name ? setType(scope, name, TYPES._bytestring) : [
+            ...number(TYPES._bytestring, Valtype.i32),
+            ...setLastType(scope)
+          ])
         ],
         __Porffor_s: str => [
-          ...makeString(scope, str, undefined, undefined, false),
+          ...makeString(scope, str, global, name, false),
 
-          ...number(TYPES.string, Valtype.i32),
-          setLastType(scope)
+          ...(name ? setType(scope, name, TYPES.string) : [
+            ...number(TYPES.string, Valtype.i32),
+            ...setLastType(scope)
+          ])
         ],
       };
 
-      const name = decl.tag.name;
+      const func = decl.tag.name;
       // hack for inline asm
-      if (!funcs[name]) return todo('tagged template expressions not implemented');
+      if (!funcs[func]) return todo(scope, 'tagged template expressions not implemented', true);
 
       const { quasis, expressions } = decl.quasi;
       let str = quasis[0].value.raw;
 
       for (let i = 0; i < expressions.length; i++) {
         const e = expressions[i];
-        str += lookupName(scope, e.name)[0].idx;
+        if (!e.name) {
+          if (e.type === 'BinaryExpression' && e.operator === '+' && e.left.type === 'Identifier' && e.right.type === 'Literal') {
+            str += lookupName(scope, e.left.name)[0].idx + e.right.value;
+          } else todo(scope, 'unsupported expression in intrinsic');
+        } else str += lookupName(scope, e.name)[0].idx;
+
         str += quasis[i + 1].value.raw;
       }
 
-      return funcs[name](str);
+      return funcs[func](str);
     }
 
     default:
@@ -238,7 +262,7 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
         return [];
       }
 
-      return todo(`no generation for ${decl.type}!`);
+      return todo(scope, `no generation for ${decl.type}!`);
   }
 };
 
@@ -266,7 +290,7 @@ const lookupName = (scope, _name) => {
   return [ undefined, undefined ];
 };
 
-const internalThrow = (scope, constructor, message, expectsValue = false) => [
+const internalThrow = (scope, constructor, message, expectsValue = Prefs.alwaysValueInternalThrows) => [
   ...generateThrow(scope, {
     argument: {
       type: 'NewExpression',
@@ -293,7 +317,7 @@ const generateIdent = (scope, decl) => {
 
       let wasm = builtinVars[name];
       if (typeof wasm === 'function') wasm = asmFuncToAsm(wasm, { name });
-      return wasm;
+      return wasm.slice();
     }
 
     if (Object.hasOwn(builtinFuncs, name) || Object.hasOwn(internalConstrs, name)) {
@@ -301,6 +325,11 @@ const generateIdent = (scope, decl) => {
       return number(1);
     }
 
+    if (isExistingProtoFunc(name)) {
+      // todo: return an actual something
+      return number(1);
+    }
+
     if (local?.idx === undefined) {
       // no local var with name
       if (Object.hasOwn(importedFuncs, name)) return number(importedFuncs[name]);
@@ -331,14 +360,18 @@ const generateReturn = (scope, decl) => {
     // just bare "return"
     return [
       ...number(UNDEFINED), // "undefined" if func returns
-      ...number(TYPES.undefined, Valtype.i32), // type undefined
+      ...(scope.returnType != null ? [] : [
+        ...number(TYPES.undefined, Valtype.i32) // type undefined
+      ]),
       [ Opcodes.return ]
     ];
   }
 
   return [
     ...generate(scope, decl.argument),
-    ...getNodeType(scope, decl.argument),
+    ...(scope.returnType != null ? [] : [
+      ...getNodeType(scope, decl.argument)
+    ]),
     [ Opcodes.return ]
   ];
 };
@@ -352,7 +385,8 @@ const localTmp = (scope, name, type = valtypeBinary) => {
   return idx;
 };
 
-const isIntOp = op => op && (op[0] >= 0xb7 && op[0] <= 0xba);
+const isIntOp = op => op && ((op[0] >= 0x45 && op[0] <= 0x4f) || (op[0] >= 0x67 && op[0] <= 0x78) || op[0] === 0x41);
+const isFloatToIntOp = op => op && (op[0] >= 0xb7 && op[0] <= 0xba);
 
 const performLogicOp = (scope, op, left, right, leftType, rightType) => {
   const checks = {
@@ -361,7 +395,7 @@ const performLogicOp = (scope, op, left, right, leftType, rightType) => {
     '??': nullish
   };
 
-  if (!checks[op]) return todo(`logic operator ${op} not implemented yet`);
+  if (!checks[op]) return todo(scope, `logic operator ${op} not implemented yet`, true);
 
   // generic structure for {a} OP {b}
   // -->
@@ -369,8 +403,8 @@ const performLogicOp = (scope, op, left, right, leftType, rightType) => {
 
   // if we can, use int tmp and convert at the end to help prevent unneeded conversions
   // (like if we are in an if condition - very common)
-  const leftIsInt = isIntOp(left[left.length - 1]);
-  const rightIsInt = isIntOp(right[right.length - 1]);
+  const leftIsInt = isFloatToIntOp(left[left.length - 1]);
+  const rightIsInt = isFloatToIntOp(right[right.length - 1]);
 
   const canInt = leftIsInt && rightIsInt;
 
@@ -387,12 +421,12 @@ const performLogicOp = (scope, op, left, right, leftType, rightType) => {
       ...right,
       // note type
       ...rightType,
-      setLastType(scope),
+      ...setLastType(scope),
       [ Opcodes.else ],
       [ Opcodes.local_get, localTmp(scope, 'logictmpi', Valtype.i32) ],
       // note type
       ...leftType,
-      setLastType(scope),
+      ...setLastType(scope),
       [ Opcodes.end ],
       Opcodes.i32_from
     ];
@@ -406,17 +440,17 @@ const performLogicOp = (scope, op, left, right, leftType, rightType) => {
     ...right,
     // note type
     ...rightType,
-    setLastType(scope),
+    ...setLastType(scope),
     [ Opcodes.else ],
     [ Opcodes.local_get, localTmp(scope, 'logictmp') ],
     // note type
     ...leftType,
-    setLastType(scope),
+    ...setLastType(scope),
     [ Opcodes.end ]
   ];
 };
 
-const concatStrings = (scope, left, right, global, name, assign) => {
+const concatStrings = (scope, left, right, global, name, assign = false, bytestrings = false) => {
   // todo: this should be rewritten into a built-in/func: String.prototype.concat
   // todo: convert left and right to strings if not
   // todo: optimize by looking up names in arrays and using that if exists?
@@ -427,7 +461,7 @@ const concatStrings = (scope, left, right, global, name, assign) => {
   const leftLength = localTmp(scope, 'concat_left_length', Valtype.i32);
 
   if (assign) {
-    const pointer = arrays.get(name ?? '$undeclared');
+    const pointer = scope.arrays?.get(name ?? '$undeclared');
 
     return [
       // setup right
@@ -452,11 +486,11 @@ const concatStrings = (scope, left, right, global, name, assign) => {
       [ Opcodes.i32_store, Math.log2(ValtypeSize.i32) - 1, ...unsignedLEB128(pointer) ],
 
       // copy right
-      // dst = out pointer + length size + current length * i16 size
+      // dst = out pointer + length size + current length * sizeof valtype
       ...number(pointer + ValtypeSize.i32, Valtype.i32),
 
       [ Opcodes.local_get, leftLength ],
-      ...number(ValtypeSize.i16, Valtype.i32),
+      ...number(bytestrings ? ValtypeSize.i8 : ValtypeSize.i16, Valtype.i32),
       [ Opcodes.i32_mul ],
       [ Opcodes.i32_add ],
 
@@ -465,9 +499,9 @@ const concatStrings = (scope, left, right, global, name, assign) => {
       ...number(ValtypeSize.i32, Valtype.i32),
       [ Opcodes.i32_add ],
 
-      // size = right length * i16 size
+      // size = right length * sizeof valtype
       [ Opcodes.local_get, rightLength ],
-      ...number(ValtypeSize.i16, Valtype.i32),
+      ...number(bytestrings ? ValtypeSize.i8 : ValtypeSize.i16, Valtype.i32),
       [ Opcodes.i32_mul ],
 
       [ ...Opcodes.memory_copy, 0x00, 0x00 ],
@@ -525,11 +559,11 @@ const concatStrings = (scope, left, right, global, name, assign) => {
     [ ...Opcodes.memory_copy, 0x00, 0x00 ],
 
     // copy right
-    // dst = out pointer + length size + left length * i16 size
+    // dst = out pointer + length size + left length * sizeof valtype
     ...number(pointer + ValtypeSize.i32, Valtype.i32),
 
     [ Opcodes.local_get, leftLength ],
-    ...number(ValtypeSize.i16, Valtype.i32),
+    ...number(bytestrings ? ValtypeSize.i8 : ValtypeSize.i16, Valtype.i32),
     [ Opcodes.i32_mul ],
     [ Opcodes.i32_add ],
 
@@ -538,9 +572,9 @@ const concatStrings = (scope, left, right, global, name, assign) => {
     ...number(ValtypeSize.i32, Valtype.i32),
     [ Opcodes.i32_add ],
 
-    // size = right length * i16 size
+    // size = right length * sizeof valtype
     [ Opcodes.local_get, rightLength ],
-    ...number(ValtypeSize.i16, Valtype.i32),
+    ...number(bytestrings ? ValtypeSize.i8 : ValtypeSize.i16, Valtype.i32),
     [ Opcodes.i32_mul ],
 
     [ ...Opcodes.memory_copy, 0x00, 0x00 ],
@@ -550,7 +584,7 @@ const concatStrings = (scope, left, right, global, name, assign) => {
   ];
 };
 
-const compareStrings = (scope, left, right) => {
+const compareStrings = (scope, left, right, bytestrings = false) => {
   // todo: this should be rewritten into a func
   // todo: convert left and right to strings if not
   // todo: optimize by looking up names in arrays and using that if exists?
@@ -559,7 +593,6 @@ const compareStrings = (scope, left, right) => {
   const leftPointer = localTmp(scope, 'compare_left_pointer', Valtype.i32);
   const leftLength = localTmp(scope, 'compare_left_length', Valtype.i32);
   const rightPointer = localTmp(scope, 'compare_right_pointer', Valtype.i32);
-  const rightLength = localTmp(scope, 'compare_right_length', Valtype.i32);
 
   const index = localTmp(scope, 'compare_index', Valtype.i32);
   const indexEnd = localTmp(scope, 'compare_index_end', Valtype.i32);
@@ -587,7 +620,6 @@ const compareStrings = (scope, left, right) => {
 
     [ Opcodes.local_get, rightPointer ],
     [ Opcodes.i32_load, Math.log2(ValtypeSize[valtype]) - 1, ...unsignedLEB128(0) ],
-    [ Opcodes.local_tee, rightLength ],
 
     // fast path: check leftLength != rightLength
     [ Opcodes.i32_ne ],
@@ -602,11 +634,13 @@ const compareStrings = (scope, left, right) => {
     ...number(0, Valtype.i32),
     [ Opcodes.local_set, index ],
 
-    // setup index end as length * sizeof i16 (2)
+    // setup index end as length * sizeof valtype (1 for bytestring, 2 for string)
     // we do this instead of having to do mul/div each iter for perf™
     [ Opcodes.local_get, leftLength ],
-    ...number(ValtypeSize.i16, Valtype.i32),
-    [ Opcodes.i32_mul ],
+    ...(bytestrings ? [] : [
+      ...number(ValtypeSize.i16, Valtype.i32),
+      [ Opcodes.i32_mul ],
+    ]),
     [ Opcodes.local_set, indexEnd ],
 
     // iterate over each char and check if eq
@@ -616,13 +650,17 @@ const compareStrings = (scope, left, right) => {
     [ Opcodes.local_get, index ],
     [ Opcodes.local_get, leftPointer ],
     [ Opcodes.i32_add ],
-    [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ...unsignedLEB128(ValtypeSize.i32) ],
+    bytestrings ?
+      [ Opcodes.i32_load8_u, 0, ValtypeSize.i32 ] :
+      [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 ],
 
     // fetch right
     [ Opcodes.local_get, index ],
     [ Opcodes.local_get, rightPointer ],
     [ Opcodes.i32_add ],
-    [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ...unsignedLEB128(ValtypeSize.i32) ],
+    bytestrings ?
+      [ Opcodes.i32_load8_u, 0, ValtypeSize.i32 ] :
+      [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 ],
 
     // not equal, "return" false
     [ Opcodes.i32_ne ],
@@ -631,13 +669,13 @@ const compareStrings = (scope, left, right) => {
     [ Opcodes.br, 2 ],
     [ Opcodes.end ],
 
-    // index += sizeof i16 (2)
+    // index += sizeof valtype (1 for bytestring, 2 for string)
     [ Opcodes.local_get, index ],
-    ...number(ValtypeSize.i16, Valtype.i32),
+    ...number(bytestrings ? ValtypeSize.i8 : ValtypeSize.i16, Valtype.i32),
     [ Opcodes.i32_add ],
     [ Opcodes.local_tee, index ],
 
-    // if index != index end (length * sizeof 16), loop
+    // if index != index end (length * sizeof valtype), loop
     [ Opcodes.local_get, indexEnd ],
     [ Opcodes.i32_ne ],
     [ Opcodes.br_if, 0 ],
@@ -658,13 +696,14 @@ const compareStrings = (scope, left, right) => {
 };
 
 const truthy = (scope, wasm, type, intIn = false, intOut = false) => {
-  if (isIntOp(wasm[wasm.length - 1])) return [
+  if (isFloatToIntOp(wasm[wasm.length - 1])) return [
     ...wasm,
     ...(!intIn && intOut ? [ Opcodes.i32_to_u ] : [])
   ];
+  // if (isIntOp(wasm[wasm.length - 1])) return [ ...wasm ];
 
   const useTmp = knownType(scope, type) == null;
-  const tmp = useTmp && localTmp(scope, `$logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
+  const tmp = useTmp && localTmp(scope, `#logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
 
   const def = [
     // if value != 0
@@ -716,7 +755,7 @@ const truthy = (scope, wasm, type, intIn = false, intOut = false) => {
 
 const falsy = (scope, wasm, type, intIn = false, intOut = false) => {
   const useTmp = knownType(scope, type) == null;
-  const tmp = useTmp && localTmp(scope, `$logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
+  const tmp = useTmp && localTmp(scope, `#logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
 
   return [
     ...wasm,
@@ -762,7 +801,7 @@ const falsy = (scope, wasm, type, intIn = false, intOut = false) => {
 
 const nullish = (scope, wasm, type, intIn = false, intOut = false) => {
   const useTmp = knownType(scope, type) == null;
-  const tmp = useTmp && localTmp(scope, `$logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
+  const tmp = useTmp && localTmp(scope, `#logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
 
   return [
     ...wasm,
@@ -856,11 +895,11 @@ const performOp = (scope, op, left, right, leftType, rightType, _global = false,
   // todo: if equality op and an operand is undefined, return false
   // todo: niche null hell with 0
 
-  // todo: this should be dynamic but for now only static
   if (knownLeft === TYPES.string || knownRight === TYPES.string) {
     if (op === '+') {
+      // todo: this should be dynamic too but for now only static
       // string concat (a + b)
-      return concatStrings(scope, left, right, _global, _name, assign);
+      return concatStrings(scope, left, right, _global, _name, assign, false);
     }
 
     // not an equality op, NaN
@@ -883,6 +922,33 @@ const performOp = (scope, op, left, right, leftType, rightType, _global = false,
     }
   }
 
+  if (knownLeft === TYPES._bytestring || knownRight === TYPES._bytestring) {
+    if (op === '+') {
+      // todo: this should be dynamic too but for now only static
+      // string concat (a + b)
+      return concatStrings(scope, left, right, _global, _name, assign, true);
+    }
+
+    // not an equality op, NaN
+    if (!eqOp) return number(NaN);
+
+    // else leave bool ops
+    // todo: convert string to number if string and number/bool
+    // todo: string (>|>=|<|<=) string
+
+    // string comparison
+    if (op === '===' || op === '==') {
+      return compareStrings(scope, left, right, true);
+    }
+
+    if (op === '!==' || op === '!=') {
+      return [
+        ...compareStrings(scope, left, right, true),
+        [ Opcodes.i32_eqz ]
+      ];
+    }
+  }
+
   let ops = operatorOpcode[valtype][op];
 
   // some complex ops are implemented as builtin funcs
@@ -898,23 +964,62 @@ const performOp = (scope, op, left, right, leftType, rightType, _global = false,
     ]);
   }
 
-  if (!ops) return todo(`operator ${op} not implemented yet`); // throw new Error(`unknown operator ${op}`);
+  if (!ops) return todo(scope, `operator ${op} not implemented yet`, true);
 
   if (!Array.isArray(ops)) ops = [ ops ];
   ops = [ ops ];
 
   let tmpLeft, tmpRight;
   // if equal op, check if strings for compareStrings
-  if (op === '===' || op === '==' || op === '!==' || op === '!=') (() => {
-    // todo: intelligent partial skip later
-    // if neither known are string, stop this madness
-    if ((knownLeft != null && knownLeft !== TYPES.string) && (knownRight != null && knownRight !== TYPES.string)) {
-      return;
-    }
+  // todo: intelligent partial skip later
+  // if neither known are string, stop this madness
+  // we already do known checks earlier, so don't need to recheck
 
+  if ((op === '===' || op === '==' || op === '!==' || op === '!=') && (knownLeft == null && knownRight == null)) {
     tmpLeft = localTmp(scope, '__tmpop_left');
     tmpRight = localTmp(scope, '__tmpop_right');
 
+    // returns false for one string, one not - but more ops/slower
+    // ops.unshift(...stringOnly([
+    //   // if left is string
+    //   ...leftType,
+    //   ...number(TYPES.string, Valtype.i32),
+    //   [ Opcodes.i32_eq ],
+
+    //   // if right is string
+    //   ...rightType,
+    //   ...number(TYPES.string, Valtype.i32),
+    //   [ Opcodes.i32_eq ],
+
+    //   // if either are true
+    //   [ Opcodes.i32_or ],
+    //   [ Opcodes.if, Blocktype.void ],
+
+    //   // todo: convert non-strings to strings, for now fail immediately if one is not
+    //   // if left is not string
+    //   ...leftType,
+    //   ...number(TYPES.string, Valtype.i32),
+    //   [ Opcodes.i32_ne ],
+
+    //   // if right is not string
+    //   ...rightType,
+    //   ...number(TYPES.string, Valtype.i32),
+    //   [ Opcodes.i32_ne ],
+
+    //   // if either are true
+    //   [ Opcodes.i32_or ],
+    //   [ Opcodes.if, Blocktype.void ],
+    //   ...number(0, Valtype.i32),
+    //   [ Opcodes.br, 2 ],
+    //   [ Opcodes.end ],
+
+    //   ...compareStrings(scope, [ [ Opcodes.local_get, tmpLeft ] ], [ [ Opcodes.local_get, tmpRight ] ]),
+    //   ...(op === '!==' || op === '!=' ? [ [ Opcodes.i32_eqz ] ] : []),
+    //   [ Opcodes.br, 1 ],
+    //   [ Opcodes.end ],
+    // ]));
+
+    // does not handle one string, one not (such cases go past)
     ops.unshift(...stringOnly([
       // if left is string
       ...leftType,
@@ -926,30 +1031,28 @@ const performOp = (scope, op, left, right, leftType, rightType, _global = false,
       ...number(TYPES.string, Valtype.i32),
       [ Opcodes.i32_eq ],
 
-      // if either are true
-      [ Opcodes.i32_or ],
+      // if both are true
+      [ Opcodes.i32_and ],
       [ Opcodes.if, Blocktype.void ],
+      ...compareStrings(scope, [ [ Opcodes.local_get, tmpLeft ] ], [ [ Opcodes.local_get, tmpRight ] ]),
+      ...(op === '!==' || op === '!=' ? [ [ Opcodes.i32_eqz ] ] : []),
+      [ Opcodes.br, 1 ],
+      [ Opcodes.end ],
 
-      // todo: convert non-strings to strings, for now fail immediately if one is not
-      // if left is not string
+      // if left is bytestring
       ...leftType,
-      ...number(TYPES.string, Valtype.i32),
-      [ Opcodes.i32_ne ],
+      ...number(TYPES._bytestring, Valtype.i32),
+      [ Opcodes.i32_eq ],
 
-      // if right is not string
+      // if right is bytestring
       ...rightType,
-      ...number(TYPES.string, Valtype.i32),
-      [ Opcodes.i32_ne ],
+      ...number(TYPES._bytestring, Valtype.i32),
+      [ Opcodes.i32_eq ],
 
-      // if either are true
-      [ Opcodes.i32_or ],
+      // if both are true
+      [ Opcodes.i32_and ],
       [ Opcodes.if, Blocktype.void ],
-      ...number(0, Valtype.i32),
-      [ Opcodes.br, 2 ],
-      [ Opcodes.end ],
-
-      ...compareStrings(scope, [ [ Opcodes.local_get, tmpLeft ] ], [ [ Opcodes.local_get, tmpRight ] ]),
-      // ...compareStrings(scope, [ [ Opcodes.local_get, tmpLeft ] ], [ [ Opcodes.local_get, tmpRight ] ]),
+      ...compareStrings(scope, [ [ Opcodes.local_get, tmpLeft ] ], [ [ Opcodes.local_get, tmpRight ] ], true),
       ...(op === '!==' || op === '!=' ? [ [ Opcodes.i32_eqz ] ] : []),
       [ Opcodes.br, 1 ],
       [ Opcodes.end ],
@@ -961,7 +1064,7 @@ const performOp = (scope, op, left, right, leftType, rightType, _global = false,
       // endOut.push(stringOnly([ Opcodes.end ]));
       endOut.unshift(stringOnly([ Opcodes.end ]));
     // }
-  })();
+  }
 
   return finalize([
     ...left,
@@ -1037,7 +1140,7 @@ const asmFunc = (name, { wasm, params, locals: localTypes, globals: globalTypes
     params,
     locals,
     returns,
-    returnType: TYPES[returnType ?? 'number'],
+    returnType: returnType ?? TYPES.number,
     wasm,
     internal: true,
     index: currentFuncIndex++
@@ -1060,6 +1163,7 @@ const generateLogicExp = (scope, decl) => {
   return performLogicOp(scope, decl.operator, generate(scope, decl.left), generate(scope, decl.right), getNodeType(scope, decl.left), getNodeType(scope, decl.right));
 };
 
+// potential future ideas for nan boxing (unused):
 // T = JS type, V = value/pointer
 // 0bTTT
 // qNAN: 0 11111111111 1000000000000000000000000000000000000000000000000001
@@ -1083,40 +1187,18 @@ const generateLogicExp = (scope, decl) => {
 // 4: internal type
 // 5: pointer
 
-const TYPES = {
-  number: 0x00,
-  boolean: 0x01,
-  string: 0x02,
-  undefined: 0x03,
-  object: 0x04,
-  function: 0x05,
-  symbol: 0x06,
-  bigint: 0x07,
-
-  // these are not "typeof" types but tracked internally
-  _array: 0x10,
-  _regexp: 0x11,
-  _bytestring: 0x12
-};
-
-const TYPE_NAMES = {
-  [TYPES.number]: 'Number',
-  [TYPES.boolean]: 'Boolean',
-  [TYPES.string]: 'String',
-  [TYPES.undefined]: 'undefined',
-  [TYPES.object]: 'Object',
-  [TYPES.function]: 'Function',
-  [TYPES.symbol]: 'Symbol',
-  [TYPES.bigint]: 'BigInt',
-
-  [TYPES._array]: 'Array',
-  [TYPES._regexp]: 'RegExp',
-  [TYPES._bytestring]: 'ByteString'
+const isExistingProtoFunc = name => {
+  if (name.startsWith('__Array_prototype')) return !!prototypeFuncs[TYPES._array][name.slice(18)];
+  if (name.startsWith('__String_prototype_')) return !!prototypeFuncs[TYPES.string][name.slice(19)];
+
+  return false;
 };
 
 const getType = (scope, _name) => {
   const name = mapName(_name);
 
+  // if (scope.locals[name] && !scope.locals[name + '#type']) console.log(name);
+
   if (typedInput && scope.locals[name]?.metadata?.type != null) return number(scope.locals[name].metadata.type, Valtype.i32);
   if (scope.locals[name]) return [ [ Opcodes.local_get, scope.locals[name + '#type'].idx ] ];
 
@@ -1124,11 +1206,10 @@ const getType = (scope, _name) => {
   if (globals[name]) return [ [ Opcodes.global_get, globals[name + '#type'].idx ] ];
 
   let type = TYPES.undefined;
-  if (builtinVars[name]) type = TYPES[builtinVars[name].type ?? 'number'];
+  if (builtinVars[name]) type = builtinVars[name].type ?? TYPES.number;
   if (builtinFuncs[name] !== undefined || importedFuncs[name] !== undefined || funcIndex[name] !== undefined || internalConstrs[name] !== undefined) type = TYPES.function;
 
-  if (name.startsWith('__Array_prototype_') && prototypeFuncs[TYPES._array][name.slice(18)] ||
-    name.startsWith('__String_prototype_') && prototypeFuncs[TYPES.string][name.slice(19)]) type = TYPES.function;
+  if (isExistingProtoFunc(name)) type = TYPES.function;
 
   return number(type, Valtype.i32);
 };
@@ -1151,15 +1232,16 @@ const setType = (scope, _name, type) => {
   ];
 
   // throw new Error('could not find var');
+  return [];
 };
 
 const getLastType = scope => {
   scope.gotLastType = true;
-  return [ Opcodes.local_get, localTmp(scope, '#last_type', Valtype.i32) ];
+  return [ [ Opcodes.local_get, localTmp(scope, '#last_type', Valtype.i32) ] ];
 };
 
 const setLastType = scope => {
-  return [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ];
+  return [ [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ] ];
 };
 
 const getNodeType = (scope, node) => {
@@ -1184,7 +1266,7 @@ const getNodeType = (scope, node) => {
       const name = node.callee.name;
       if (!name) {
         // iife
-        if (scope.locals['#last_type']) return [ getLastType(scope) ];
+        if (scope.locals['#last_type']) return getLastType(scope);
 
         // presume
         // todo: warn here?
@@ -1198,7 +1280,7 @@ const getNodeType = (scope, node) => {
         if (func.returnType) return func.returnType;
       }
 
-      if (builtinFuncs[name] && !builtinFuncs[name].typedReturns) return TYPES[builtinFuncs[name].returnType ?? 'number'];
+      if (builtinFuncs[name] && !builtinFuncs[name].typedReturns) return builtinFuncs[name].returnType ?? TYPES.number;
       if (internalConstrs[name]) return internalConstrs[name].type;
 
       // check if this is a prototype function
@@ -1218,7 +1300,7 @@ const getNodeType = (scope, node) => {
         return TYPES.number;
       }
 
-      if (scope.locals['#last_type']) return [ getLastType(scope) ];
+      if (scope.locals['#last_type']) return getLastType(scope);
 
       // presume
       // todo: warn here?
@@ -1273,6 +1355,7 @@ const getNodeType = (scope, node) => {
 
       // todo: this should be dynamic but for now only static
       if (knownLeft === TYPES.string || knownRight === TYPES.string) return TYPES.string;
+      if (knownLeft === TYPES._bytestring || knownRight === TYPES._bytestring) return TYPES._bytestring;
 
       return TYPES.number;
 
@@ -1309,15 +1392,21 @@ const getNodeType = (scope, node) => {
 
       // ts hack
       if (scope.locals[node.object.name]?.metadata?.type === TYPES.string) return TYPES.string;
+      if (scope.locals[node.object.name]?.metadata?.type === TYPES._bytestring) return TYPES._bytestring;
       if (scope.locals[node.object.name]?.metadata?.type === TYPES._array) return TYPES.number;
 
-      if (scope.locals['#last_type']) return [ getLastType(scope) ];
+      if (scope.locals['#last_type']) return getLastType(scope);
 
       // presume
       return TYPES.number;
     }
 
-    if (scope.locals['#last_type']) return [ getLastType(scope) ];
+    if (node.type === 'TaggedTemplateExpression') {
+      // hack
+      if (node.tag.name.startsWith('__Porffor_')) return TYPES.number;
+    }
+
+    if (scope.locals['#last_type']) return getLastType(scope);
 
     // presume
     // todo: warn here?
@@ -1350,7 +1439,7 @@ const generateLiteral = (scope, decl, global, name) => {
       return makeString(scope, decl.value, global, name);
 
     default:
-      return todo(`cannot generate literal of type ${typeof decl.value}`);
+      return todo(scope, `cannot generate literal of type ${typeof decl.value}`, true);
   }
 };
 
@@ -1359,6 +1448,8 @@ const countLeftover = wasm => {
 
   for (let i = 0; i < wasm.length; i++) {
     const inst = wasm[i];
+    if (inst[0] == null) continue;
+
     if (depth === 0 && (inst[0] === Opcodes.if || inst[0] === Opcodes.block || inst[0] === Opcodes.loop)) {
       if (inst[0] === Opcodes.if) count--;
       if (inst[1] !== Blocktype.void) count++;
@@ -1470,10 +1561,21 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
     name = func.name;
   }
 
-  if (name === 'eval' && decl.arguments[0].type === 'Literal') {
+  if (name === 'eval' && decl.arguments[0]?.type === 'Literal') {
     // literal eval hack
-    const code = decl.arguments[0].value;
-    const parsed = parse(code, []);
+    const code = decl.arguments[0]?.value ?? '';
+
+    let parsed;
+    try {
+      parsed = parse(code, []);
+    } catch (e) {
+      if (e.name === 'SyntaxError') {
+        // throw syntax errors of evals at runtime instead
+        return internalThrow(scope, 'SyntaxError', e.message, true);
+      }
+
+      throw e;
+    }
 
     const out = generate(scope, {
       type: 'BlockStatement',
@@ -1487,13 +1589,13 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
       const finalStatement = parsed.body[parsed.body.length - 1];
       out.push(
         ...getNodeType(scope, finalStatement),
-        setLastType(scope)
+        ...setLastType(scope)
       );
     } else if (countLeftover(out) === 0) {
       out.push(...number(UNDEFINED));
       out.push(
         ...number(TYPES.undefined, Valtype.i32),
-        setLastType(scope)
+        ...setLastType(scope)
       );
     }
 
@@ -1515,6 +1617,9 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
 
     target = { ...decl.callee };
     target.name = spl.slice(0, -1).join('_');
+
+    // failed to lookup name, abort
+    if (!lookupName(scope, target.name)[0]) protoName = null;
   }
 
   // literal.func()
@@ -1537,7 +1642,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
         Opcodes.i32_from_u,
 
         ...number(TYPES.boolean, Valtype.i32),
-        setLastType(scope)
+        ...setLastType(scope)
       ];
     }
 
@@ -1562,12 +1667,30 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
   // }
 
   if (protoName) {
+    const protoBC = {};
+
+    const builtinProtoCands = Object.keys(builtinFuncs).filter(x => x.startsWith('__') && x.endsWith('_prototype_' + protoName));
+
+    if (!decl._protoInternalCall && builtinProtoCands.length > 0) {
+      for (const x of builtinProtoCands) {
+        const type = TYPES[x.split('_prototype_')[0].slice(2).toLowerCase()];
+        if (type == null) continue;
+
+        protoBC[type] = generateCall(scope, {
+          callee: {
+            name: x
+          },
+          arguments: [ target, ...decl.arguments ],
+          _protoInternalCall: true
+        });
+      }
+    }
+
     const protoCands = Object.keys(prototypeFuncs).reduce((acc, x) => {
       if (Object.hasOwn(prototypeFuncs[x], protoName)) acc[x] = prototypeFuncs[x][protoName];
       return acc;
     }, {});
 
-    // no prototype function candidates, ignore
     if (Object.keys(protoCands).length > 0) {
       // use local for cached i32 length as commonly used
       const lengthLocal = localTmp(scope, '__proto_length_cache', Valtype.i32);
@@ -1585,7 +1708,6 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
 
       let allOptUnused = true;
       let lengthI32CacheUsed = false;
-      const protoBC = {};
       for (const x in protoCands) {
         const protoFunc = protoCands[x];
         if (protoFunc.noArgRetLength && decl.arguments.length === 0) {
@@ -1593,7 +1715,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
             ...RTArrayUtil.getLength(getPointer),
 
             ...number(TYPES.number, Valtype.i32),
-            setLastType(scope)
+            ...setLastType(scope)
           ];
           continue;
         }
@@ -1630,7 +1752,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
           ...protoOut,
 
           ...number(protoFunc.returnType ?? TYPES.number, Valtype.i32),
-          setLastType(scope),
+          ...setLastType(scope),
           [ Opcodes.end ]
         ];
       }
@@ -1656,10 +1778,19 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
         }, allOptUnused && unusedValue ? Blocktype.void : valtypeBinary),
       ];
     }
+
+    if (Object.keys(protoBC).length > 0) {
+      return typeSwitch(scope, getNodeType(scope, target), {
+        ...protoBC,
+
+        // TODO: error better
+        default: internalThrow(scope, 'TypeError', `'${protoName}' proto func tried to be called on a type without an impl`)
+      }, valtypeBinary);
+    }
   }
 
   // TODO: only allows callee as literal
-  if (!name) return todo(`only literal callees (got ${decl.callee.type})`);
+  if (!name) return todo(scope, `only literal callees (got ${decl.callee.type})`);
 
   let idx = funcIndex[name] ?? importedFuncs[name];
   if (idx === undefined && builtinFuncs[name]) {
@@ -1695,9 +1826,28 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
   if (idx === undefined && name.startsWith('__Porffor_wasm_')) {
     const wasmOps = {
       // pointer, align, offset
-      i32_load8_u: { imms: 2, args: 1 },
+      i32_load: { imms: 2, args: 1, returns: 1 },
+      // pointer, value, align, offset
+      i32_store: { imms: 2, args: 2, returns: 0 },
+      // pointer, align, offset
+      i32_load8_u: { imms: 2, args: 1, returns: 1 },
       // pointer, value, align, offset
-      i32_store8: { imms: 2, args: 2 },
+      i32_store8: { imms: 2, args: 2, returns: 0 },
+      // pointer, align, offset
+      i32_load16_u: { imms: 2, args: 1, returns: 1 },
+      // pointer, value, align, offset
+      i32_store16: { imms: 2, args: 2, returns: 0 },
+
+      // pointer, align, offset
+      f64_load: { imms: 2, args: 1, returns: 1 },
+      // pointer, value, align, offset
+      f64_store: { imms: 2, args: 2, returns: 0 },
+
+      // value
+      i32_const: { imms: 1, args: 0, returns: 1 },
+
+      // a, b
+      i32_or: { imms: 0, args: 2, returns: 1 },
     };
 
     const opName = name.slice('__Porffor_wasm_'.length);
@@ -1706,28 +1856,32 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
       const op = wasmOps[opName];
 
       const argOut = [];
-      for (let i = 0; i < op.args; i++) argOut.push(...generate(scope, decl.arguments[i]));
+      for (let i = 0; i < op.args; i++) argOut.push(
+        ...generate(scope, decl.arguments[i]),
+        Opcodes.i32_to
+      );
 
       // literals only
       const imms = decl.arguments.slice(op.args).map(x => x.value);
 
       return [
         ...argOut,
-        [ Opcodes[opName], ...imms ]
+        [ Opcodes[opName], ...imms ],
+        ...(new Array(op.returns).fill(Opcodes.i32_from))
       ];
     }
   }
 
   if (idx === undefined) {
-    if (scope.locals[name] !== undefined || globals[name] !== undefined || builtinVars[name] !== undefined) return internalThrow(scope, 'TypeError', `${unhackName(name)} is not a function`);
-    return internalThrow(scope, 'ReferenceError', `${unhackName(name)} is not defined`);
+    if (scope.locals[name] !== undefined || globals[name] !== undefined || builtinVars[name] !== undefined) return internalThrow(scope, 'TypeError', `${unhackName(name)} is not a function`, true);
+    return internalThrow(scope, 'ReferenceError', `${unhackName(name)} is not defined`, true);
   }
 
   const func = funcs.find(x => x.index === idx);
 
   const userFunc = (funcIndex[name] && !importedFuncs[name] && !builtinFuncs[name] && !internalConstrs[name]) || idx === -1;
   const typedParams = userFunc || builtinFuncs[name]?.typedParams;
-  const typedReturns = userFunc || builtinFuncs[name]?.typedReturns;
+  const typedReturns = (func ? func.returnType == null : userFunc) || builtinFuncs[name]?.typedReturns;
   const paramCount = func && (typedParams ? func.params.length / 2 : func.params.length);
 
   let args = decl.arguments;
@@ -1748,7 +1902,11 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
     const arg = args[i];
     out = out.concat(generate(scope, arg));
 
-    if (builtinFuncs[name] && builtinFuncs[name].params[i] === Valtype.i32 && valtypeBinary !== Valtype.i32) {
+    if (builtinFuncs[name] && builtinFuncs[name].params[i * (typedParams ? 2 : 1)] === Valtype.i32 && valtypeBinary !== Valtype.i32) {
+      out.push(Opcodes.i32_to);
+    }
+
+    if (importedFuncs[name] && name.startsWith('profile')) {
       out.push(Opcodes.i32_to);
     }
 
@@ -1767,9 +1925,9 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
     //   ...number(type, Valtype.i32),
     //   [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
     // );
-  } else out.push(setLastType(scope));
+  } else out.push(...setLastType(scope));
 
-  if (builtinFuncs[name] && builtinFuncs[name].returns[0] === Valtype.i32 && valtypeBinary !== Valtype.i32) {
+  if (builtinFuncs[name] && builtinFuncs[name].returns?.[0] === Valtype.i32 && valtypeBinary !== Valtype.i32) {
     out.push(Opcodes.i32_from);
   }
 
@@ -1780,7 +1938,7 @@ const generateNew = (scope, decl, _global, _name) => {
   // hack: basically treat this as a normal call for builtins for now
   const name = mapName(decl.callee.name);
   if (internalConstrs[name] && !internalConstrs[name].notConstr) return internalConstrs[name].generate(scope, decl, _global, _name);
-  if (!builtinFuncs[name]) return todo(`new statement is not supported yet`); // return todo(`new statement is not supported yet (new ${unhackName(name)})`);
+  if (!builtinFuncs[name]) return todo(scope, `new statement is not supported yet`); // return todo(scope, `new statement is not supported yet (new ${unhackName(name)})`);
 
   return generateCall(scope, decl, _global, _name);
 };
@@ -1914,8 +2072,6 @@ const typeSwitch = (scope, type, bc, returns = valtypeBinary) => {
     [ Opcodes.block, returns ]
   ];
 
-  // todo: use br_table?
-
   for (const x in bc) {
     if (x === 'default') continue;
 
@@ -1971,12 +2127,14 @@ const addVarMetadata = (scope, name, global = false, metadata = {}) => {
 };
 
 const typeAnnoToPorfType = x => {
-  if (TYPES[x]) return TYPES[x];
-  if (TYPES['_' + x]) return TYPES['_' + x];
+  if (!x) return null;
+  if (TYPES[x] != null) return TYPES[x];
+  if (TYPES['_' + x] != null) return TYPES['_' + x];
 
   switch (x) {
     case 'i32':
     case 'i64':
+    case 'f64':
       return TYPES.number;
   }
 
@@ -1987,7 +2145,7 @@ const extractTypeAnnotation = decl => {
   let a = decl;
   while (a.typeAnnotation) a = a.typeAnnotation;
 
-  let type, elementType;
+  let type = null, elementType = null;
   if (a.typeName) {
     type = a.typeName.name;
   } else if (a.type.endsWith('Keyword')) {
@@ -2018,7 +2176,7 @@ const generateVar = (scope, decl) => {
   for (const x of decl.declarations) {
     const name = mapName(x.id.name);
 
-    if (!name) return todo('destructuring is not supported yet');
+    if (!name) return todo(scope, 'destructuring is not supported yet');
 
     if (x.init && isFuncType(x.init.type)) {
       // hack for let a = function () { ... }
@@ -2035,9 +2193,10 @@ const generateVar = (scope, decl) => {
       continue; // always ignore
     }
 
-    let idx = allocVar(scope, name, global, !x.id.typeAnnotation);
+    const typed = typedInput && x.id.typeAnnotation;
+    let idx = allocVar(scope, name, global, !typed);
 
-    if (typedInput && x.id.typeAnnotation) {
+    if (typed) {
       addVarMetadata(scope, name, global, extractTypeAnnotation(x.id));
     }
 
@@ -2055,7 +2214,8 @@ const generateVar = (scope, decl) => {
   return out;
 };
 
-const generateAssign = (scope, decl) => {
+// todo: optimize this func for valueUnused
+const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
   const { type, name } = decl.left;
 
   if (type === 'ObjectPattern') {
@@ -2073,9 +2233,9 @@ const generateAssign = (scope, decl) => {
   // hack: .length setter
   if (decl.left.type === 'MemberExpression' && decl.left.property.name === 'length') {
     const name = decl.left.object.name;
-    const pointer = arrays.get(name);
+    const pointer = scope.arrays?.get(name);
 
-    const aotPointer = pointer != null;
+    const aotPointer = Prefs.aotPointerOpt && pointer != null;
 
     const newValueTmp = localTmp(scope, '__length_setter_tmp');
 
@@ -2100,9 +2260,9 @@ const generateAssign = (scope, decl) => {
   // arr[i]
   if (decl.left.type === 'MemberExpression' && decl.left.computed) {
     const name = decl.left.object.name;
-    const pointer = arrays.get(name);
+    const pointer = scope.arrays?.get(name);
 
-    const aotPointer = pointer != null;
+    const aotPointer = Prefs.aotPointerOpt && pointer != null;
 
     const newValueTmp = localTmp(scope, '__member_setter_val_tmp');
     const pointerTmp = op === '=' ? -1 : localTmp(scope, '__member_setter_ptr_tmp', Valtype.i32);
@@ -2158,7 +2318,7 @@ const generateAssign = (scope, decl) => {
     ];
   }
 
-  if (!name) return todo('destructuring is not supported yet');
+  if (!name) return todo(scope, 'destructuring is not supported yet', true);
 
   const [ local, isGlobal ] = lookupName(scope, name);
 
@@ -2263,7 +2423,7 @@ const generateUnary = (scope, decl) => {
       return out;
     }
 
-    case 'delete':
+    case 'delete': {
       let toReturn = true, toGenerate = true;
 
       if (decl.argument.type === 'Identifier') {
@@ -2285,9 +2445,26 @@ const generateUnary = (scope, decl) => {
 
       out.push(...number(toReturn ? 1 : 0));
       return out;
+    }
+
+    case 'typeof': {
+      let overrideType, toGenerate = true;
+
+      if (decl.argument.type === 'Identifier') {
+        const out = generateIdent(scope, decl.argument);
 
-    case 'typeof':
-      return typeSwitch(scope, getNodeType(scope, decl.argument), {
+        // if ReferenceError (undeclared var), ignore and return undefined
+        if (out[1]) {
+          // does not exist (2 ops from throw)
+          overrideType = number(TYPES.undefined, Valtype.i32);
+          toGenerate = false;
+        }
+      }
+
+      const out = toGenerate ? generate(scope, decl.argument) : [];
+      disposeLeftover(out);
+
+      out.push(...typeSwitch(scope, overrideType ?? getNodeType(scope, decl.argument), {
         [TYPES.number]: makeString(scope, 'number', false, '#typeof_result'),
         [TYPES.boolean]: makeString(scope, 'boolean', false, '#typeof_result'),
         [TYPES.string]: makeString(scope, 'string', false, '#typeof_result'),
@@ -2298,27 +2475,30 @@ const generateUnary = (scope, decl) => {
 
         // object and internal types
         default: makeString(scope, 'object', false, '#typeof_result'),
-      });
+      }));
+
+      return out;
+    }
 
     default:
-      return todo(`unary operator ${decl.operator} not implemented yet`);
+      return todo(scope, `unary operator ${decl.operator} not implemented yet`, true);
   }
 };
 
-const generateUpdate = (scope, decl) => {
+const generateUpdate = (scope, decl, _global, _name, valueUnused = false) => {
   const { name } = decl.argument;
 
   const [ local, isGlobal ] = lookupName(scope, name);
 
   if (local === undefined) {
-    return todo(`update expression with undefined variable`);
+    return todo(scope, `update expression with undefined variable`, true);
   }
 
   const idx = local.idx;
   const out = [];
 
   out.push([ isGlobal ? Opcodes.global_get : Opcodes.local_get, idx ]);
-  if (!decl.prefix) out.push([ isGlobal ? Opcodes.global_get : Opcodes.local_get, idx ]);
+  if (!decl.prefix && !valueUnused) out.push([ isGlobal ? Opcodes.global_get : Opcodes.local_get, idx ]);
 
   switch (decl.operator) {
     case '++':
@@ -2331,7 +2511,7 @@ const generateUpdate = (scope, decl) => {
   }
 
   out.push([ isGlobal ? Opcodes.global_set : Opcodes.local_set, idx ]);
-  if (decl.prefix) out.push([ isGlobal ? Opcodes.global_get : Opcodes.local_get, idx ]);
+  if (decl.prefix && !valueUnused) out.push([ isGlobal ? Opcodes.global_get : Opcodes.local_get, idx ]);
 
   return out;
 };
@@ -2371,7 +2551,7 @@ const generateConditional = (scope, decl) => {
   // note type
   out.push(
     ...getNodeType(scope, decl.consequent),
-    setLastType(scope)
+    ...setLastType(scope)
   );
 
   out.push([ Opcodes.else ]);
@@ -2380,7 +2560,7 @@ const generateConditional = (scope, decl) => {
   // note type
   out.push(
     ...getNodeType(scope, decl.alternate),
-    setLastType(scope)
+    ...setLastType(scope)
   );
 
   out.push([ Opcodes.end ]);
@@ -2394,7 +2574,7 @@ const generateFor = (scope, decl) => {
   const out = [];
 
   if (decl.init) {
-    out.push(...generate(scope, decl.init));
+    out.push(...generate(scope, decl.init, false, undefined, true));
     disposeLeftover(out);
   }
 
@@ -2412,7 +2592,7 @@ const generateFor = (scope, decl) => {
   out.push(...generate(scope, decl.body));
   out.push([ Opcodes.end ]);
 
-  if (decl.update) out.push(...generate(scope, decl.update));
+  if (decl.update) out.push(...generate(scope, decl.update, false, undefined, true));
 
   out.push([ Opcodes.br, 1 ]);
   out.push([ Opcodes.end ], [ Opcodes.end ]);
@@ -2440,6 +2620,36 @@ const generateWhile = (scope, decl) => {
   return out;
 };
 
+const generateDoWhile = (scope, decl) => {
+  const out = [];
+
+  out.push([ Opcodes.loop, Blocktype.void ]);
+  depth.push('dowhile');
+
+  // block for break (includes all)
+  out.push([ Opcodes.block, Blocktype.void ]);
+  depth.push('block');
+
+  // block for continue
+  // includes body but not test+loop so we can exit body at anytime
+  // and still test+loop after
+  out.push([ Opcodes.block, Blocktype.void ]);
+  depth.push('block');
+
+  out.push(...generate(scope, decl.body));
+
+  out.push([ Opcodes.end ]);
+  depth.pop();
+
+  out.push(...generate(scope, decl.test), Opcodes.i32_to);
+  out.push([ Opcodes.br_if, 1 ]);
+
+  out.push([ Opcodes.end ], [ Opcodes.end ]);
+  depth.pop(); depth.pop();
+
+  return out;
+};
+
 const generateForOf = (scope, decl) => {
   const out = [];
 
@@ -2476,7 +2686,10 @@ const generateForOf = (scope, decl) => {
     generateVar(scope, { kind: 'var', _bare: true, declarations: [ { id: { name: leftName } } ] })
   }
 
+  // if (!leftName) console.log(decl.left?.declarations?.[0]?.id ?? decl.left);
+
   const [ local, isGlobal ] = lookupName(scope, leftName);
+  if (!local) return todo(scope, 'for of failed to get left local (probably destructure)');
 
   depth.push('block');
   depth.push('block');
@@ -2485,6 +2698,7 @@ const generateForOf = (scope, decl) => {
   // hack: this is naughty and will break things!
   let newOut = number(0, Valtype.f64), newPointer = -1;
   if (pages.hasAnyString) {
+    // todo: we use i16 even for bytestrings which should not make a bad thing happen, just be confusing for debugging?
     0, [ newOut, newPointer ] = makeArray(scope, {
       rawElements: new Array(1)
     }, isGlobal, leftName, true, 'i16');
@@ -2576,6 +2790,56 @@ const generateForOf = (scope, decl) => {
       [ Opcodes.end ],
       [ Opcodes.end ]
     ],
+    [TYPES._bytestring]: [
+      ...setType(scope, leftName, TYPES._bytestring),
+
+      [ Opcodes.loop, Blocktype.void ],
+
+      // setup new/out array
+      ...newOut,
+      [ Opcodes.drop ],
+
+      ...number(0, Valtype.i32), // base 0 for store after
+
+      // load current string ind {arg}
+      [ Opcodes.local_get, pointer ],
+      [ Opcodes.local_get, counter ],
+      [ Opcodes.i32_add ],
+      [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(ValtypeSize.i32) ],
+
+      // store to new string ind 0
+      [ Opcodes.i32_store8, 0, ...unsignedLEB128(newPointer + ValtypeSize.i32) ],
+
+      // return new string (page)
+      ...number(newPointer),
+
+      [ isGlobal ? Opcodes.global_set : Opcodes.local_set, local.idx ],
+
+      [ Opcodes.block, Blocktype.void ],
+      [ Opcodes.block, Blocktype.void ],
+      ...generate(scope, decl.body),
+      [ Opcodes.end ],
+
+      // increment iter pointer
+      // [ Opcodes.local_get, pointer ],
+      // ...number(1, Valtype.i32),
+      // [ Opcodes.i32_add ],
+      // [ Opcodes.local_set, pointer ],
+
+      // increment counter by 1
+      [ Opcodes.local_get, counter ],
+      ...number(1, Valtype.i32),
+      [ Opcodes.i32_add ],
+      [ Opcodes.local_tee, counter ],
+
+      // loop if counter != length
+      [ Opcodes.local_get, length ],
+      [ Opcodes.i32_ne ],
+      [ Opcodes.br_if, 1 ],
+
+      [ Opcodes.end ],
+      [ Opcodes.end ]
+    ],
     default: internalThrow(scope, 'TypeError', `Tried for..of on non-iterable type`)
   }, Blocktype.void));
 
@@ -2586,28 +2850,65 @@ const generateForOf = (scope, decl) => {
   return out;
 };
 
+// find the nearest loop in depth map by type
 const getNearestLoop = () => {
   for (let i = depth.length - 1; i >= 0; i--) {
-    if (depth[i] === 'while' || depth[i] === 'for' || depth[i] === 'forof') return i;
+    if (['while', 'dowhile', 'for', 'forof'].includes(depth[i])) return i;
   }
 
   return -1;
 };
 
 const generateBreak = (scope, decl) => {
-  const nearestLoop = depth.length - getNearestLoop();
+  const target = decl.label ? scope.labels.get(decl.label.name) : getNearestLoop();
+  const type = depth[target];
+
+  // different loop types have different branch offsets
+  // as they have different wasm block/loop/if structures
+  // we need to use the right offset by type to branch to the one we want
+  // for a break: exit the loop without executing anything else inside it
+  const offset = ({
+    for: 2, // loop > if (wanted branch) > block (we are here)
+    while: 2, // loop > if (wanted branch) (we are here)
+    dowhile: 2, // loop > block (wanted branch) > block (we are here)
+    forof: 2, // loop > block (wanted branch) > block (we are here)
+    if: 1 // break inside if, branch 0 to skip the rest of the if
+  })[type];
+
   return [
-    [ Opcodes.br, ...signedLEB128(nearestLoop - 2) ]
+    [ Opcodes.br, ...signedLEB128(depth.length - target - offset) ]
   ];
 };
 
 const generateContinue = (scope, decl) => {
-  const nearestLoop = depth.length - getNearestLoop();
+  const target = decl.label ? scope.labels.get(decl.label.name) : getNearestLoop();
+  const type = depth[target];
+
+  // different loop types have different branch offsets
+  // as they have different wasm block/loop/if structures
+  // we need to use the right offset by type to branch to the one we want
+  // for a continue: do test for the loop, and then loop depending on that success
+  const offset = ({
+    for: 3, // loop (wanted branch) > if > block (we are here)
+    while: 1, // loop (wanted branch) > if (we are here)
+    dowhile: 3, // loop > block > block (wanted branch) (we are here)
+    forof: 3 // loop > block > block (wanted branch) (we are here)
+  })[type];
+
   return [
-    [ Opcodes.br, ...signedLEB128(nearestLoop - 3) ]
+    [ Opcodes.br, ...signedLEB128(depth.length - target - offset) ]
   ];
 };
 
+const generateLabel = (scope, decl) => {
+  scope.labels ??= new Map();
+
+  const name = decl.label.name;
+  scope.labels.set(name, depth.length);
+
+  return generate(scope, decl.body);
+};
+
 const generateThrow = (scope, decl) => {
   scope.throws = true;
 
@@ -2640,7 +2941,7 @@ const generateThrow = (scope, decl) => {
 };
 
 const generateTry = (scope, decl) => {
-  if (decl.finalizer) return todo('try finally not implemented yet');
+  if (decl.finalizer) return todo(scope, 'try finally not implemented yet');
 
   const out = [];
 
@@ -2671,7 +2972,7 @@ const generateAssignPat = (scope, decl) => {
   // TODO
   // if identifier declared, use that
   // else, use default (right)
-  return todo('assignment pattern (optional arg)');
+  return todo(scope, 'assignment pattern (optional arg)');
 };
 
 let pages = new Map();
@@ -2750,16 +3051,20 @@ const getAllocType = itemType => {
 const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty = false, itemType = valtype) => {
   const out = [];
 
+  scope.arrays ??= new Map();
+
   let firstAssign = false;
-  if (!arrays.has(name) || name === '$undeclared') {
+  if (!scope.arrays.has(name) || name === '$undeclared') {
     firstAssign = true;
 
     // todo: can we just have 1 undeclared array? probably not? but this is not really memory efficient
     const uniqueName = name === '$undeclared' ? name + Math.random().toString().slice(2) : name;
-    arrays.set(name, allocPage(scope, `${getAllocType(itemType)}: ${uniqueName}`, itemType) * pageSize);
+
+    if (Prefs.scopedPageNames) scope.arrays.set(name, allocPage(scope, `${scope.name} | ${getAllocType(itemType)}: ${uniqueName}`, itemType) * pageSize);
+      else scope.arrays.set(name, allocPage(scope, `${getAllocType(itemType)}: ${uniqueName}`, itemType) * pageSize);
   }
 
-  const pointer = arrays.get(name);
+  const pointer = scope.arrays.get(name);
 
   const useRawElements = !!decl.rawElements;
   const elements = useRawElements ? decl.rawElements : decl.elements;
@@ -2845,20 +3150,29 @@ const makeString = (scope, str, global = false, name = '$undeclared', forceBytes
   }, global, name, false, byteStringable ? 'i8' : 'i16')[0];
 };
 
-let arrays = new Map();
 const generateArray = (scope, decl, global = false, name = '$undeclared', initEmpty = false) => {
   return makeArray(scope, decl, global, name, initEmpty, valtype)[0];
 };
 
 export const generateMember = (scope, decl, _global, _name) => {
   const name = decl.object.name;
-  const pointer = arrays.get(name);
+  const pointer = scope.arrays?.get(name);
 
-  const aotPointer = pointer != null;
+  const aotPointer = Prefs.aotPointerOpt && pointer != null;
 
   // hack: .length
   if (decl.property.name === 'length') {
-    // if (![TYPES._array, TYPES.string].includes(type)) return number(UNDEFINED);
+    const func = funcs.find(x => x.name === name);
+    if (func) {
+      const userFunc = funcIndex[name] && !importedFuncs[name] && !builtinFuncs[name] && !internalConstrs[name];
+      const typedParams = userFunc || builtinFuncs[name]?.typedParams;
+      return number(typedParams ? func.params.length / 2 : func.params.length);
+    }
+
+    if (builtinFuncs[name]) return number(builtinFuncs[name].typedParams ? (builtinFuncs[name].params.length / 2) : builtinFuncs[name].params.length);
+    if (importedFuncs[name]) return number(importedFuncs[name].params);
+    if (internalConstrs[name]) return number(internalConstrs[name].length ?? 0);
+
     return [
       ...(aotPointer ? number(0, Valtype.i32) : [
         ...generate(scope, decl.object),
@@ -2902,7 +3216,7 @@ export const generateMember = (scope, decl, _global, _name) => {
       [ Opcodes.load, Math.log2(ValtypeSize[valtype]) - 1, ...unsignedLEB128((aotPointer ? pointer : 0) + ValtypeSize.i32) ],
 
       ...number(TYPES.number, Valtype.i32),
-      setLastType(scope)
+      ...setLastType(scope)
     ],
 
     [TYPES.string]: [
@@ -2934,7 +3248,7 @@ export const generateMember = (scope, decl, _global, _name) => {
       ...number(newPointer),
 
       ...number(TYPES.string, Valtype.i32),
-      setLastType(scope)
+      ...setLastType(scope)
     ],
     [TYPES._bytestring]: [
       // setup new/out array
@@ -2953,19 +3267,19 @@ export const generateMember = (scope, decl, _global, _name) => {
       ]),
 
       // load current string ind {arg}
-      [ Opcodes.i32_load8_u, Math.log2(ValtypeSize.i16) - 1, ...unsignedLEB128((aotPointer ? pointer : 0) + ValtypeSize.i32) ],
+      [ Opcodes.i32_load8_u, 0, ...unsignedLEB128((aotPointer ? pointer : 0) + ValtypeSize.i32) ],
 
       // store to new string ind 0
-      [ Opcodes.i32_store8, Math.log2(ValtypeSize.i16) - 1, ...unsignedLEB128(newPointer + ValtypeSize.i32) ],
+      [ Opcodes.i32_store8, 0, ...unsignedLEB128(newPointer + ValtypeSize.i32) ],
 
       // return new string (page)
       ...number(newPointer),
 
       ...number(TYPES._bytestring, Valtype.i32),
-      setLastType(scope)
+      ...setLastType(scope)
     ],
 
-    default: internalThrow(scope, 'TypeError', 'Member expression is not supported for non-string non-array yet')
+    default: internalThrow(scope, 'TypeError', 'Member expression is not supported for non-string non-array yet', true)
   });
 };
 
@@ -2975,28 +3289,36 @@ const objectHack = node => {
   if (!node) return node;
 
   if (node.type === 'MemberExpression') {
-    if (node.computed || node.optional) return node;
+    const out = (() => {
+      if (node.computed || node.optional) return;
 
-    let objectName = node.object.name;
+      let objectName = node.object.name;
 
-    // if object is not identifier or another member exp, give up
-    if (node.object.type !== 'Identifier' && node.object.type !== 'MemberExpression') return node;
+      // if object is not identifier or another member exp, give up
+      if (node.object.type !== 'Identifier' && node.object.type !== 'MemberExpression') return;
+      if (objectName && ['undefined', 'null', 'NaN', 'Infinity'].includes(objectName)) return;
 
-    if (!objectName) objectName = objectHack(node.object)?.name?.slice?.(2);
+      if (!objectName) objectName = objectHack(node.object)?.name?.slice?.(2);
 
-    // if .length, give up (hack within a hack!)
-    if (node.property.name === 'length') return node;
+      // if .length, give up (hack within a hack!)
+      if (node.property.name === 'length') {
+        node.object = objectHack(node.object);
+        return;
+      }
 
-    // no object name, give up
-    if (!objectName) return node;
+      // no object name, give up
+      if (!objectName) return;
 
-    const name = '__' + objectName + '_' + node.property.name;
-    if (Prefs.codeLog) log('codegen', `object hack! ${node.object.name}.${node.property.name} -> ${name}`);
+      const name = '__' + objectName + '_' + node.property.name;
+      if (Prefs.codeLog) log('codegen', `object hack! ${node.object.name}.${node.property.name} -> ${name}`);
 
-    return {
-      type: 'Identifier',
-      name
-    };
+      return {
+        type: 'Identifier',
+        name
+      };
+    })();
+
+    if (out) return out;
   }
 
   for (const x in node) {
@@ -3010,8 +3332,8 @@ const objectHack = node => {
 };
 
 const generateFunc = (scope, decl) => {
-  if (decl.async) return todo('async functions are not supported');
-  if (decl.generator) return todo('generator functions are not supported');
+  if (decl.async) return todo(scope, 'async functions are not supported');
+  if (decl.generator) return todo(scope, 'generator functions are not supported');
 
   const name = decl.id ? decl.id.name : `anonymous_${randId()}`;
   const params = decl.params ?? [];
@@ -3027,6 +3349,11 @@ const generateFunc = (scope, decl) => {
     name
   };
 
+  if (typedInput && decl.returnType) {
+    innerScope.returnType = extractTypeAnnotation(decl.returnType).type;
+    innerScope.returns = [ valtypeBinary ];
+  }
+
   for (let i = 0; i < params.length; i++) {
     allocVar(innerScope, params[i].name, false);
 
@@ -3089,16 +3416,6 @@ const generateCode = (scope, decl) => {
 };
 
 const internalConstrs = {
-  Boolean: {
-    generate: (scope, decl) => {
-      if (decl.arguments.length === 0) return number(0);
-
-      // should generate/run all args
-      return truthy(scope, generate(scope, decl.arguments[0]), getNodeType(scope, decl.arguments[0]), false, false);
-    },
-    type: TYPES.boolean
-  },
-
   Array: {
     generate: (scope, decl, global, name) => {
       // new Array(i0, i1, ...)
@@ -3116,7 +3433,7 @@ const internalConstrs = {
 
       // todo: check in wasm instead of here
       const literalValue = arg.value ?? 0;
-      if (literalValue < 0 || !Number.isFinite(literalValue) || literalValue > 4294967295) return internalThrow(scope, 'RangeThrow', 'Invalid array length');
+      if (literalValue < 0 || !Number.isFinite(literalValue) || literalValue > 4294967295) return internalThrow(scope, 'RangeThrow', 'Invalid array length', true);
 
       return [
         ...number(0, Valtype.i32),
@@ -3127,7 +3444,8 @@ const internalConstrs = {
         ...number(pointer)
       ];
     },
-    type: TYPES._array
+    type: TYPES._array,
+    length: 1
   },
 
   __Array_of: {
@@ -3139,7 +3457,94 @@ const internalConstrs = {
       }, global, name);
     },
     type: TYPES._array,
+    notConstr: true,
+    length: 0
+  },
+
+  __Porffor_fastOr: {
+    generate: (scope, decl) => {
+      const out = [];
+
+      for (let i = 0; i < decl.arguments.length; i++) {
+        out.push(
+          ...generate(scope, decl.arguments[i]),
+          Opcodes.i32_to_u,
+          ...(i > 0 ? [ [ Opcodes.i32_or ] ] : [])
+        );
+      }
+
+      return out;
+    },
+    type: TYPES.boolean,
+    notConstr: true
+  },
+
+  __Porffor_fastAnd: {
+    generate: (scope, decl) => {
+      const out = [];
+
+      for (let i = 0; i < decl.arguments.length; i++) {
+        out.push(
+          ...generate(scope, decl.arguments[i]),
+          Opcodes.i32_to_u,
+          ...(i > 0 ? [ [ Opcodes.i32_and ] ] : [])
+        );
+      }
+
+      return out;
+    },
+    type: TYPES.boolean,
     notConstr: true
+  },
+
+  Boolean: {
+    generate: (scope, decl) => {
+      // todo: boolean object when used as constructor
+      const arg = decl.arguments[0] ?? DEFAULT_VALUE;
+      return truthy(scope, generate(scope, arg), getNodeType(scope, arg));
+    },
+    type: TYPES.boolean,
+    length: 1
+  },
+
+  __Math_max: {
+    generate: (scope, decl) => {
+      const out = [
+        ...number(-Infinity)
+      ];
+
+      for (let i = 0; i < decl.arguments.length; i++) {
+        out.push(
+          ...generate(scope, decl.arguments[i]),
+          [ Opcodes.f64_max ]
+        );
+      }
+
+      return out;
+    },
+    type: TYPES.number,
+    notConstr: true,
+    length: 2
+  },
+
+  __Math_min: {
+    generate: (scope, decl) => {
+      const out = [
+        ...number(Infinity)
+      ];
+
+      for (let i = 0; i < decl.arguments.length; i++) {
+        out.push(
+          ...generate(scope, decl.arguments[i]),
+          [ Opcodes.f64_min ]
+        );
+      }
+
+      return out;
+    },
+    type: TYPES.number,
+    notConstr: true,
+    length: 2
   }
 };
 
@@ -3168,7 +3573,6 @@ export default program => {
   funcs = [];
   funcIndex = {};
   depth = [];
-  arrays = new Map();
   pages = new Map();
   data = [];
   currentFuncIndex = importedFuncs.length;
@@ -3182,6 +3586,10 @@ export default program => {
 
   const valtypeInd = ['i32', 'i64', 'f64'].indexOf(valtype);
 
+  globalThis.pageSize = PageSize;
+  const pageSizeOpt = process.argv.find(x => x.startsWith('-page-size='));
+  if (pageSizeOpt) pageSize = parseInt(pageSizeOpt.split('=')[1]) * 1024;
+
   // set generic opcodes for current valtype
   Opcodes.const = [ Opcodes.i32_const, Opcodes.i64_const, Opcodes.f64_const ][valtypeInd];
   Opcodes.eq = [ Opcodes.i32_eq, Opcodes.i64_eq, Opcodes.f64_eq ][valtypeInd];
@@ -3190,10 +3598,10 @@ export default program => {
   Opcodes.add = [ Opcodes.i32_add, Opcodes.i64_add, Opcodes.f64_add ][valtypeInd];
   Opcodes.sub = [ Opcodes.i32_sub, Opcodes.i64_sub, Opcodes.f64_sub ][valtypeInd];
 
-  Opcodes.i32_to = [ [ null ], [ Opcodes.i32_wrap_i64 ], Opcodes.i32_trunc_sat_f64_s ][valtypeInd];
-  Opcodes.i32_to_u = [ [ null ], [ Opcodes.i32_wrap_i64 ], Opcodes.i32_trunc_sat_f64_u ][valtypeInd];
-  Opcodes.i32_from = [ [ null ], [ Opcodes.i64_extend_i32_s ], [ Opcodes.f64_convert_i32_s ] ][valtypeInd];
-  Opcodes.i32_from_u = [ [ null ], [ Opcodes.i64_extend_i32_u ], [ Opcodes.f64_convert_i32_u ] ][valtypeInd];
+  Opcodes.i32_to = [ [], [ Opcodes.i32_wrap_i64 ], Opcodes.i32_trunc_sat_f64_s ][valtypeInd];
+  Opcodes.i32_to_u = [ [], [ Opcodes.i32_wrap_i64 ], Opcodes.i32_trunc_sat_f64_u ][valtypeInd];
+  Opcodes.i32_from = [ [], [ Opcodes.i64_extend_i32_s ], [ Opcodes.f64_convert_i32_s ] ][valtypeInd];
+  Opcodes.i32_from_u = [ [], [ Opcodes.i64_extend_i32_u ], [ Opcodes.f64_convert_i32_u ] ][valtypeInd];
 
   Opcodes.load = [ Opcodes.i32_load, Opcodes.i64_load, Opcodes.f64_load ][valtypeInd];
   Opcodes.store = [ Opcodes.i32_store, Opcodes.i64_store, Opcodes.f64_store ][valtypeInd];
@@ -3206,10 +3614,6 @@ export default program => {
 
   program.id = { name: 'main' };
 
-  globalThis.pageSize = PageSize;
-  const pageSizeOpt = process.argv.find(x => x.startsWith('-page-size='));
-  if (pageSizeOpt) pageSize = parseInt(pageSizeOpt.split('=')[1]) * 1024;
-
   const scope = {
     locals: {},
     localInd: 0
@@ -3220,7 +3624,7 @@ export default program => {
     body: program.body
   };
 
-  if (Prefs.astLog) console.log(program.body.body);
+  if (Prefs.astLog) console.log(JSON.stringify(program.body.body, null, 2));
 
   generateFunc(scope, program);
 
@@ -3237,7 +3641,11 @@ export default program => {
   }
 
   if (lastInst[0] === Opcodes.end || lastInst[0] === Opcodes.local_set || lastInst[0] === Opcodes.global_set) {
-    main.returns = [];
+    if (lastInst[0] === Opcodes.local_set && lastInst[1] === main.locals['#last_type'].idx) {
+      main.wasm.splice(main.wasm.length - 1, 1);
+    } else {
+      main.returns = [];
+    }
   }
 
   if (lastInst[0] === Opcodes.call) {