porffor 0.2.0-77e30e8 → 0.2.0-8858ca7

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

@@ -1,5 +1,5 @@
 import { Blocktype, Opcodes, Valtype, PageSize, ValtypeSize } from "./wasmSpec.js";
-import { ieee754_binary64, signedLEB128, unsignedLEB128 } from "./encoding.js";
+import { ieee754_binary64, signedLEB128, unsignedLEB128, encodeVector } from "./encoding.js";
 import { operatorOpcode } from "./expression.js";
 import { BuiltinFuncs, BuiltinVars, importedFuncs, NULL, UNDEFINED } from "./builtins.js";
 import { PrototypeFuncs } from "./prototype.js";
@@ -7,6 +7,8 @@ import { number, i32x4, enforceOneByte, enforceTwoBytes, enforceFourBytes, enfor
 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;
@@ -23,39 +25,41 @@ 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';
-const generate = (scope, decl, global = false, name = undefined) => {
+const generate = (scope, decl, global = false, name = undefined, valueUnused = false) => {
   switch (decl.type) {
     case 'BinaryExpression':
       return generateBinaryExp(scope, decl, global, name);
@@ -68,7 +72,12 @@ const generate = (scope, decl, global = false, name = undefined) => {
 
     case 'ArrowFunctionExpression':
     case 'FunctionDeclaration':
-      generateFunc(scope, decl);
+      const func = generateFunc(scope, decl);
+
+      if (decl.type.endsWith('Expression')) {
+        return number(func.index);
+      }
+
       return [];
 
     case 'BlockStatement':
@@ -81,7 +90,7 @@ const generate = (scope, decl, global = false, name = undefined) => {
       return generateExp(scope, decl);
 
     case 'CallExpression':
-      return generateCall(scope, decl, global, name);
+      return generateCall(scope, decl, global, name, valueUnused);
 
     case 'NewExpression':
       return generateNew(scope, decl, global, name);
@@ -99,7 +108,7 @@ const generate = (scope, decl, global = false, name = undefined) => {
       return generateUnary(scope, decl);
 
     case 'UpdateExpression':
-      return generateUpdate(scope, decl);
+      return generateUpdate(scope, decl, global, name, valueUnused);
 
     case 'IfStatement':
       return generateIf(scope, decl);
@@ -110,6 +119,9 @@ const generate = (scope, decl, global = false, name = undefined) => {
     case 'WhileStatement':
       return generateWhile(scope, decl);
 
+    case 'DoWhileStatement':
+      return generateDoWhile(scope, decl);
+
     case 'ForOfStatement':
       return generateForOf(scope, decl);
 
@@ -119,6 +131,9 @@ const generate = (scope, decl, global = false, name = undefined) => {
     case 'ContinueStatement':
       return generateContinue(scope, decl);
 
+    case 'LabeledStatement':
+      return generateLabel(scope, decl);
+
     case 'EmptyStatement':
       return generateEmpty(scope, decl);
 
@@ -132,7 +147,7 @@ const generate = (scope, decl, global = false, name = undefined) => {
       return generateTry(scope, decl);
 
     case 'DebuggerStatement':
-      // todo: add fancy terminal debugger?
+      // todo: hook into terminal debugger
       return [];
 
     case 'ArrayExpression':
@@ -146,16 +161,22 @@ const generate = (scope, decl, global = false, name = undefined) => {
       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 [];
 
     case 'TaggedTemplateExpression': {
       const funcs = {
-        asm: str => {
+        __Porffor_wasm: str => {
           let out = [];
 
           for (const line of str.split('\n')) {
@@ -163,8 +184,8 @@ const generate = (scope, decl, global = false, name = undefined) => {
             if (asm[0] === '') continue; // blank
 
             if (asm[0] === 'local') {
-              const [ name, idx, type ] = asm.slice(1);
-              scope.locals[name] = { idx: parseInt(idx), type: Valtype[type] };
+              const [ name, type ] = asm.slice(1);
+              scope.locals[name] = { idx: scope.localInd++, type: Valtype[type] };
               continue;
             }
 
@@ -174,7 +195,7 @@ const generate = (scope, decl, global = false, name = undefined) => {
             }
 
             if (asm[0] === 'memory') {
-              allocPage('asm instrinsic');
+              allocPage(scope, 'asm instrinsic');
               // todo: add to store/load offset insts
               continue;
             }
@@ -183,38 +204,65 @@ const generate = (scope, decl, global = false, name = undefined) => {
             if (!inst) throw new Error(`inline asm: inst ${asm[0]} not found`);
 
             if (!Array.isArray(inst)) inst = [ inst ];
-            const immediates = asm.slice(1).map(x => parseInt(x));
+            const immediates = asm.slice(1).map(x => {
+              const int = parseInt(x);
+              if (Number.isNaN(int)) return scope.locals[x]?.idx;
+              return int;
+            });
 
-            out.push([ ...inst, ...immediates ]);
+            out.push([ ...inst, ...immediates.flatMap(x => signedLEB128(x)) ]);
           }
 
           return out;
         },
 
-        __internal_print_type: str => {
-          const type = getType(scope, str) - TYPES.number;
+        __Porffor_bs: str => [
+          ...makeString(scope, str, global, name, true),
 
-          return [
-            ...number(type),
-            [ Opcodes.call, importedFuncs.print ],
+          ...(name ? setType(scope, name, TYPES._bytestring) : [
+            ...number(TYPES._bytestring, Valtype.i32),
+            ...setLastType(scope)
+          ])
+        ],
+        __Porffor_s: str => [
+          ...makeString(scope, str, global, name, false),
 
-            // newline
-            ...number(10),
-            [ Opcodes.call, importedFuncs.printChar ]
-          ];
-        }
-      }
+          ...(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;
 
-      const str = decl.quasi.quasis[0].value.raw;
-      return funcs[name](str);
+      for (let i = 0; i < expressions.length; i++) {
+        const e = expressions[i];
+        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[func](str);
     }
 
     default:
-      return todo(`no generation for ${decl.type}!`);
+      // ignore typescript nodes
+      if (decl.type.startsWith('TS') ||
+          decl.type === 'ImportDeclaration' && decl.importKind === 'type') {
+        return [];
+      }
+
+      return todo(scope, `no generation for ${decl.type}!`);
   }
 };
 
@@ -242,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',
@@ -264,25 +312,33 @@ const generateIdent = (scope, decl) => {
     const name = mapName(rawName);
     let local = scope.locals[rawName];
 
-    if (builtinVars[name]) {
+    if (Object.hasOwn(builtinVars, name)) {
       if (builtinVars[name].floatOnly && valtype[0] === 'i') throw new Error(`Cannot use ${unhackName(name)} with integer valtype`);
-      return builtinVars[name];
+
+      let wasm = builtinVars[name];
+      if (typeof wasm === 'function') wasm = asmFuncToAsm(wasm, { name });
+      return wasm.slice();
+    }
+
+    if (Object.hasOwn(builtinFuncs, name) || Object.hasOwn(internalConstrs, name)) {
+      // todo: return an actual something
+      return number(1);
     }
 
-    if (builtinFuncs[name] || internalConstrs[name]) {
+    if (isExistingProtoFunc(name)) {
       // todo: return an actual something
       return number(1);
     }
 
-    if (local === undefined) {
+    if (local?.idx === undefined) {
       // no local var with name
-      if (importedFuncs.hasOwnProperty(name)) return number(importedFuncs[name]);
-      if (funcIndex[name] !== undefined) return number(funcIndex[name]);
+      if (Object.hasOwn(importedFuncs, name)) return number(importedFuncs[name]);
+      if (Object.hasOwn(funcIndex, name)) return number(funcIndex[name]);
 
-      if (globals[name] !== undefined) return [ [ Opcodes.global_get, globals[name].idx ] ];
+      if (Object.hasOwn(globals, name)) return [ [ Opcodes.global_get, globals[name].idx ] ];
     }
 
-    if (local === undefined && rawName.startsWith('__')) {
+    if (local?.idx === undefined && rawName.startsWith('__')) {
       // return undefined if unknown key in already known var
       let parent = rawName.slice(2).split('_').slice(0, -1).join('_');
       if (parent.includes('_')) parent = '__' + parent;
@@ -291,7 +347,7 @@ const generateIdent = (scope, decl) => {
       if (!parentLookup[1]) return number(UNDEFINED);
     }
 
-    if (local === undefined) return internalThrow(scope, 'ReferenceError', `${unhackName(name)} is not defined`, true);
+    if (local?.idx === undefined) return internalThrow(scope, 'ReferenceError', `${unhackName(name)} is not defined`, true);
 
     return [ [ Opcodes.local_get, local.idx ] ];
   };
@@ -304,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 ]
   ];
 };
@@ -325,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 = {
@@ -334,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}
   // -->
@@ -342,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;
 
@@ -360,12 +421,12 @@ const performLogicOp = (scope, op, left, right, leftType, rightType) => {
       ...right,
       // note type
       ...rightType,
-      [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ],
+      ...setLastType(scope),
       [ Opcodes.else ],
       [ Opcodes.local_get, localTmp(scope, 'logictmpi', Valtype.i32) ],
       // note type
       ...leftType,
-      [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ],
+      ...setLastType(scope),
       [ Opcodes.end ],
       Opcodes.i32_from
     ];
@@ -379,17 +440,17 @@ const performLogicOp = (scope, op, left, right, leftType, rightType) => {
     ...right,
     // note type
     ...rightType,
-    [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ],
+    ...setLastType(scope),
     [ Opcodes.else ],
     [ Opcodes.local_get, localTmp(scope, 'logictmp') ],
     // note type
     ...leftType,
-    [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ],
+    ...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?
@@ -399,11 +460,8 @@ const concatStrings = (scope, left, right, global, name, assign) => {
   const rightLength = localTmp(scope, 'concat_right_length', Valtype.i32);
   const leftLength = localTmp(scope, 'concat_left_length', Valtype.i32);
 
-  const aotWFA = process.argv.includes('-aot-well-formed-string-approximation');
-  if (aotWFA) addVarMeta(name, { wellFormed: undefined });
-
   if (assign) {
-    const pointer = arrays.get(name ?? '$undeclared');
+    const pointer = scope.arrays?.get(name ?? '$undeclared');
 
     return [
       // setup right
@@ -428,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 ],
 
@@ -441,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 ],
@@ -501,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 ],
 
@@ -514,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 ],
@@ -526,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?
@@ -535,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);
@@ -563,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 ],
@@ -578,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
@@ -592,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 ],
@@ -607,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 ],
@@ -634,16 +696,18 @@ 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 tmp = localTmp(scope, `$logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
+  const useTmp = knownType(scope, type) == null;
+  const tmp = useTmp && localTmp(scope, `#logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
 
   const def = [
     // if value != 0
-    [ Opcodes.local_get, tmp ],
+    ...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
 
     // ...(intIn ? [ [ Opcodes.i32_eqz ] ] : [ ...Opcodes.eqz ]),
     ...(!intOut || (intIn && intOut) ? [] : [ Opcodes.i32_to_u ]),
@@ -655,7 +719,7 @@ const truthy = (scope, wasm, type, intIn = false, intOut = false) => {
 
   return [
     ...wasm,
-    [ Opcodes.local_set, tmp ],
+    ...(!useTmp ? [] : [ [ Opcodes.local_set, tmp ] ]),
 
     ...typeSwitch(scope, type, {
       // [TYPES.number]: def,
@@ -664,7 +728,7 @@ const truthy = (scope, wasm, type, intIn = false, intOut = false) => {
         ...number(1, intOut ? Valtype.i32 : valtypeBinary)
       ],
       [TYPES.string]: [
-        [ Opcodes.local_get, tmp ],
+        ...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
         ...(intIn ? [] : [ Opcodes.i32_to_u ]),
 
         // get length
@@ -675,16 +739,27 @@ const truthy = (scope, wasm, type, intIn = false, intOut = false) => {
         [ Opcodes.i32_eqz ], */
         ...(intOut ? [] : [ Opcodes.i32_from_u ])
       ],
+      [TYPES._bytestring]: [ // duplicate of string
+      ...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
+        ...(intIn ? [] : [ Opcodes.i32_to_u ]),
+
+        // get length
+        [ Opcodes.i32_load, Math.log2(ValtypeSize.i32) - 1, 0 ],
+
+        ...(intOut ? [] : [ Opcodes.i32_from_u ])
+      ],
       default: def
     }, intOut ? Valtype.i32 : valtypeBinary)
   ];
 };
 
 const falsy = (scope, wasm, type, intIn = false, intOut = false) => {
-  const tmp = localTmp(scope, `$logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
+  const useTmp = knownType(scope, type) == null;
+  const tmp = useTmp && localTmp(scope, `#logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
+
   return [
     ...wasm,
-    [ Opcodes.local_set, tmp ],
+    ...(!useTmp ? [] : [ [ Opcodes.local_set, tmp ] ]),
 
     ...typeSwitch(scope, type, {
       [TYPES._array]: [
@@ -692,7 +767,18 @@ const falsy = (scope, wasm, type, intIn = false, intOut = false) => {
         ...number(0, intOut ? Valtype.i32 : valtypeBinary)
       ],
       [TYPES.string]: [
-        [ Opcodes.local_get, tmp ],
+        ...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
+        ...(intIn ? [] : [ Opcodes.i32_to_u ]),
+
+        // get length
+        [ Opcodes.i32_load, Math.log2(ValtypeSize.i32) - 1, 0 ],
+
+        // if length == 0
+        [ Opcodes.i32_eqz ],
+        ...(intOut ? [] : [ Opcodes.i32_from_u ])
+      ],
+      [TYPES._bytestring]: [ // duplicate of string
+        ...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
         ...(intIn ? [] : [ Opcodes.i32_to_u ]),
 
         // get length
@@ -704,7 +790,7 @@ const falsy = (scope, wasm, type, intIn = false, intOut = false) => {
       ],
       default: [
         // if value == 0
-        [ Opcodes.local_get, tmp ],
+        ...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
 
         ...(intIn ? [ [ Opcodes.i32_eqz ] ] : [ ...Opcodes.eqz ]),
         ...(intOut ? [] : [ Opcodes.i32_from_u ])
@@ -714,10 +800,12 @@ const falsy = (scope, wasm, type, intIn = false, intOut = false) => {
 };
 
 const nullish = (scope, wasm, type, intIn = false, intOut = false) => {
-  const tmp = localTmp(scope, `$logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
+  const useTmp = knownType(scope, type) == null;
+  const tmp = useTmp && localTmp(scope, `#logicinner_tmp${intIn ? '_int' : ''}`, intIn ? Valtype.i32 : valtypeBinary);
+
   return [
     ...wasm,
-    [ Opcodes.local_set, tmp ],
+    ...(!useTmp ? [] : [ [ Opcodes.local_set, tmp ] ]),
 
     ...typeSwitch(scope, type, {
       [TYPES.undefined]: [
@@ -726,7 +814,7 @@ const nullish = (scope, wasm, type, intIn = false, intOut = false) => {
       ],
       [TYPES.object]: [
         // object, null if == 0
-        [ Opcodes.local_get, tmp ],
+        ...(!useTmp ? [] : [ [ Opcodes.local_get, tmp ] ]),
 
         ...(intIn ? [ [ Opcodes.i32_eqz ] ] : [ ...Opcodes.eqz ]),
         ...(intOut ? [] : [ Opcodes.i32_from_u ])
@@ -755,11 +843,14 @@ const performOp = (scope, op, left, right, leftType, rightType, _global = false,
     return performLogicOp(scope, op, left, right, leftType, rightType);
   }
 
+  const knownLeft = knownType(scope, leftType);
+  const knownRight = knownType(scope, rightType);
+
   const eqOp = ['==', '===', '!=', '!==', '>', '>=', '<', '<='].includes(op);
   const strictOp = op === '===' || op === '!==';
 
   const startOut = [], endOut = [];
-  const finalise = out => startOut.concat(out, endOut);
+  const finalize = out => startOut.concat(out, endOut);
 
   // if strict (in)equal check types match
   if (strictOp) {
@@ -804,31 +895,59 @@ 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
 
-  // if (leftType === TYPES.string || rightType === TYPES.string) {
-  //   if (op === '+') {
-  //     // string concat (a + b)
-  //     return finalise(concatStrings(scope, left, right, _global, _name, assign));
-  //   }
-
-  //   // not an equality op, NaN
-  //   if (!eqOp) return finalise(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 finalise(compareStrings(scope, left, right));
-  //   }
-
-  //   if (op === '!==' || op === '!=') {
-  //     return finalise([
-  //       ...compareStrings(scope, left, right),
-  //       [ Opcodes.i32_eqz ]
-  //     ]);
-  //   }
-  // }
+  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, false);
+    }
+
+    // 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);
+    }
+
+    if (op === '!==' || op === '!=') {
+      return [
+        ...compareStrings(scope, left, right),
+        [ Opcodes.i32_eqz ]
+      ];
+    }
+  }
+
+  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];
 
@@ -838,24 +957,69 @@ const performOp = (scope, op, left, right, leftType, rightType, _global = false,
     includeBuiltin(scope, builtinName);
     const idx = funcIndex[builtinName];
 
-    return finalise([
+    return finalize([
       ...left,
       ...right,
       [ Opcodes.call, idx ]
     ]);
   }
 
-  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
+  // 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,
@@ -867,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, 1 ],
-      [ 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 ],
@@ -904,7 +1066,7 @@ const performOp = (scope, op, left, right, leftType, rightType, _global = false,
     // }
   }
 
-  return finalise([
+  return finalize([
     ...left,
     ...(tmpLeft != null ? stringOnly([ [ Opcodes.local_tee, tmpLeft ] ]) : []),
     ...right,
@@ -921,7 +1083,22 @@ const generateBinaryExp = (scope, decl, _global, _name) => {
   return out;
 };
 
-const asmFunc = (name, { wasm, params, locals: localTypes, globals: globalTypes = [], globalInits, returns, returnType, localNames = [], globalNames = [] }) => {
+const asmFuncToAsm = (func, { name = '#unknown_asm_func', params = [], locals = [], returns = [], localInd = 0 }) => {
+  return func({ name, params, locals, returns, localInd }, {
+    TYPES, TYPE_NAMES, typeSwitch, makeArray, makeString, allocPage,
+    builtin: name => {
+      let idx = funcIndex[name] ?? importedFuncs[name];
+      if (idx === undefined && builtinFuncs[name]) {
+        includeBuiltin(null, name);
+        idx = funcIndex[name];
+      }
+
+      return idx;
+    }
+  });
+};
+
+const asmFunc = (name, { wasm, params, locals: localTypes, globals: globalTypes = [], globalInits, returns, returnType, localNames = [], globalNames = [], data: _data = [] }) => {
   const existing = funcs.find(x => x.name === name);
   if (existing) return existing;
 
@@ -933,6 +1110,14 @@ const asmFunc = (name, { wasm, params, locals: localTypes, globals: globalTypes
     locals[nameParam(i)] = { idx: i, type: allLocals[i] };
   }
 
+  for (const x of _data) {
+    const copy = { ...x };
+    copy.offset += pages.size * pageSize;
+    data.push(copy);
+  }
+
+  if (typeof wasm === 'function') wasm = asmFuncToAsm(wasm, { name, params, locals, returns, localInd: allLocals.length });
+
   let baseGlobalIdx, i = 0;
   for (const type of globalTypes) {
     if (baseGlobalIdx === undefined) baseGlobalIdx = globalInd;
@@ -955,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++
@@ -978,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
@@ -1001,47 +1187,29 @@ 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,
+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)];
 
-  // these are not "typeof" types but tracked internally
-  _array: 0x10,
-  _regexp: 0x11
-};
-
-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'
+  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 ] ];
+
+  if (typedInput && globals[name]?.metadata?.type != null) return number(globals[name].metadata.type, Valtype.i32);
   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);
 };
@@ -1051,17 +1219,29 @@ const setType = (scope, _name, type) => {
 
   const out = typeof type === 'number' ? number(type, Valtype.i32) : type;
 
+  if (typedInput && scope.locals[name]?.metadata?.type != null) return [];
   if (scope.locals[name]) return [
     ...out,
     [ Opcodes.local_set, scope.locals[name + '#type'].idx ]
   ];
 
+  if (typedInput && globals[name]?.metadata?.type != null) return [];
   if (globals[name]) return [
     ...out,
     [ Opcodes.global_set, globals[name + '#type'].idx ]
   ];
 
   // throw new Error('could not find var');
+  return [];
+};
+
+const getLastType = scope => {
+  scope.gotLastType = true;
+  return [ [ Opcodes.local_get, localTmp(scope, '#last_type', Valtype.i32) ] ];
+};
+
+const setLastType = scope => {
+  return [ [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ] ];
 };
 
 const getNodeType = (scope, node) => {
@@ -1069,6 +1249,8 @@ const getNodeType = (scope, node) => {
     if (node.type === 'Literal') {
       if (node.regex) return TYPES._regexp;
 
+      if (typeof node.value === 'string' && byteStringable(node.value)) return TYPES._bytestring;
+
       return TYPES[typeof node.value];
     }
 
@@ -1082,6 +1264,27 @@ const getNodeType = (scope, node) => {
 
     if (node.type === 'CallExpression' || node.type === 'NewExpression') {
       const name = node.callee.name;
+      if (!name) {
+        // iife
+        if (scope.locals['#last_type']) return getLastType(scope);
+
+        // presume
+        // todo: warn here?
+        return TYPES.number;
+      }
+
+      if (node.type === 'NewExpression' && builtinFuncs[name + '$constructor']) {
+        if (builtinFuncs[name + '$constructor'].typedReturns) {
+          if (scope.locals['#last_type']) return getLastType(scope);
+
+          // presume
+          // todo: warn here?
+          return TYPES.number;
+        }
+
+        return builtinFuncs[name + '$constructor'].returnType ?? TYPES.number;
+      }
+
       const func = funcs.find(x => x.name === name);
 
       if (func) {
@@ -1089,10 +1292,27 @@ const getNodeType = (scope, node) => {
         if (func.returnType) return func.returnType;
       }
 
-      if (builtinFuncs[name]) 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;
 
-      if (scope.locals['#last_type']) return [ [ Opcodes.local_get, localTmp(scope, '#last_type', Valtype.i32) ] ];
+      // check if this is a prototype function
+      // if so and there is only one impl (eg charCodeAt)
+      // use that return type as that is the only possibility
+      // (if non-matching type it would error out)
+      if (name.startsWith('__')) {
+        const spl = name.slice(2).split('_');
+
+        const func = spl[spl.length - 1];
+        const protoFuncs = Object.keys(prototypeFuncs).filter(x => x != TYPES._bytestring && prototypeFuncs[x][func] != null);
+        if (protoFuncs.length === 1) return protoFuncs[0].returnType ?? TYPES.number;
+      }
+
+      if (name.startsWith('__Porffor_wasm_')) {
+        // todo: return undefined for non-returning ops
+        return TYPES.number;
+      }
+
+      if (scope.locals['#last_type']) return getLastType(scope);
 
       // presume
       // todo: warn here?
@@ -1140,6 +1360,15 @@ const getNodeType = (scope, node) => {
 
     if (node.type === 'BinaryExpression') {
       if (['==', '===', '!=', '!==', '>', '>=', '<', '<='].includes(node.operator)) return TYPES.boolean;
+      if (node.operator !== '+') return TYPES.number;
+
+      const knownLeft = knownType(scope, getNodeType(scope, node.left));
+      const knownRight = knownType(scope, getNodeType(scope, node.right));
+
+      // 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;
 
       // todo: string concat types
@@ -1164,7 +1393,7 @@ const getNodeType = (scope, node) => {
       if (node.operator === '!') return TYPES.boolean;
       if (node.operator === 'void') return TYPES.undefined;
       if (node.operator === 'delete') return TYPES.boolean;
-      if (node.operator === 'typeof') return TYPES.string;
+      if (node.operator === 'typeof') return Prefs.bytestring ? TYPES._bytestring : TYPES.string;
 
       return TYPES.number;
     }
@@ -1173,11 +1402,23 @@ const getNodeType = (scope, node) => {
       // hack: if something.length, number type
       if (node.property.name === 'length') return TYPES.number;
 
-      // we cannot guess
+      // 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);
+
+      // presume
       return TYPES.number;
     }
 
-    if (scope.locals['#last_type']) return [ [ Opcodes.local_get, localTmp(scope, '#last_type', Valtype.i32) ] ];
+    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?
@@ -1193,8 +1434,8 @@ const getNodeType = (scope, node) => {
 const generateLiteral = (scope, decl, global, name) => {
   if (decl.value === null) return number(NULL);
 
+  // hack: just return 1 for regex literals
   if (decl.regex) {
-    scope.regex[name] = decl.regex;
     return number(1);
   }
 
@@ -1207,19 +1448,10 @@ const generateLiteral = (scope, decl, global, name) => {
       return number(decl.value ? 1 : 0);
 
     case 'string':
-      const str = decl.value;
-      const rawElements = new Array(str.length);
-      let j = 0;
-      for (let i = 0; i < str.length; i++) {
-        rawElements[i] = str.charCodeAt(i);
-      }
-
-      return makeArray(scope, {
-        rawElements
-      }, global, name, false, 'i16')[0];
+      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);
   }
 };
 
@@ -1228,6 +1460,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++;
@@ -1236,18 +1470,25 @@ const countLeftover = wasm => {
     if (inst[0] === Opcodes.end) depth--;
 
     if (depth === 0)
-      if ([Opcodes.throw,Opcodes.drop, Opcodes.local_set, Opcodes.global_set].includes(inst[0])) count--;
-        else if ([null, Opcodes.i32_eqz, Opcodes.i64_eqz, Opcodes.f64_ceil, Opcodes.f64_floor, Opcodes.f64_trunc, Opcodes.f64_nearest, Opcodes.f64_sqrt, Opcodes.local_tee, Opcodes.i32_wrap_i64, Opcodes.i64_extend_i32_s, Opcodes.i64_extend_i32_u, Opcodes.f32_demote_f64, Opcodes.f64_promote_f32, Opcodes.f64_convert_i32_s, Opcodes.f64_convert_i32_u, Opcodes.i32_clz, Opcodes.i32_ctz, Opcodes.i32_popcnt, Opcodes.f64_neg, Opcodes.end, Opcodes.i32_trunc_sat_f64_s[0], Opcodes.i32x4_extract_lane, Opcodes.i16x8_extract_lane, Opcodes.i32_load, Opcodes.i64_load, Opcodes.f64_load, Opcodes.v128_load, Opcodes.i32_load16_u, Opcodes.i32_load16_s, Opcodes.memory_grow].includes(inst[0]) && (inst[0] !== 0xfc || inst[1] < 0x0a)) {}
-        else if ([Opcodes.local_get, Opcodes.global_get, Opcodes.f64_const, Opcodes.i32_const, Opcodes.i64_const, Opcodes.v128_const].includes(inst[0])) count++;
-        else if ([Opcodes.i32_store, Opcodes.i64_store, Opcodes.f64_store, Opcodes.i32_store16].includes(inst[0])) count -= 2;
+      if ([Opcodes.throw, Opcodes.drop, Opcodes.local_set, Opcodes.global_set].includes(inst[0])) count--;
+        else if ([null, Opcodes.i32_eqz, Opcodes.i64_eqz, Opcodes.f64_ceil, Opcodes.f64_floor, Opcodes.f64_trunc, Opcodes.f64_nearest, Opcodes.f64_sqrt, Opcodes.local_tee, Opcodes.i32_wrap_i64, Opcodes.i64_extend_i32_s, Opcodes.i64_extend_i32_u, Opcodes.f32_demote_f64, Opcodes.f64_promote_f32, Opcodes.f64_convert_i32_s, Opcodes.f64_convert_i32_u, Opcodes.i32_clz, Opcodes.i32_ctz, Opcodes.i32_popcnt, Opcodes.f64_neg, Opcodes.end, Opcodes.i32_trunc_sat_f64_s[0], Opcodes.i32x4_extract_lane, Opcodes.i16x8_extract_lane, Opcodes.i32_load, Opcodes.i64_load, Opcodes.f64_load, Opcodes.v128_load, Opcodes.i32_load16_u, Opcodes.i32_load16_s, Opcodes.i32_load8_u, Opcodes.i32_load8_s, Opcodes.memory_grow].includes(inst[0]) && (inst[0] !== 0xfc || inst[1] < 0x0a)) {}
+        else if ([Opcodes.local_get, Opcodes.global_get, Opcodes.f64_const, Opcodes.i32_const, Opcodes.i64_const, Opcodes.v128_const, Opcodes.memory_size].includes(inst[0])) count++;
+        else if ([Opcodes.i32_store, Opcodes.i64_store, Opcodes.f64_store, Opcodes.i32_store16, Opcodes.i32_store8].includes(inst[0])) count -= 2;
         else if (Opcodes.memory_copy[0] === inst[0] && Opcodes.memory_copy[1] === inst[1]) count -= 3;
         else if (inst[0] === Opcodes.return) count = 0;
         else if (inst[0] === Opcodes.call) {
           let func = funcs.find(x => x.index === inst[1]);
-          if (func) {
-            count -= func.params.length;
-          } else count--;
-          if (func) count += func.returns.length;
+          if (inst[1] === -1) {
+            // todo: count for calling self
+          } else if (!func && inst[1] < importedFuncs.length) {
+            count -= importedFuncs[inst[1]].params;
+            count += importedFuncs[inst[1]].returns;
+          } else {
+            if (func) {
+              count -= func.params.length;
+            } else count--;
+            if (func) count += func.returns.length;
+          }
         } else count--;
 
     // console.log(count, decompile([ inst ]).slice(0, -1));
@@ -1265,7 +1506,7 @@ const disposeLeftover = wasm => {
 const generateExp = (scope, decl) => {
   const expression = decl.expression;
 
-  const out = generate(scope, expression);
+  const out = generate(scope, expression, undefined, undefined, true);
   disposeLeftover(out);
 
   return out;
@@ -1323,7 +1564,7 @@ const RTArrayUtil = {
   ]
 };
 
-const generateCall = (scope, decl, _global, _name) => {
+const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
   /* const callee = decl.callee;
   const args = decl.arguments;
 
@@ -1339,10 +1580,21 @@ const generateCall = (scope, decl, _global, _name) => {
     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',
@@ -1356,13 +1608,13 @@ const generateCall = (scope, decl, _global, _name) => {
       const finalStatement = parsed.body[parsed.body.length - 1];
       out.push(
         ...getNodeType(scope, finalStatement),
-        [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
+        ...setLastType(scope)
       );
     } else if (countLeftover(out) === 0) {
       out.push(...number(UNDEFINED));
       out.push(
         ...number(TYPES.undefined, Valtype.i32),
-        [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
+        ...setLastType(scope)
       );
     }
 
@@ -1380,39 +1632,47 @@ const generateCall = (scope, decl, _global, _name) => {
   if (name && name.startsWith('__')) {
     const spl = name.slice(2).split('_');
 
-    const func = spl[spl.length - 1];
-    protoName = func;
+    protoName = spl[spl.length - 1];
 
     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()
   if (!name && decl.callee.type === 'MemberExpression') {
     // megahack for /regex/.func()
-    if (decl.callee.object.regex) {
-      const funcName = decl.callee.property.name;
-      const func = Rhemyn[funcName](decl.callee.object.regex.pattern, currentFuncIndex++);
+    const funcName = decl.callee.property.name;
+    if (decl.callee.object.regex && Object.hasOwn(Rhemyn, funcName)) {
+      const regex = decl.callee.object.regex.pattern;
+      const rhemynName = `regex_${funcName}_${regex}`;
 
-      funcIndex[func.name] = func.index;
-      funcs.push(func);
+      if (!funcIndex[rhemynName]) {
+        const func = Rhemyn[funcName](regex, currentFuncIndex++, rhemynName);
 
+        funcIndex[func.name] = func.index;
+        funcs.push(func);
+      }
+
+      const idx = funcIndex[rhemynName];
       return [
         // make string arg
         ...generate(scope, decl.arguments[0]),
+        Opcodes.i32_to_u,
+        ...getNodeType(scope, decl.arguments[0]),
 
         // call regex func
-        Opcodes.i32_to_u,
-        [ Opcodes.call, func.index ],
+        [ Opcodes.call, idx ],
         Opcodes.i32_from_u,
 
         ...number(TYPES.boolean, Valtype.i32),
-        [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
+        ...setLastType(scope)
       ];
     }
 
-    const func = decl.callee.property.name;
-    protoName = func;
+    protoName = decl.callee.property.name;
 
     target = decl.callee.object;
   }
@@ -1433,23 +1693,48 @@ const generateCall = (scope, decl, _global, _name) => {
   // }
 
   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: {
+            type: 'Identifier',
+            name: x
+          },
+          arguments: [ target, ...decl.arguments ],
+          _protoInternalCall: true
+        });
+      }
+    }
+
     const protoCands = Object.keys(prototypeFuncs).reduce((acc, x) => {
-      const f = prototypeFuncs[x][protoName];
-      if (f) acc[x] = f;
+      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);
       const pointerLocal = localTmp(scope, '__proto_pointer_cache', Valtype.i32);
-      const getPointer = [ [ Opcodes.local_get, pointerLocal ] ];
 
       // TODO: long-term, prototypes should be their individual separate funcs
 
+      const rawPointer = [
+        ...generate(scope, target),
+        Opcodes.i32_to_u
+      ];
+
+      const usePointerCache = !Object.values(protoCands).every(x => x.noPointerCache === true);
+      const getPointer = usePointerCache ? [ [ Opcodes.local_get, pointerLocal ] ] : rawPointer;
+
+      let allOptUnused = true;
       let lengthI32CacheUsed = false;
-      const protoBC = {};
       for (const x in protoCands) {
         const protoFunc = protoCands[x];
         if (protoFunc.noArgRetLength && decl.arguments.length === 0) {
@@ -1457,7 +1742,7 @@ const generateCall = (scope, decl, _global, _name) => {
             ...RTArrayUtil.getLength(getPointer),
 
             ...number(TYPES.number, Valtype.i32),
-            [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ],
+            ...setLastType(scope)
           ];
           continue;
         }
@@ -1467,6 +1752,7 @@ const generateCall = (scope, decl, _global, _name) => {
         const protoLocal = protoFunc.local ? localTmp(scope, `__${protoName}_tmp`, protoFunc.local) : -1;
         const protoLocal2 = protoFunc.local2 ? localTmp(scope, `__${protoName}_tmp2`, protoFunc.local2) : -1;
 
+        let optUnused = false;
         const protoOut = protoFunc(getPointer, {
           getCachedI32: () => {
             lengthI32CacheUsed = true;
@@ -1481,23 +1767,30 @@ const generateCall = (scope, decl, _global, _name) => {
           return makeArray(scope, {
             rawElements: new Array(length)
           }, _global, _name, true, itemType);
+        }, () => {
+          optUnused = true;
+          return unusedValue;
         });
 
+        if (!optUnused) allOptUnused = false;
+
         protoBC[x] = [
-          [ Opcodes.block, valtypeBinary ],
+          [ Opcodes.block, unusedValue && optUnused ? Blocktype.void : valtypeBinary ],
           ...protoOut,
 
           ...number(protoFunc.returnType ?? TYPES.number, Valtype.i32),
-          [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ],
+          ...setLastType(scope),
           [ Opcodes.end ]
         ];
       }
 
-      return [
-        ...generate(scope, target),
+      // todo: if some cands use optUnused and some don't, we will probably crash
 
-        Opcodes.i32_to_u,
-        [ Opcodes.local_set, pointerLocal ],
+      return [
+        ...(usePointerCache ? [
+          ...rawPointer,
+          [ Opcodes.local_set, pointerLocal ],
+        ] : []),
 
         ...(!lengthI32CacheUsed ? [] : [
           ...RTArrayUtil.getLengthI32(getPointer),
@@ -1509,13 +1802,22 @@ const generateCall = (scope, decl, _global, _name) => {
 
           // TODO: error better
           default: internalThrow(scope, 'TypeError', `'${protoName}' proto func tried to be called on a type without an impl`)
-        }, valtypeBinary),
+        }, 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]) {
@@ -1525,20 +1827,20 @@ const generateCall = (scope, decl, _global, _name) => {
     idx = funcIndex[name];
 
     // infer arguments types from builtins params
-    const func = funcs.find(x => x.name === name);
-    for (let i = 0; i < decl.arguments.length; i++) {
-      const arg = decl.arguments[i];
-      if (!arg.name) continue;
-
-      const local = scope.locals[arg.name];
-      if (!local) continue;
-
-      local.type = func.params[i];
-      if (local.type === Valtype.v128) {
-        // specify vec subtype inferred from last vec type in function name
-        local.vecType = name.split('_').reverse().find(x => x.includes('x'));
-      }
-    }
+    // const func = funcs.find(x => x.name === name);
+    // for (let i = 0; i < decl.arguments.length; i++) {
+    //   const arg = decl.arguments[i];
+    //   if (!arg.name) continue;
+
+    //   const local = scope.locals[arg.name];
+    //   if (!local) continue;
+
+    //   local.type = func.params[i];
+    //   if (local.type === Valtype.v128) {
+    //     // specify vec subtype inferred from last vec type in function name
+    //     local.vecType = name.split('_').reverse().find(x => x.includes('x'));
+    //   }
+    // }
   }
 
   if (idx === undefined && internalConstrs[name]) return internalConstrs[name].generate(scope, decl, _global, _name);
@@ -1548,15 +1850,66 @@ const generateCall = (scope, decl, _global, _name) => {
     idx = -1;
   }
 
+  if (idx === undefined && name.startsWith('__Porffor_wasm_')) {
+    const wasmOps = {
+      // pointer, align, offset
+      i32_load: { imms: 2, args: [ true ], returns: 1 },
+      // pointer, value, align, offset
+      i32_store: { imms: 2, args: [ true, true ], returns: 0 },
+      // pointer, align, offset
+      i32_load8_u: { imms: 2, args: [ true ], returns: 1 },
+      // pointer, value, align, offset
+      i32_store8: { imms: 2, args: [ true, true ], returns: 0 },
+      // pointer, align, offset
+      i32_load16_u: { imms: 2, args: [ true ], returns: 1 },
+      // pointer, value, align, offset
+      i32_store16: { imms: 2, args: [ true, true ], returns: 0 },
+
+      // pointer, align, offset
+      f64_load: { imms: 2, args: [ true ], returns: 0 }, // 0 due to not i32
+      // pointer, value, align, offset
+      f64_store: { imms: 2, args: [ true, false ], returns: 0 },
+
+      // value
+      i32_const: { imms: 1, args: [], returns: 1 },
+
+      // a, b
+      i32_or: { imms: 0, args: [ true, true ], returns: 1 },
+    };
+
+    const opName = name.slice('__Porffor_wasm_'.length);
+
+    if (wasmOps[opName]) {
+      const op = wasmOps[opName];
+
+      const argOut = [];
+      for (let i = 0; i < op.args.length; i++) argOut.push(
+        ...generate(scope, decl.arguments[i]),
+        ...(op.args[i] ? [ Opcodes.i32_to ] : [])
+      );
+
+      // literals only
+      const imms = decl.arguments.slice(op.args.length).map(x => x.value);
+
+      return [
+        ...argOut,
+        [ 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 paramCount = func && (userFunc ? func.params.length / 2 : func.params.length);
+  const typedParams = userFunc || builtinFuncs[name]?.typedParams;
+  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;
   if (func && args.length < paramCount) {
@@ -1572,14 +1925,24 @@ const generateCall = (scope, decl, _global, _name) => {
   if (func && func.throws) scope.throws = true;
 
   let out = [];
-  for (const arg of args) {
+  for (let i = 0; i < args.length; i++) {
+    const arg = args[i];
     out = out.concat(generate(scope, arg));
-    if (userFunc) out = out.concat(getNodeType(scope, arg));
+
+    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);
+    }
+
+    if (typedParams) out = out.concat(getNodeType(scope, arg));
   }
 
   out.push([ Opcodes.call, idx ]);
 
-  if (!userFunc) {
+  if (!typedReturns) {
     // let type;
     // if (builtinFuncs[name]) type = TYPES[builtinFuncs[name].returnType ?? 'number'];
     // if (internalConstrs[name]) type = internalConstrs[name].type;
@@ -1589,7 +1952,11 @@ const generateCall = (scope, decl, _global, _name) => {
     //   ...number(type, Valtype.i32),
     //   [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
     // );
-  } else out.push([ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]);
+  } else out.push(...setLastType(scope));
+
+  if (builtinFuncs[name] && builtinFuncs[name].returns?.[0] === Valtype.i32 && valtypeBinary !== Valtype.i32) {
+    out.push(Opcodes.i32_from);
+  }
 
   return out;
 };
@@ -1597,8 +1964,21 @@ const generateCall = (scope, decl, _global, _name) => {
 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 + '$constructor']) {
+    // custom ...$constructor override builtin func
+    return generateCall(scope, {
+      ...decl,
+      callee: {
+        type: 'Identifier',
+        name: name + '$constructor'
+      }
+    }, _global, _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);
 };
@@ -1614,44 +1994,151 @@ const unhackName = name => {
   return name;
 };
 
-const typeSwitch = (scope, type, bc, returns = valtypeBinary) => {
-  const tmp = localTmp(scope, '#typeswitch_tmp', Valtype.i32);
+const knownType = (scope, type) => {
+  if (type.length === 1 && type[0][0] === Opcodes.i32_const) {
+    return type[0][1];
+  }
 
-  const out = [
-    ...type,
-    [ Opcodes.local_set, tmp ],
-    [ Opcodes.block, returns ]
-  ];
+  if (typedInput && type.length === 1 && type[0][0] === Opcodes.local_get) {
+    const idx = type[0][1];
 
-  // todo: use br_table?
+    // type idx = var idx + 1
+    const v = Object.values(scope.locals).find(x => x.idx === idx - 1);
+    if (v.metadata?.type != null) return v.metadata.type;
+  }
 
-  for (const x in bc) {
-    if (x === 'default') continue;
+  return null;
+};
 
-    // if type == x
-    out.push([ Opcodes.local_get, tmp ]);
-    out.push(...number(x, Valtype.i32));
-    out.push([ Opcodes.i32_eq ]);
+const brTable = (input, bc, returns) => {
+  const out = [];
+  const keys = Object.keys(bc);
+  const count = keys.length;
 
-    out.push([ Opcodes.if, Blocktype.void, `TYPESWITCH|${TYPE_NAMES[x]}` ]);
-    out.push(...bc[x]);
-    out.push([ Opcodes.br, 1 ]);
-    out.push([ Opcodes.end ]);
+  if (count === 1) {
+    // return [
+    //   ...input,
+    //   ...bc[keys[0]]
+    // ];
+    return bc[keys[0]];
   }
 
-  // default
-  if (bc.default) out.push(...bc.default);
-    else if (returns !== Blocktype.void) out.push(...number(0, returns));
+  if (count === 2) {
+    // just use if else
+    const other = keys.find(x => x !== 'default');
+    return [
+      ...input,
+      ...number(other, Valtype.i32),
+      [ Opcodes.i32_eq ],
+      [ Opcodes.if, returns ],
+      ...bc[other],
+      [ Opcodes.else ],
+      ...bc.default,
+      [ Opcodes.end ]
+    ];
+  }
 
-  out.push([ Opcodes.end, 'TYPESWITCH_end' ]);
+  for (let i = 0; i < count; i++) {
+    if (i === 0) out.push([ Opcodes.block, returns, 'br table start' ]);
+      else out.push([ Opcodes.block, Blocktype.void ]);
+  }
 
-  return out;
-};
+  const nums = keys.filter(x => +x);
+  const offset = Math.min(...nums);
+  const max = Math.max(...nums);
 
-const allocVar = (scope, name, global = false) => {
-  const target = global ? globals : scope.locals;
+  const table = [];
+  let br = 1;
 
-  // already declared
+  for (let i = offset; i <= max; i++) {
+    // if branch for this num, go to that block
+    if (bc[i]) {
+      table.push(br);
+      br++;
+      continue;
+    }
+
+    // else default
+    table.push(0);
+  }
+
+  out.push(
+    [ Opcodes.block, Blocktype.void ],
+    ...input,
+    ...(offset > 0 ? [
+      ...number(offset, Valtype.i32),
+      [ Opcodes.i32_sub ]
+    ] : []),
+    [ Opcodes.br_table, ...encodeVector(table), 0 ]
+  );
+
+  // if you can guess why we sort the wrong way and then reverse
+  // (instead of just sorting the correct way)
+  // dm me and if you are correct and the first person
+  // I will somehow shout you out or something
+  const orderedBc = keys.sort((a, b) => b - a).reverse();
+
+  br = count - 1;
+  for (const x of orderedBc) {
+    out.push(
+      [ Opcodes.end ],
+      ...bc[x],
+      ...(br === 0 ? [] : [ [ Opcodes.br, br ] ])
+    );
+    br--;
+  }
+
+  return [
+    ...out,
+    [ Opcodes.end, 'br table end' ]
+  ];
+};
+
+const typeSwitch = (scope, type, bc, returns = valtypeBinary) => {
+  if (!Prefs.bytestring) delete bc[TYPES._bytestring];
+
+  const known = knownType(scope, type);
+  if (known != null) {
+    return bc[known] ?? bc.default;
+  }
+
+  if (Prefs.typeswitchUseBrtable)
+    return brTable(type, bc, returns);
+
+  const tmp = localTmp(scope, '#typeswitch_tmp', Valtype.i32);
+  const out = [
+    ...type,
+    [ Opcodes.local_set, tmp ],
+    [ Opcodes.block, returns ]
+  ];
+
+  for (const x in bc) {
+    if (x === 'default') continue;
+
+    // if type == x
+    out.push([ Opcodes.local_get, tmp ]);
+    out.push(...number(x, Valtype.i32));
+    out.push([ Opcodes.i32_eq ]);
+
+    out.push([ Opcodes.if, Blocktype.void, `TYPESWITCH|${TYPE_NAMES[x]}` ]);
+    out.push(...bc[x]);
+    out.push([ Opcodes.br, 1 ]);
+    out.push([ Opcodes.end ]);
+  }
+
+  // default
+  if (bc.default) out.push(...bc.default);
+    else if (returns !== Blocktype.void) out.push(...number(0, returns));
+
+  out.push([ Opcodes.end, 'TYPESWITCH_end' ]);
+
+  return out;
+};
+
+const allocVar = (scope, name, global = false, type = true) => {
+  const target = global ? globals : scope.locals;
+
+  // already declared
   if (target[name]) {
     // parser should catch this but sanity check anyway
     // if (decl.kind !== 'var') return internalThrow(scope, 'SyntaxError', `Identifier '${unhackName(name)}' has already been declared`);
@@ -1662,12 +2149,62 @@ const allocVar = (scope, name, global = false) => {
   let idx = global ? globalInd++ : scope.localInd++;
   target[name] = { idx, type: valtypeBinary };
 
-  let typeIdx = global ? globalInd++ : scope.localInd++;
-  target[name + '#type'] = { idx: typeIdx, type: Valtype.i32 };
+  if (type) {
+    let typeIdx = global ? globalInd++ : scope.localInd++;
+    target[name + '#type'] = { idx: typeIdx, type: Valtype.i32 };
+  }
 
   return idx;
 };
 
+const addVarMetadata = (scope, name, global = false, metadata = {}) => {
+  const target = global ? globals : scope.locals;
+
+  target[name].metadata ??= {};
+  for (const x in metadata) {
+    if (metadata[x] != null) target[name].metadata[x] = metadata[x];
+  }
+};
+
+const typeAnnoToPorfType = x => {
+  if (!x) return null;
+  if (TYPES[x.toLowerCase()] != null) return TYPES[x.toLowerCase()];
+  if (TYPES['_' + x.toLowerCase()] != null) return TYPES['_' + x.toLowerCase()];
+
+  switch (x) {
+    case 'i32':
+    case 'i64':
+    case 'f64':
+      return TYPES.number;
+  }
+
+  return null;
+};
+
+const extractTypeAnnotation = decl => {
+  let a = decl;
+  while (a.typeAnnotation) a = a.typeAnnotation;
+
+  let type = null, elementType = null;
+  if (a.typeName) {
+    type = a.typeName.name;
+  } else if (a.type.endsWith('Keyword')) {
+    type = a.type.slice(2, -7).toLowerCase();
+  } else if (a.type === 'TSArrayType') {
+    type = 'array';
+    elementType = extractTypeAnnotation(a.elementType).type;
+  }
+
+  const typeName = type;
+  type = typeAnnoToPorfType(type);
+
+  if (type === TYPES._bytestring && !Prefs.bytestring) type = TYPES.string;
+
+  // if (decl.name) console.log(decl.name, { type, elementType });
+
+  return { type, typeName, elementType };
+};
+
 const generateVar = (scope, decl) => {
   let out = [];
 
@@ -1679,6 +2216,8 @@ const generateVar = (scope, decl) => {
   for (const x of decl.declarations) {
     const name = mapName(x.id.name);
 
+    if (!name) return todo(scope, 'destructuring is not supported yet');
+
     if (x.init && isFuncType(x.init.type)) {
       // hack for let a = function () { ... }
       x.init.id = { name };
@@ -1694,7 +2233,13 @@ const generateVar = (scope, decl) => {
       continue; // always ignore
     }
 
-    let idx = allocVar(scope, name, global);
+    const typed = typedInput && x.id.typeAnnotation;
+    let idx = allocVar(scope, name, global, !(typed && extractTypeAnnotation(x.id).type != null));
+
+    if (typed) {
+      addVarMetadata(scope, name, global, extractTypeAnnotation(x.id));
+    }
+
     if (x.init) {
       out = out.concat(generate(scope, x.init, global, name));
 
@@ -1709,7 +2254,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') {
@@ -1724,22 +2270,30 @@ const generateAssign = (scope, decl) => {
     return [];
   }
 
+  const op = decl.operator.slice(0, -1) || '=';
+
   // 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');
+    const pointerTmp = op === '=' ? null : localTmp(scope, '__member_setter_ptr_tmp', Valtype.i32);
 
     return [
       ...(aotPointer ? number(0, Valtype.i32) : [
         ...generate(scope, decl.left.object),
         Opcodes.i32_to_u
       ]),
+      ...(!pointerTmp ? [] : [ [ Opcodes.local_tee, pointerTmp ] ]),
 
-      ...generate(scope, decl.right),
+      ...(op === '=' ? generate(scope, decl.right) : performOp(scope, op, [
+        [ Opcodes.local_get, pointerTmp ],
+        [ Opcodes.i32_load, Math.log2(ValtypeSize.i32) - 1, 0 ],
+        Opcodes.i32_from_u
+      ], generate(scope, decl.right), number(TYPES.number, Valtype.i32), getNodeType(scope, decl.right))),
       [ Opcodes.local_tee, newValueTmp ],
 
       Opcodes.i32_to_u,
@@ -1749,14 +2303,12 @@ const generateAssign = (scope, decl) => {
     ];
   }
 
-  const op = decl.operator.slice(0, -1) || '=';
-
   // 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);
@@ -1812,6 +2364,8 @@ const generateAssign = (scope, decl) => {
     ];
   }
 
+  if (!name) return todo(scope, 'destructuring is not supported yet', true);
+
   const [ local, isGlobal ] = lookupName(scope, name);
 
   if (local === undefined) {
@@ -1858,9 +2412,7 @@ const generateAssign = (scope, decl) => {
       ], getType(scope, name), getNodeType(scope, decl.right), isGlobal, name, true),
       [ isGlobal ? Opcodes.global_get : Opcodes.local_get, local.idx ],
 
-      [ Opcodes.local_get, localTmp(scope, '#last_type', Valtype.i32) ],
-      // hack: type is idx+1
-      [ isGlobal ? Opcodes.global_set : Opcodes.local_set, local.idx + 1 ],
+      ...setType(scope, name, getLastType(scope))
     ];
   }
 
@@ -1871,9 +2423,7 @@ const generateAssign = (scope, decl) => {
 
     // todo: string concat types
 
-    // hack: type is idx+1
-    ...number(TYPES.number, Valtype.i32),
-    [ isGlobal ? Opcodes.global_set : Opcodes.local_set, local.idx + 1 ],
+    ...setType(scope, name, TYPES.number)
   ];
 };
 
@@ -1919,7 +2469,7 @@ const generateUnary = (scope, decl) => {
       return out;
     }
 
-    case 'delete':
+    case 'delete': {
       let toReturn = true, toGenerate = true;
 
       if (decl.argument.type === 'Identifier') {
@@ -1941,38 +2491,60 @@ 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);
+
+        // 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);
 
-    case 'typeof':
-      return typeSwitch(scope, getNodeType(scope, decl.argument), {
+      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'),
         [TYPES.undefined]: makeString(scope, 'undefined', false, '#typeof_result'),
         [TYPES.function]: makeString(scope, 'function', false, '#typeof_result'),
 
+        [TYPES._bytestring]: makeString(scope, 'string', false, '#typeof_result'),
+
         // 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 '++':
@@ -1985,7 +2557,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;
 };
@@ -2025,7 +2597,7 @@ const generateConditional = (scope, decl) => {
   // note type
   out.push(
     ...getNodeType(scope, decl.consequent),
-    [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
+    ...setLastType(scope)
   );
 
   out.push([ Opcodes.else ]);
@@ -2034,7 +2606,7 @@ const generateConditional = (scope, decl) => {
   // note type
   out.push(
     ...getNodeType(scope, decl.alternate),
-    [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
+    ...setLastType(scope)
   );
 
   out.push([ Opcodes.end ]);
@@ -2048,15 +2620,17 @@ 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);
   }
 
   out.push([ Opcodes.loop, Blocktype.void ]);
   depth.push('for');
 
-  out.push(...generate(scope, decl.test));
-  out.push(Opcodes.i32_to, [ Opcodes.if, Blocktype.void ]);
+  if (decl.test) out.push(...generate(scope, decl.test), Opcodes.i32_to);
+    else out.push(...number(1, Valtype.i32));
+
+  out.push([ Opcodes.if, Blocktype.void ]);
   depth.push('if');
 
   out.push([ Opcodes.block, Blocktype.void ]);
@@ -2064,8 +2638,7 @@ const generateFor = (scope, decl) => {
   out.push(...generate(scope, decl.body));
   out.push([ Opcodes.end ]);
 
-  out.push(...generate(scope, decl.update));
-  depth.pop();
+  if (decl.update) out.push(...generate(scope, decl.update, false, undefined, true));
 
   out.push([ Opcodes.br, 1 ]);
   out.push([ Opcodes.end ], [ Opcodes.end ]);
@@ -2093,6 +2666,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 = [];
 
@@ -2122,8 +2725,17 @@ const generateForOf = (scope, decl) => {
   // setup local for left
   generate(scope, decl.left);
 
-  const leftName = decl.left.declarations[0].id.name;
+  let leftName = decl.left.declarations?.[0]?.id?.name;
+  if (!leftName && decl.left.name) {
+    leftName = decl.left.name;
+
+    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');
@@ -2131,13 +2743,15 @@ const generateForOf = (scope, decl) => {
   // // todo: we should only do this for strings but we don't know at compile-time :(
   // hack: this is naughty and will break things!
   let newOut = number(0, Valtype.f64), newPointer = -1;
-  if (pages.hasString) {
+  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');
   }
 
   // set type for local
+  // todo: optimize away counter and use end pointer
   out.push(...typeSwitch(scope, getNodeType(scope, decl.right), {
     [TYPES._array]: [
       ...setType(scope, leftName, TYPES.number),
@@ -2222,6 +2836,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));
 
@@ -2232,28 +2896,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;
 
@@ -2262,7 +2963,7 @@ const generateThrow = (scope, decl) => {
   // hack: throw new X("...") -> throw "..."
   if (!message && (decl.argument.type === 'NewExpression' || decl.argument.type === 'CallExpression')) {
     constructor = decl.argument.callee.name;
-    message = decl.argument.arguments[0].value;
+    message = decl.argument.arguments[0]?.value ?? '';
   }
 
   if (tags.length === 0) tags.push({
@@ -2274,6 +2975,9 @@ const generateThrow = (scope, decl) => {
   let exceptId = exceptions.push({ constructor, message }) - 1;
   let tagIdx = tags[0].idx;
 
+  scope.exceptions ??= [];
+  scope.exceptions.push(exceptId);
+
   // todo: write a description of how this works lol
 
   return [
@@ -2283,7 +2987,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 = [];
 
@@ -2314,29 +3018,35 @@ 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();
-const allocPage = (reason, type) => {
+const allocPage = (scope, reason, type) => {
   if (pages.has(reason)) return pages.get(reason).ind;
 
   if (reason.startsWith('array:')) pages.hasArray = true;
   if (reason.startsWith('string:')) pages.hasString = true;
+  if (reason.startsWith('bytestring:')) pages.hasByteString = true;
+  if (reason.includes('string:')) pages.hasAnyString = true;
 
   const ind = pages.size;
   pages.set(reason, { ind, type });
 
-  if (allocLog) log('alloc', `allocated new page of memory (${ind}) | ${reason} (type: ${type})`);
+  scope.pages ??= new Map();
+  scope.pages.set(reason, { ind, type });
+
+  if (Prefs.allocLog) log('alloc', `allocated new page of memory (${ind}) | ${reason} (type: ${type})`);
 
   return ind;
 };
 
+// todo: add scope.pages
 const freePage = reason => {
   const { ind } = pages.get(reason);
   pages.delete(reason);
 
-  if (allocLog) log('alloc', `freed page of memory (${ind}) | ${reason}`);
+  if (Prefs.allocLog) log('alloc', `freed page of memory (${ind}) | ${reason}`);
 
   return ind;
 };
@@ -2356,38 +3066,51 @@ const StoreOps = {
   f64: Opcodes.f64_store,
 
   // expects i32 input!
-  i16: Opcodes.i32_store16
+  i8: Opcodes.i32_store8,
+  i16: Opcodes.i32_store16,
 };
 
 let data = [];
 
-const compileBytes = (val, itemType, signed = true) => {
+const compileBytes = (val, itemType) => {
   // todo: this is a mess and needs confirming / ????
   switch (itemType) {
     case 'i8': return [ val % 256 ];
-    case 'i16': return [ val % 256, Math.floor(val / 256) ];
-
-    case 'i32':
-    case 'i64':
-      return enforceFourBytes(signedLEB128(val));
+    case 'i16': return [ val % 256, (val / 256 | 0) % 256 ];
+    case 'i16': return [ val % 256, (val / 256 | 0) % 256 ];
+    case 'i32': return [...new Uint8Array(new Int32Array([ val ]).buffer)];
+    // todo: i64
 
     case 'f64': return ieee754_binary64(val);
   }
 };
 
+const getAllocType = itemType => {
+  switch (itemType) {
+    case 'i8': return 'bytestring';
+    case 'i16': return 'string';
+
+    default: return 'array';
+  }
+};
+
 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(`${itemType === 'i16' ? 'string' : 'array'}: ${uniqueName}`, itemType) * pageSize);
+
+    if (Prefs.scopedPageNames) scope.arrays.set(name, allocPage(scope, `${getAllocType(itemType)}: ${scope.name}/${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;
@@ -2395,19 +3118,25 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
   const valtype = itemTypeToValtype[itemType];
   const length = elements.length;
 
-  if (firstAssign && useRawElements) {
-    let bytes = compileBytes(length, 'i32');
+  if (firstAssign && useRawElements && !Prefs.noData) {
+    // if length is 0 memory/data will just be 0000... anyway
+    if (length !== 0) {
+      let bytes = compileBytes(length, 'i32');
 
-    if (!initEmpty) for (let i = 0; i < length; i++) {
-      if (elements[i] == null) continue;
+      if (!initEmpty) for (let i = 0; i < length; i++) {
+        if (elements[i] == null) continue;
 
-      bytes.push(...compileBytes(elements[i], itemType));
-    }
+        bytes.push(...compileBytes(elements[i], itemType));
+      }
 
-    data.push({
-      offset: pointer,
-      bytes
-    });
+      const ind = data.push({
+        offset: pointer,
+        bytes
+      }) - 1;
+
+      scope.data ??= [];
+      scope.data.push(ind);
+    }
 
     // local value as pointer
     out.push(...number(pointer));
@@ -2430,7 +3159,7 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
     out.push(
       ...number(0, Valtype.i32),
       ...(useRawElements ? number(elements[i], Valtype[valtype]) : generate(scope, elements[i])),
-      [ storeOp, Math.log2(ValtypeSize[itemType]) - 1, ...unsignedLEB128(pointer + ValtypeSize.i32 + i * ValtypeSize[itemType]) ]
+      [ storeOp, (Math.log2(ValtypeSize[itemType]) || 1) - 1, ...unsignedLEB128(pointer + ValtypeSize.i32 + i * ValtypeSize[itemType]) ]
     );
   }
 
@@ -2440,31 +3169,56 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
   return [ out, pointer ];
 };
 
-const makeString = (scope, str, global = false, name = '$undeclared') => {
+const byteStringable = str => {
+  if (!Prefs.bytestring) return false;
+
+  for (let i = 0; i < str.length; i++) {
+    if (str.charCodeAt(i) > 0xFF) return false;
+  }
+
+  return true;
+};
+
+const makeString = (scope, str, global = false, name = '$undeclared', forceBytestring = undefined) => {
   const rawElements = new Array(str.length);
+  let byteStringable = Prefs.bytestring;
   for (let i = 0; i < str.length; i++) {
-    rawElements[i] = str.charCodeAt(i);
+    const c = str.charCodeAt(i);
+    rawElements[i] = c;
+
+    if (byteStringable && c > 0xFF) byteStringable = false;
   }
 
+  if (byteStringable && forceBytestring === false) byteStringable = false;
+
   return makeArray(scope, {
     rawElements
-  }, global, name, false, 'i16')[0];
+  }, 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),
@@ -2476,10 +3230,13 @@ export const generateMember = (scope, decl, _global, _name) => {
     ];
   }
 
+  const object = generate(scope, decl.object);
+  const property = generate(scope, decl.property);
+
   // // todo: we should only do this for strings but we don't know at compile-time :(
   // hack: this is naughty and will break things!
-  let newOut = number(0, Valtype.f64), newPointer = -1;
-  if (pages.hasString) {
+  let newOut = number(0, valtypeBinary), newPointer = -1;
+  if (pages.hasAnyString) {
     0, [ newOut, newPointer ] = makeArray(scope, {
       rawElements: new Array(1)
     }, _global, _name, true, 'i16');
@@ -2488,7 +3245,7 @@ export const generateMember = (scope, decl, _global, _name) => {
   return typeSwitch(scope, getNodeType(scope, decl.object), {
     [TYPES._array]: [
       // get index as valtype
-      ...generate(scope, decl.property),
+      ...property,
 
       // convert to i32 and turn into byte offset by * valtypeSize (4 for i32, 8 for i64/f64)
       Opcodes.i32_to_u,
@@ -2496,7 +3253,7 @@ export const generateMember = (scope, decl, _global, _name) => {
       [ Opcodes.i32_mul ],
 
       ...(aotPointer ? [] : [
-        ...generate(scope, decl.object),
+        ...object,
         Opcodes.i32_to_u,
         [ Opcodes.i32_add ]
       ]),
@@ -2505,7 +3262,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),
-      [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
+      ...setLastType(scope)
     ],
 
     [TYPES.string]: [
@@ -2515,14 +3272,14 @@ export const generateMember = (scope, decl, _global, _name) => {
 
       ...number(0, Valtype.i32), // base 0 for store later
 
-      ...generate(scope, decl.property),
-
+      ...property,
       Opcodes.i32_to_u,
+
       ...number(ValtypeSize.i16, Valtype.i32),
       [ Opcodes.i32_mul ],
 
       ...(aotPointer ? [] : [
-        ...generate(scope, decl.object),
+        ...object,
         Opcodes.i32_to_u,
         [ Opcodes.i32_add ]
       ]),
@@ -2537,10 +3294,38 @@ export const generateMember = (scope, decl, _global, _name) => {
       ...number(newPointer),
 
       ...number(TYPES.string, Valtype.i32),
-      [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
+      ...setLastType(scope)
+    ],
+    [TYPES._bytestring]: [
+      // setup new/out array
+      ...newOut,
+      [ Opcodes.drop ],
+
+      ...number(0, Valtype.i32), // base 0 for store later
+
+      ...property,
+      Opcodes.i32_to_u,
+
+      ...(aotPointer ? [] : [
+        ...object,
+        Opcodes.i32_to_u,
+        [ Opcodes.i32_add ]
+      ]),
+
+      // load current string ind {arg}
+      [ Opcodes.i32_load8_u, 0, ...unsignedLEB128((aotPointer ? pointer : 0) + ValtypeSize.i32) ],
+
+      // store to new string ind 0
+      [ Opcodes.i32_store8, 0, ...unsignedLEB128(newPointer + ValtypeSize.i32) ],
+
+      // return new string (page)
+      ...number(newPointer),
+
+      ...number(TYPES._bytestring, Valtype.i32),
+      ...setLastType(scope)
     ],
 
-    default: [ [ Opcodes.unreachable ] ]
+    default: internalThrow(scope, 'TypeError', 'Member expression is not supported for non-string non-array yet', true)
   });
 };
 
@@ -2550,25 +3335,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;
+      }
 
-    const name = '__' + objectName + '_' + node.property.name;
-    if (codeLog) log('codegen', `object hack! ${node.object.name}.${node.property.name} -> ${name}`);
+      // no object name, give up
+      if (!objectName) return;
 
-    return {
-      type: 'Identifier',
-      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
+      };
+    })();
+
+    if (out) return out;
   }
 
   for (const x in node) {
@@ -2582,11 +3378,11 @@ 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?.map(x => x.name) ?? [];
+  const params = decl.params ?? [];
 
   // const innerScope = { ...scope };
   // TODO: share scope/locals between !!!
@@ -2599,8 +3395,17 @@ 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], false);
+    allocVar(innerScope, params[i].name, false);
+
+    if (typedInput && params[i].typeAnnotation) {
+      addVarMetadata(innerScope, params[i].name, false, extractTypeAnnotation(params[i]));
+    }
   }
 
   let body = objectHack(decl.body);
@@ -2616,13 +3421,13 @@ const generateFunc = (scope, decl) => {
   const func = {
     name,
     params: Object.values(innerScope.locals).slice(0, params.length * 2).map(x => x.type),
-    returns: innerScope.returns,
-    locals: innerScope.locals,
-    throws: innerScope.throws,
-    index: currentFuncIndex++
+    index: currentFuncIndex++,
+    ...innerScope
   };
   funcIndex[name] = func.index;
 
+  if (name === 'main') func.gotLastType = true;
+
   // quick hack fixes
   for (const inst of wasm) {
     if (inst[0] === Opcodes.call && inst[1] === -1) {
@@ -2639,117 +3444,6 @@ const generateFunc = (scope, decl) => {
     );
   }
 
-  // change v128 params into many <type> (i32x4 -> i32/etc) instead as unsupported param valtype
-  let offset = 0, vecParams = 0;
-  for (let i = 0; i < params.length; i++) {
-    const name = params[i];
-    const local = func.locals[name];
-    if (local.type === Valtype.v128) {
-      vecParams++;
-
-      /* wasm.unshift( // add v128 load for param
-        [ Opcodes.i32_const, 0 ],
-        [ ...Opcodes.v128_load, 0, i * 16 ],
-        [ Opcodes.local_set, local.idx ]
-      ); */
-
-      // using params and replace_lane is noticably faster than just loading from memory (above) somehow
-
-      // extract valtype and lane count from vec type (i32x4 = i32 4, i8x16 = i8 16, etc)
-      const { vecType } = local;
-      let [ type, lanes ] = vecType.split('x');
-      if (!type || !lanes) throw new Error('bad metadata from vec params'); // sanity check
-
-      lanes = parseInt(lanes);
-      type = Valtype[type];
-
-      const name = params[i]; // get original param name
-
-      func.params.splice(offset, 1, ...new Array(lanes).fill(type)); // add new params of {type}, {lanes} times
-
-      // update index of original local
-      // delete func.locals[name];
-
-      // add new locals for params
-      for (let j = 0; j < lanes; j++) {
-        func.locals[name + j] = { idx: offset + j, type, vecParamAutogen: true };
-      }
-
-      // prepend wasm to generate expected v128 locals
-      wasm.splice(i * 2 + offset * 2, 0,
-        ...i32x4(0, 0, 0, 0),
-        ...new Array(lanes).fill(0).flatMap((_, j) => [
-          [ Opcodes.local_get, offset + j ],
-          [ ...Opcodes[vecType + '_replace_lane'], j ]
-        ]),
-        [ Opcodes.local_set, i ]
-      );
-
-      offset += lanes;
-
-      // note: wrapping is disabled for now due to perf/dx concerns (so this will never run)
-      /* if (!func.name.startsWith('#')) func.name = '##' + func.name;
-
-      // add vec type index to hash name prefix for wrapper to know how to wrap
-      const vecTypeIdx = [ 'i8x16', 'i16x8', 'i32x4', 'i64x2', 'f32x4', 'f64x2' ].indexOf(local.vecType);
-      const secondHash = func.name.slice(1).indexOf('#');
-      func.name = '#' + func.name.slice(1, secondHash) + vecTypeIdx + func.name.slice(secondHash); */
-    }
-  }
-
-  if (offset !== 0) {
-    // bump local indexes for all other locals after
-    for (const x in func.locals) {
-      const local = func.locals[x];
-      if (!local.vecParamAutogen) local.idx += offset;
-    }
-
-    // bump local indexes in wasm local.get/set
-    for (let j = 0; j < wasm.length; j++) {
-      const inst = wasm[j];
-      if (j < offset * 2 + vecParams * 2) {
-        if (inst[0] === Opcodes.local_set) inst[1] += offset;
-        continue;
-      }
-
-      if (inst[0] === Opcodes.local_get || inst[0] === Opcodes.local_set) inst[1] += offset;
-    }
-  }
-
-  // change v128 return into many <type> instead as unsupported return valtype
-  const lastReturnLocal = wasm.length > 2 && wasm[wasm.length - 1][0] === Opcodes.return && Object.values(func.locals).find(x => x.idx === wasm[wasm.length - 2][1]);
-  if (lastReturnLocal && lastReturnLocal.type === Valtype.v128) {
-    const name = Object.keys(func.locals)[Object.values(func.locals).indexOf(lastReturnLocal)];
-    // extract valtype and lane count from vec type (i32x4 = i32 4, i8x16 = i8 16, etc)
-    const { vecType } = lastReturnLocal;
-    let [ type, lanes ] = vecType.split('x');
-    if (!type || !lanes) throw new Error('bad metadata from vec params'); // sanity check
-
-    lanes = parseInt(lanes);
-    type = Valtype[type];
-
-    const vecIdx = lastReturnLocal.idx;
-
-    const lastIdx = Math.max(0, ...Object.values(func.locals).map(x => x.idx));
-    const tmpIdx = [];
-    for (let i = 0; i < lanes; i++) {
-      const idx = lastIdx + i + 1;
-      tmpIdx.push(idx);
-      func.locals[name + i] = { idx, type, vecReturnAutogen: true };
-    }
-
-    wasm.splice(wasm.length - 1, 1,
-      ...new Array(lanes).fill(0).flatMap((_, i) => [
-        i === 0 ? null : [ Opcodes.local_get, vecIdx ],
-        [ ...Opcodes[vecType + '_extract_lane'], i ],
-        [ Opcodes.local_set, tmpIdx[i] ],
-      ].filter(x => x !== null)),
-      ...new Array(lanes).fill(0).map((_, i) => [ Opcodes.local_get, tmpIdx[i]])
-    );
-
-    func.returns = new Array(lanes).fill(type);
-  }
-
   func.wasm = wasm;
 
   funcs.push(func);
@@ -2785,7 +3479,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),
@@ -2796,7 +3490,8 @@ const internalConstrs = {
         ...number(pointer)
       ];
     },
-    type: TYPES._array
+    type: TYPES._array,
+    length: 1
   },
 
   __Array_of: {
@@ -2808,7 +3503,131 @@ 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 ] ] : [])
+        );
+      }
+
+      out.push(Opcodes.i32_from_u);
+
+      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 ] ] : [])
+        );
+      }
+
+      out.push(Opcodes.i32_from_u);
+
+      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
+  },
+
+  __console_log: {
+    generate: (scope, decl) => {
+      const out = [];
+
+      for (let i = 0; i < decl.arguments.length; i++) {
+        out.push(
+          ...generateCall(scope, {
+            callee: {
+              type: 'Identifier',
+              name: '__Porffor_print'
+            },
+            arguments: [ decl.arguments[i] ]
+          }),
+
+          // print space
+          ...number(32),
+          [ Opcodes.call, importedFuncs.printChar ]
+        );
+      }
+
+      // print newline
+      out.push(
+        ...number(10),
+        [ Opcodes.call, importedFuncs.printChar ]
+      );
+
+      return out;
+    },
+    type: TYPES.undefined,
+    notConstr: true,
+    length: 0
   }
 };
 
@@ -2837,20 +3656,23 @@ export default program => {
   funcs = [];
   funcIndex = {};
   depth = [];
-  arrays = new Map();
   pages = new Map();
   data = [];
   currentFuncIndex = importedFuncs.length;
 
   globalThis.valtype = 'f64';
 
-  const valtypeOpt = process.argv.find(x => x.startsWith('-valtype='));
+  const valtypeOpt = process.argv.find(x => x.startsWith('--valtype='));
   if (valtypeOpt) valtype = valtypeOpt.split('=')[1];
 
   globalThis.valtypeBinary = Valtype[valtype];
 
   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];
@@ -2859,10 +3681,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];
@@ -2875,10 +3697,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
@@ -2889,7 +3707,7 @@ export default program => {
     body: program.body
   };
 
-  if (process.argv.includes('-ast-log')) console.log(program.body.body);
+  if (Prefs.astLog) console.log(JSON.stringify(program.body.body, null, 2));
 
   generateFunc(scope, program);
 
@@ -2906,7 +3724,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) {