porffor 0.50.19 → 0.50.21

package/compiler/codegen.js

@@ -305,7 +305,7 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
 
     case 'DebuggerStatement':
       return cacheAst(decl, [
-        [ Opcodes.call, importedFuncs.debugger ],
+        // [ Opcodes.call, importedFuncs.debugger ],
         number(UNDEFINED)
       ]);
 
@@ -332,7 +332,7 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
       return cacheAst(decl, generateTemplate(scope, decl));
 
     case 'TaggedTemplateExpression':
-      return cacheAst(decl, generateTaggedTemplate(scope, decl, global, name));
+      return cacheAst(decl, generateTaggedTemplate(scope, decl, global, name, valueUnused));
 
     case 'ExportNamedDeclaration':
       if (!decl.declaration) return todo(scope, 'unsupported export declaration', true);
@@ -2438,26 +2438,26 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
       // pointer, align, offset
       i32_load: { imms: 2, args: [ true ], returns: 1 },
       // pointer, value, align, offset
-      i32_store: { imms: 2, args: [ true, true ], returns: 0 },
+      i32_store: { imms: 2, args: [ true, true ], returns: 0, addValue: true },
       // 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 },
+      i32_store8: { imms: 2, args: [ true, true ], returns: 0, addValue: true },
       // 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 },
+      i32_store16: { imms: 2, args: [ true, true ], returns: 0, addValue: true },
 
       // 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 },
+      f64_store: { imms: 2, args: [ true, false ], returns: 0, addValue: true },
 
       // value
       i32_const: { imms: 1, args: [], returns: 0 },
 
       // dst, src, size, _, _
-      memory_copy: { imms: 2, args: [ true, true, true ], returns: 0 }
+      memory_copy: { imms: 2, args: [ true, true, true ], returns: 0, addValue: true }
     };
 
     const opName = name.slice('__Porffor_wasm_'.length);
@@ -2486,7 +2486,8 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
       return [
         ...argOut,
         [ ...opcode, ...imms ],
-        ...(new Array(op.returns).fill(Opcodes.i32_from))
+        ...(new Array(op.returns).fill(Opcodes.i32_from)),
+        ...(op.addValue ? [ number(UNDEFINED) ] : [])
       ];
     }
   } else {
@@ -2689,6 +2690,11 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
     out.push(Opcodes.i32_trunc_sat_f64_s);
   }
 
+  if ((builtinFuncs[name] && builtinFuncs[name].returns?.length === 0) ||
+      (importedFuncs[name] != null && importedFuncs[importedFuncs[name]]?.returns === 0)) {
+    out.push(number(UNDEFINED));
+  }
+
   return out;
 };
 
@@ -3049,15 +3055,18 @@ const typeIsNotOneOf = (type, types, valtype = Valtype.i32) => {
   return out;
 };
 
-const allocVar = (scope, name, global = false, type = true) => {
+const allocVar = (scope, name, global = false, type = true, redecl = false) => {
   const target = global ? globals : scope.locals;
 
   // already declared
   if (Object.hasOwn(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`);
-
-    return target[name].idx;
+    if (redecl) {
+      // force change old local name(s)
+      target['#redecl_' + name + uniqId()] = target[name];
+      if (type) target['#redecl_' + name + '#type' + uniqId()] = target[name + '#type'];
+    } else {
+      return target[name].idx;
+    }
   }
 
   let idx = global ? globals['#ind']++ : scope.localInd++;
@@ -4300,7 +4309,10 @@ const inferLoopEnd = scope => {
 const generateIf = (scope, decl) => {
   if (globalThis.precompile && decl.test?.tag?.name === '__Porffor_comptime_flag') {
     const flag = decl.test.quasi.quasis[0].value.raw;
-    return [ [ null, 'comptime_flag', flag, decl.consequent, '#', Prefs ] ];
+    return [
+      [ null, 'comptime_flag', flag, decl.consequent, '#', Prefs ],
+      number(UNDEFINED)
+    ];
   }
 
   const out = truthy(scope, generate(scope, decl.test), getNodeType(scope, decl.test), false, true);
@@ -5148,7 +5160,19 @@ const generateLabel = (scope, decl) => {
   const name = decl.label.name;
   scope.labels.set(name, depth.length);
 
-  return generate(scope, decl.body);
+  const out = generate(scope, decl.body);
+
+  // if block statement, wrap in block to allow for breaking
+  if (decl.body.type === 'BlockStatement') {
+    out.unshift([ Opcodes.block, Blocktype.void ]);
+    out.push(
+      [ Opcodes.drop ],
+      [ Opcodes.end ],
+      number(UNDEFINED)
+    );
+  }
+
+  return out;
 };
 
 const ensureTag = (exceptionMode = Prefs.exceptionMode ?? 'stack') => {
@@ -6260,7 +6284,7 @@ export const generateTemplate = (scope, decl) => {
   return generate(scope, current);
 };
 
-const generateTaggedTemplate = (scope, decl, global = false, name = undefined) => {
+const generateTaggedTemplate = (scope, decl, global = false, name = undefined, valueUnused = false) => {
   const intrinsics = {
     __Porffor_wasm: str => {
       let out = [];
@@ -6307,6 +6331,11 @@ const generateTaggedTemplate = (scope, decl, global = false, name = undefined) =
         out.push([ ...inst, ...immediates.flatMap(x => encodeFunc(x)) ]);
       }
 
+      // add value to stack if value unused as 99% typically means
+      // no value on stack at end of wasm
+      // unless final op is return
+      if (valueUnused && out.at(-1)[0] !== Opcodes.return) out.push(number(UNDEFINED));
+
       return out;
     },
 
@@ -6428,8 +6457,6 @@ const generateFunc = (scope, decl, forceNoExpr = false) => {
     return [ func, out ];
   }
 
-  globalThis.progress?.(null, ' ' + name);
-
   const params = decl.params ?? [];
 
   // TODO: share scope/locals between !!!
@@ -6489,7 +6516,7 @@ const generateFunc = (scope, decl, forceNoExpr = false) => {
         const { name, def, destr, type } = args[i];
 
         func.localInd = i * 2;
-        allocVar(func, name, false);
+        allocVar(func, name, false, true, true);
 
         func.localInd = localInd;
         if (type) {
@@ -6733,15 +6760,18 @@ const generateFunc = (scope, decl, forceNoExpr = false) => {
   return [ func, out ];
 };
 
+let largestBlockBody = 0;
 const generateBlock = (scope, decl) => {
   let out = [];
 
   scope.inferTree ??= [];
   scope.inferTree.push(decl);
 
-  let j = 0;
-  for (let i = 0; i < decl.body.length; i++) {
+  let len = decl.body.length, j = 0;
+  if (len > largestBlockBody) largestBlockBody = len;
+  for (let i = 0; i < len; i++) {
     const x = decl.body[i];
+    if (len >= largestBlockBody) globalThis.progress?.(`${i}/${len}`);
     if (isEmptyNode(x)) continue;
 
     if (j++ > 0) out.push([ Opcodes.drop ]);
@@ -6917,6 +6947,7 @@ export default program => {
   data = [];
   currentFuncIndex = importedFuncs.length;
   typeswitchDepth = 0;
+  largestBlockBody = 0;
   usedTypes = new Set([ TYPES.empty, TYPES.undefined, TYPES.number, TYPES.boolean, TYPES.function ]);
   coctc = new Map();
   globalInfer = new Map();
@@ -7034,4 +7065,4 @@ export default program => {
   delete globals['#ind'];
 
   return { funcs, globals, tags, exceptions, pages, data };
-};
+};

package/compiler/embedding.js

@@ -8,17 +8,4 @@ export const number = (n, valtype = valtypeBinary) => {
   signedLEB128_into(n, out);
 
   return out;
-};
-
-export const enforceOneByte = arr => [ arr[0] ?? 0 ];
-export const enforceTwoBytes = arr => [ arr[0] ?? 0, arr[1] ?? 0 ];
-export const enforceFourBytes = arr => [ arr[0] ?? 0, arr[1] ?? 0, arr[2] ?? 0, arr[3] ?? 0 ];
-export const enforceEightBytes = arr => [ arr[0] ?? 0, arr[1] ?? 0, arr[2] ?? 0, arr[3] ?? 0, arr[4] ?? 0, arr[5] ?? 0, arr[6] ?? 0, arr[7] ?? 0 ];
-
-export const i32x4 = (a, b, c, d) => [ [
-  ...Opcodes.v128_const,
-  ...enforceFourBytes(signedLEB128(a)),
-  ...enforceFourBytes(signedLEB128(b)),
-  ...enforceFourBytes(signedLEB128(c)),
-  ...enforceFourBytes(signedLEB128(d))
-] ];
+};

package/compiler/encoding.js

@@ -64,6 +64,22 @@ export const unsignedLEB128 = n => {
   return buffer;
 };
 
+export const unsignedLEB128_length = n => {
+  if (n < 0) n = n >>> 0;
+  if (n <= 127) return 1;
+  if (n <= 16383) return 2;
+  if (n <= 2097151) return 3;
+  if (n <= 268435455) return 4;
+  if (n <= 34359738367) return 5;
+
+  let length = 0;
+  do {
+    length++;
+    n >>>= 7;
+  } while (n > 0);
+  return length;
+};
+
 export const big_signedLEB128 = n => {
   // just input for small numbers (for perf as common)
   if (n >= 0n && n <= 63n) return [ Number(n) ];

package/compiler/index.js

@@ -35,7 +35,7 @@ const progressStart = msg => {
 
   const log = (extra, after) => {
     const pre = extra ? `${extra}` : spinner[spin++ % 4];
-    process.stdout.write(`\r\u001b[90m${' '.repeat(10 - pre.length)}${pre}  ${msg}${after ?? ''}\u001b[0m`);
+    process.stdout.write(`\r\u001b[90m${' '.repeat(120)}\r${' '.repeat(12 - pre.length)}${pre}  ${msg}${after ?? ''}\u001b[0m`);
   };
   log();
 
@@ -48,7 +48,7 @@ const progressDone = (msg, start) => {
   clearInterval(progressInterval);
 
   const timeStr = (performance.now() - start).toFixed(0);
-  console.log(`\r${' '.repeat(50)}\r\u001b[90m${' '.repeat(8 - timeStr.length)}${timeStr}ms\u001b[0m  \u001b[92m${msg}\u001b[0m`);
+  console.log(`\r${' '.repeat(120)}\r\u001b[90m${' '.repeat(10 - timeStr.length)}${timeStr}ms\u001b[0m  \u001b[92m${msg}\u001b[0m`);
   progressLines++;
 };
 const progressClear = () => {
@@ -66,9 +66,8 @@ export default (code, module = undefined) => {
   let target = Prefs.target ?? 'wasm';
   if (Prefs.native) target = 'native';
 
-  const logProgress = Prefs.profileCompiler || (target === 'native' && !Prefs.native && globalThis.file);
-
-  let outFile = Prefs.o;
+  const outFile = Prefs.o;
+  const logProgress = Prefs.profileCompiler || (Prefs.target && outFile && !Prefs.native && globalThis.file);
 
   globalThis.valtype = Prefs.valtype ?? 'f64';
   globalThis.valtypeBinary = Valtype[valtype];
@@ -214,6 +213,12 @@ export default (code, module = undefined) => {
   if (target === 'wasm' && outFile) {
     fs.writeFileSync(outFile, Buffer.from(wasm));
 
+    if (logProgress) {
+      const total = performance.now();
+      progressClear();
+      console.log(`\u001b[90m[${total.toFixed(0)}ms]\u001b[0m \u001b[32mcompiled ${globalThis.file} \u001b[90m->\u001b[0m \u001b[92m${outFile}\u001b[90m (${(fs.statSync(outFile).size / 1000).toFixed(1)}KB)\u001b[0m`);
+    }
+
     if (process.version) process.exit();
   }
 
@@ -227,6 +232,12 @@ export default (code, module = undefined) => {
       console.log(c);
     }
 
+    if (logProgress) {
+      const total = performance.now();
+      progressClear();
+      console.log(`\u001b[90m[${total.toFixed(0)}ms]\u001b[0m \u001b[32mcompiled ${globalThis.file} \u001b[90m->\u001b[0m \u001b[92m${outFile}\u001b[90m (${(fs.statSync(outFile).size / 1000).toFixed(1)}KB)\u001b[0m`);
+    }
+
     if (process.version) process.exit();
   }
 
@@ -260,35 +271,33 @@ export default (code, module = undefined) => {
 
     if (logProgress) progressStart(`compiled C to native (using ${compiler})`, t5);
 
-    if (process.version) {
-      if (Prefs.native) {
-        const cleanup = () => {
-          try {
-            fs.unlinkSync(outFile);
-          } catch {}
-        };
-
-        process.on('exit', cleanup);
-        process.on('beforeExit', cleanup);
-        process.on('SIGINT', () => {
-          cleanup();
-          process.exit();
-        });
-
-        const runArgs = process.argv.slice(2).filter(x => !x.startsWith('-'));
+    if (Prefs.native) {
+      const cleanup = () => {
         try {
-          execSync([ outFile, ...runArgs.slice(1) ].join(' '), { stdio: 'inherit' });
+          fs.unlinkSync(outFile);
         } catch {}
-      }
+      };
 
-      if (logProgress) {
-        const total = performance.now();
-        progressClear();
-        console.log(`\u001b[90m[${total.toFixed(0)}ms]\u001b[0m \u001b[32mcompiled ${globalThis.file} \u001b[90m->\u001b[0m \u001b[92m${outFile}\u001b[90m (${(fs.statSync(outFile).size / 1000).toFixed(1)}KB)\u001b[0m`);
-      }
+      process.on('exit', cleanup);
+      process.on('beforeExit', cleanup);
+      process.on('SIGINT', () => {
+        cleanup();
+        process.exit();
+      });
+
+      const runArgs = process.argv.slice(2).filter(x => !x.startsWith('-'));
+      try {
+        execSync([ outFile, ...runArgs.slice(1) ].join(' '), { stdio: 'inherit' });
+      } catch {}
+    }
 
-      process.exit();
+    if (logProgress) {
+      const total = performance.now();
+      progressClear();
+      console.log(`\u001b[90m[${total.toFixed(0)}ms]\u001b[0m \u001b[32mcompiled ${globalThis.file} \u001b[90m->\u001b[0m \u001b[92m${outFile}\u001b[90m (${(fs.statSync(outFile).size / 1000).toFixed(1)}KB)\u001b[0m`);
     }
+
+    process.exit();
   }
 
   return out;

package/compiler/wrap.js

@@ -469,9 +469,6 @@ export default (source, module = undefined, customImports = {}, print = str => p
             return -1;
           }
         },
-        b: () => {
-          debugger;
-        },
         ...customImports
       }
     });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "porffor",
   "description": "a basic experimental wip aot optimizing js -> wasm engine/compiler/runtime in js",
-  "version": "0.50.19",
+  "version": "0.50.21",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {},

package/runner/index.js

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