porffor 0.60.20 → 0.60.22

package/compiler/codegen.js

@@ -611,8 +611,8 @@ const lookup = (scope, name, failEarly = false) => {
     return wasm.slice();
   }
 
-  if (!(name in funcIndex) && name in builtinFuncs) {
-    includeBuiltin(scope, name);
+  if (name in builtinFuncs) {
+    if (!(name in funcIndex)) includeBuiltin(scope, name);
   } else if (name in internalConstrs) {
     // todo: return an actual something
     return [ number(1) ];
@@ -882,7 +882,7 @@ const generateReturn = (scope, decl) => {
 };
 
 const localTmp = (scope, name, type = valtypeBinary) => {
-  if (scope.locals[name]) return scope.locals[name].idx;
+  if (name in scope.locals) return scope.locals[name].idx;
 
   let idx = scope.localInd++;
   scope.locals[name] = { idx, type };
@@ -3015,6 +3015,34 @@ const typeSwitch = (scope, type, bc, returns = valtypeBinary, fallthrough = fals
     return typeof def === 'function' ? def() : def;
   }
 
+  if (bc.length === 2 && (bc[0][0] === 'default' || bc[1][0] === 'default')) {
+    let trueCase, falseCase;
+    if (bc[0][0] === 'default') {
+      trueCase = bc[1];
+      falseCase = bc[0];
+    } else {
+      trueCase = bc[0];
+      falseCase = bc[1];
+    }
+
+    if (!Array.isArray(trueCase[0])) {
+      depth.push('if');
+      const out = [
+        ...type,
+        number(trueCase[0], Valtype.i32),
+        [ Opcodes.i32_eq ],
+        [ Opcodes.if, returns ],
+          ...typeof trueCase[1] === 'function' ? trueCase[1]() : trueCase[1],
+        [ Opcodes.else ],
+          ...typeof falseCase[1] === 'function' ? falseCase[1]() : falseCase[1],
+        [ Opcodes.end ],
+      ];
+      depth.pop();
+
+      return out;
+    }
+  }
+
   if (Prefs.typeswitchBrtable) {
     if (fallthrough) throw new Error(`Fallthrough is not currently supported with --typeswitch-brtable`);
     return brTable(type, bc, returns);
@@ -3131,7 +3159,7 @@ const typeIsNotOneOf = (type, types, valtype = Valtype.i32) => {
   return out;
 };
 
-const allocVar = (scope, name, global = false, type = true, redecl = false, i32 = false) => {
+const allocVar = (scope, name, global = false, type = true, i32 = false, redecl = false) => {
   const target = global ? globals : scope.locals;
 
   // already declared
@@ -6457,7 +6485,7 @@ const generateClass = (scope, decl) => {
       // define in construction instead
       if (computed) {
         // compute key now, reference in construction
-        const computedTmp = allocVar(scope, `#class_computed_prop${uniqId()}`, true, true, false, true);
+        const computedTmp = allocVar(scope, `#class_computed_prop${uniqId()}`, true, true, true);
 
         out.push(
           ...toPropertyKey(scope, generate(scope, key), getNodeType(scope, key), computed, true),
@@ -6847,7 +6875,7 @@ const generateFunc = (scope, decl, forceNoExpr = false) => {
         const { name, def, destr, type } = args[i];
 
         func.localInd = i * 2;
-        allocVar(func, name, false, true, true);
+        allocVar(func, name, false, true, false, true);
 
         func.localInd = localInd;
         if (type) {
@@ -7186,8 +7214,7 @@ const internalConstrs = {
       }, global, name);
     },
     type: TYPES.array,
-    notConstr: true,
-    length: 0
+    notConstr: true
   },
 
   __Porffor_fastOr: {
@@ -7246,8 +7273,7 @@ const internalConstrs = {
       return out;
     },
     type: TYPES.number,
-    notConstr: true,
-    length: 2
+    notConstr: true
   },
 
   __Math_min: {
@@ -7266,8 +7292,7 @@ const internalConstrs = {
       return out;
     },
     type: TYPES.number,
-    notConstr: true,
-    length: 2
+    notConstr: true
   },
 
   __Porffor_printStatic: {
@@ -7278,8 +7303,7 @@ const internalConstrs = {
       return out;
     },
     type: TYPES.undefined,
-    notConstr: true,
-    length: 1
+    notConstr: true
   },
 
   __Porffor_type: {
@@ -7288,15 +7312,13 @@ const internalConstrs = {
       Opcodes.i32_from_u
     ],
     type: TYPES.number,
-    notConstr: true,
-    length: 1
+    notConstr: true
   },
 
   __Porffor_compileType: {
     generate: (scope, decl) => makeString(scope, TYPE_NAMES[knownType(scope, getNodeType(scope, decl.arguments[0]))] ?? 'unknown'),
     type: TYPES.bytestring,
-    notConstr: true,
-    length: 1
+    notConstr: true
   },
 
   __Porffor_call: {
@@ -7319,8 +7341,7 @@ const internalConstrs = {
       _new: decl.arguments[3].value !== null,
       _forceCreateThis: true
     }),
-    notConstr: true,
-    length: 1
+    notConstr: true
   },
 
   __console_log: {
@@ -7359,8 +7380,7 @@ const internalConstrs = {
       return fast('__Porffor_consolePrint');
     },
     type: TYPES.undefined,
-    notConstr: true,
-    length: 0
+    notConstr: true
   }
 };
 

package/compiler/cyclone.js

@@ -19,12 +19,16 @@ const f64ToI32Op = {
 // const inv = (obj, keyMap = x => x) => Object.keys(obj).reduce((acc, x) => { acc[keyMap(obj[x])] = x; return acc; }, {});
 // const invOpcodes = inv(Opcodes);
 
-export default ({ name, wasm, locals: _locals, params }) => {
+export default ({ name, wasm, locals: _locals, params }, _globals) => {
   let locals = Object.values(_locals);
-  const localNames = Object.keys(_locals);
+  // const localNames = Object.keys(_locals);
   const localValtypes = locals.map(x => x.type);
   const localNeeded = new Array(locals.length).fill(0);
 
+  let globals = Object.values(_globals);
+  const globalValtypes = globals.map(x => x.type);
+  // const globalNeeded = new Array(globals.length).fill(0);
+
   // every pass does the same initial low level things
   // each subsequent pass does it again and does more high-level things
   const passes = [
@@ -42,6 +46,7 @@ export default ({ name, wasm, locals: _locals, params }) => {
 
     const reset = () => {
       locals = new Array(locals.length).fill(false);
+      globals = new Array(globals.length).fill(false);
       empty();
     };
 
@@ -467,7 +472,7 @@ export default ({ name, wasm, locals: _locals, params }) => {
           break;
         }
 
-        case Opcodes.f64_copysign: { // ?
+        case Opcodes.f64_copysign: { // todo: check behavior
           if (stack.length < 2) { empty(); break; };
           const [ b, a ] = pop2();
           const v = Math.abs(a) * (b > 0 ? 1 : -1);
@@ -567,6 +572,29 @@ export default ({ name, wasm, locals: _locals, params }) => {
           break;
         }
 
+        case Opcodes.global_get: {
+          const x = globals[op[1]];
+          if (x === false) {
+            empty();
+          } else {
+            replaceVal(x, globalValtypes[op[1]]);
+            push(x);
+          }
+          break;
+        }
+
+        case Opcodes.global_set: {
+          if (stack.length < 1) {
+            globals[op[1]] = false;
+            empty();
+            break;
+          }
+
+          const x = peek();
+          globals[op[1]] = x;
+          break;
+        }
+
         case Opcodes.block:
         case Opcodes.loop:
         case Opcodes.try:

package/compiler/index.js

@@ -135,7 +135,7 @@ export default (code, module = Prefs.module) => {
 
       for (const x of funcs) {
         const preOps = x.wasm.length;
-        cyclone(x);
+        cyclone(x, globals);
 
         if (preOps !== x.wasm.length) console.log(`${x.name}: ${preOps} -> ${x.wasm.length} ops`);
       }
@@ -147,7 +147,7 @@ export default (code, module = Prefs.module) => {
       console.log(`cyclone size diff: ${oldSize - newSize} bytes (${oldSize} -> ${newSize})\n`);
     } else {
       for (const x of funcs) {
-        cyclone(x);
+        cyclone(x, globals);
       }
     }
   }
@@ -212,46 +212,18 @@ export default (code, module = Prefs.module) => {
     console.log([...pages.keys()].map(x => `\x1B[36m - ${x}\x1B[0m`).join('\n') + '\n');
   }
 
-  if (Prefs.emscripten) {
-    const tmpFile = 'porffor_tmp.wasm';
-    const cO = Prefs._cO ?? 'Oz';
+  if (Prefs.wasmOpt) {
+    if (logProgress) progressStart('wasm-opt...');
 
-    const args = [
-      'emcc',
-      '-xc', '-', // use stdin as c source in
-      '-s', 'STANDALONE_WASM=1',
-      '-s', 'NO_FILESYSTEM=1',
-      '-s', 'EXPORTED_FUNCTIONS=\'["_m"]\'',
-      '-nostartfiles',
-      '-Wl,--no-entry',
-      '-o', tmpFile,
-      '-' + cO,
-      Prefs.d ? '-g' : ''
-    ];
-
-    if (Prefs.clangFast) args.push('-flto=thin', '-march=native', '-ffast-math', '-fno-asynchronous-unwind-tables');
-
-    if (Prefs.s) args.push('-s');
-
-    Prefs['2cWasmImports'] = true;
-    const c = toc(out)
-    .replace(`int main()`, `
-void __wasi_proc_exit(int code) {
-  __builtin_trap();
-}
-
-int m()`);
-    Prefs['2cWasmImports'] = false;
-
-    // obvious command escape is obvious
-    execSync(args.join(' '), {
-      stdio: [ 'pipe', 'inherit', 'inherit' ],
-      input: c,
-      encoding: 'utf8'
+    const t4 = performance.now();
+    const newWasm = execSync(`wasm-opt -all -O4 -o -`, {
+      stdio: [ 'pipe', 'pipe', 'pipe' ],
+      input: wasm,
+      encoding: null
     });
+    wasm = out.wasm = new Uint8Array(newWasm);
 
-    out.wasm = wasm = fs.readFileSync(tmpFile, null);
-    fs.unlinkSync(tmpFile);
+    if (logProgress) progressDone('wasm-opt', t4);
   }
 
   if (target === 'wasm' && outFile) {

package/foo.js

@@ -0,0 +1 @@
+(typeof console === 'undefined' ? print : console.log)('lol');

package/jsr.json

@@ -1,6 +1,6 @@
 {
   "name": "@honk/porffor",
-  "version": "0.60.20",
+  "version": "0.60.22",
   "exports": "./compiler/wrap.js",
   "publish": {
     "exclude": [

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "porffor",
   "description": "An ahead-of-time JavaScript compiler",
-  "version": "0.60.20",
+  "version": "0.60.22",
   "author": "Oliver Medhurst <honk@goose.icu>",
   "license": "MIT",
   "scripts": {},

package/runtime/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import fs from 'node:fs';
-globalThis.version = '0.60.20';
+globalThis.version = '0.60.22';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {