porffor 0.60.19 → 0.60.21

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 = [
@@ -467,7 +471,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 +571,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/jsr.json

@@ -1,6 +1,6 @@
 {
   "name": "@honk/porffor",
-  "version": "0.60.19",
+  "version": "0.60.21",
   "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.19",
+  "version": "0.60.21",
   "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.19';
+globalThis.version = '0.60.21';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {