porffor 0.50.19 → 0.50.20

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;
     },
 
@@ -6489,7 +6518,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) {
@@ -7034,4 +7063,4 @@ export default program => {
   delete globals['#ind'];
 
   return { funcs, globals, tags, exceptions, pages, data };
-};
+};

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.20",
   "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.20';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {