porffor 0.60.1 → 0.60.3

package/compiler/codegen.js

@@ -5361,6 +5361,20 @@ const ensureTag = (exceptionMode = Prefs.exceptionMode ?? 'stack') => {
 };
 
 const generateThrow = (scope, decl) => {
+  if (Prefs.unreachableExceptions) {
+    return [
+      ...generate(scope, {
+        type: 'CallExpression',
+        callee: {
+          type: 'Identifier',
+          name: '__console_log'
+        },
+        arguments: [ decl.argument ]
+      }),
+      [ Opcodes.unreachable ]
+    ];
+  }
+
   if (Prefs.wasmExceptions === false) {
     return [
       ...(scope.returns.length === 0 ? [] : [ number(0, scope.returns[0]) ]),

package/compiler/index.js

@@ -57,6 +57,7 @@ const progressClear = () => {
   if (globalThis.onProgress) return;
   if (!process.stdout.isTTY) return;
 
+  clearInterval(progressInterval);
   process.stdout.write(`\u001b[${progressLines}F\u001b[0J`);
   progressLines = 0;
 };
@@ -199,7 +200,7 @@ export default (code, module = Prefs.module) => {
   const out = { funcs, globals, tags, exceptions, pages, data, times: [ t0, t1, t2, t3 ] };
   if (globalThis.precompile) return out;
 
-  const wasm = out.wasm = assemble(funcs, globals, tags, pages, data);
+  let wasm = out.wasm = assemble(funcs, globals, tags, pages, data);
   if (logProgress) progressDone('assembled', t3);
 
   if (Prefs.optFuncs || Prefs.f) logFuncs(funcs, globals, exceptions);
@@ -211,6 +212,48 @@ 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';
+
+    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'
+    });
+
+    out.wasm = wasm = fs.readFileSync(tmpFile, null);
+    fs.unlinkSync(tmpFile);
+  }
+
   if (target === 'wasm' && outFile) {
     fs.writeFileSync(outFile, Buffer.from(wasm));
 
@@ -281,7 +324,7 @@ export default (code, module = Prefs.module) => {
       encoding: 'utf8'
     });
 
-    if (logProgress) progressStart(`compiled C to native (using ${compiler})`, t5);
+    if (logProgress) progressDone(`compiled C to native (using ${compiler})`, t5);
 
     if (Prefs.native) {
       const cleanup = () => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "porffor",
   "description": "An ahead-of-time JavaScript compiler",
-  "version": "0.60.1",
+  "version": "0.60.3",
   "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.1';
+globalThis.version = '0.60.3';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {