porffor 0.58.12 → 0.58.14

package/compiler/codegen.js

@@ -1370,7 +1370,7 @@ const generateBinaryExp = (scope, decl) => {
 };
 
 const asmFuncToAsm = (scope, func, extra) => func(scope, {
-  Valtype, Opcodes, TYPES, TYPE_NAMES, usedTypes, typeSwitch, makeString, internalThrow,
+  Valtype, Opcodes, TYPES, TYPE_NAMES, usedTypes, typeSwitch, makeString, internalThrow, funcs,
   getNodeType, generate, generateIdent,
   builtin: (name, offset = false) => {
     let idx = importedFuncs[name] ?? includeBuiltin(scope, name)?.index;
@@ -1442,7 +1442,13 @@ const asmFuncToAsm = (scope, func, extra) => func(scope, {
     wasm.push(Opcodes.i32_to_u);
     return wasm;
   },
-  allocPage: (scope, name) => allocPage({ scope, pages }, name)
+  allocPage: (scope, name) => allocPage({ scope, pages }, name),
+  allocLargePage: (scope, name) => {
+    const _ = allocPage({ scope, pages }, name);
+    allocPage({ scope, pages }, name + '#2');
+
+    return _;
+  }
 }, extra);
 
 const asmFunc = (name, { wasm, params = [], typedParams = false, locals: localTypes = [], globalInits = {}, returns = [], returnType, localNames = [], globalNames = [], table = false, constr = false, hasRestArgument = false, usesTag = false, usesImports = false, returnTypes } = {}) => {
@@ -2495,6 +2501,8 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
       i32_store8: { imms: 2, args: [ true, true ], returns: 0, addValue: true },
       // pointer, align, offset
       i32_load16_u: { imms: 2, args: [ true ], returns: 1 },
+      // pointer, align, offset
+      i32_load16_s: { imms: 2, args: [ true ], returns: 1 },
       // pointer, value, align, offset
       i32_store16: { imms: 2, args: [ true, true ], returns: 0, addValue: true },
 
@@ -2514,35 +2522,34 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
     };
 
     const opName = name.slice('__Porffor_wasm_'.length);
+    if (!wasmOps[opName]) throw new Error('Unimplemented Porffor.wasm op: ' + opName);
 
-    if (wasmOps[opName]) {
-      const op = wasmOps[opName];
+    const op = wasmOps[opName];
 
-      const argOut = [];
-      for (let i = 0; i < op.args.length; i++) {
-        if (!op.args[i]) globalThis.noi32F64CallConv = true;
+    const argOut = [];
+    for (let i = 0; i < op.args.length; i++) {
+      if (!op.args[i]) globalThis.noi32F64CallConv = true;
 
-        argOut.push(
-          ...generate(scope, decl.arguments[i]),
-          ...(op.args[i] ? [ Opcodes.i32_to ] : [])
-        );
+      argOut.push(
+        ...generate(scope, decl.arguments[i]),
+        ...(op.args[i] ? [ Opcodes.i32_to ] : [])
+      );
 
-        globalThis.noi32F64CallConv = false;
-      }
+      globalThis.noi32F64CallConv = false;
+    }
 
-      // literals only
-      const imms = decl.arguments.slice(op.args.length).map(x => x.value);
+    // literals only
+    const imms = decl.arguments.slice(op.args.length).map(x => x.value);
 
-      let opcode = Opcodes[opName];
-      if (!Array.isArray(opcode)) opcode = [ opcode ];
+    let opcode = Opcodes[opName];
+    if (!Array.isArray(opcode)) opcode = [ opcode ];
 
-      return [
-        ...argOut,
-        [ ...opcode, ...imms ],
-        ...(new Array(op.returns).fill(Opcodes.i32_from)),
-        ...(op.addValue ? [ number(UNDEFINED) ] : [])
-      ];
-    }
+    return [
+      ...argOut,
+      [ ...opcode, ...imms ],
+      ...(new Array(op.returns).fill(Opcodes.i32_from)),
+      ...(op.addValue ? [ number(UNDEFINED) ] : [])
+    ];
   } else {
     if (!Prefs.indirectCalls) return internalThrow(scope, 'TypeError', `${unhackName(name)} is not a function`, true);
 
@@ -4145,6 +4152,7 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
             ]),
             ...setLastType(scope)
           ], generate(scope, decl.right), getLastType(scope), getNodeType(scope, decl.right))),
+          ...(valtypeBinary === Valtype.i32 ? [ [ Opcodes.f64_convert_i32_s ] ] : []),
           ...getNodeType(scope, decl),
 
           ...(hash != null ? [
@@ -6195,8 +6203,8 @@ const generateMember = (scope, decl, _global, _name) => {
       ] : [
         [ Opcodes.call, includeBuiltin(scope, '__Porffor_object_get').index ]
       ]),
-
-      ...setLastType(scope)
+      ...setLastType(scope),
+      ...(valtypeBinary === Valtype.i32 ? [ Opcodes.i32_trunc_sat_f64_s ] : [])
     ],
 
     ...extraBC
@@ -7282,6 +7290,10 @@ export default program => {
   tags = [];
   exceptions = [];
   funcs = []; indirectFuncs = [];
+  funcs.bytesPerFuncLut = () => {
+    return indirectFuncs._bytesPerFuncLut ??=
+      Math.min(Math.floor((pageSize * 2) / indirectFuncs.length), indirectFuncs.reduce((acc, x) => x.name.length > acc ? x.name.length : acc, 0) + 8);
+  };
   funcIndex = {};
   depth = [];
   pages = new Map();

package/compiler/wrap.js

@@ -351,7 +351,7 @@ ${flags & 0b0001 ? `    get func idx: ${get}
       const [ flags ] = read(Uint16Array, memory, value + 4, 1);
 
       if (Prefs.d) {
-        const bc = new Uint8Array(memory.buffer.slice(value + 6));
+        const bc = new Uint8Array(memory.buffer.slice(value + 10));
         let i = 0;
         while (true) {
           const opcode = bc[i++];
@@ -449,7 +449,7 @@ ${flags & 0b0001 ? `    get func idx: ${get}
             case 0x30:
             case 0x31: {
               const index = bc[i++];
-              console.log(`${opcode === 0x30 ? 'start' : 'end'} capture`, index);
+              console.log(`\x1b[2m${opcode === 0x30 ? 'start' : 'end'} capture ${index}\x1b[0m`);
               break;
             }
           }

package/foo.js

@@ -0,0 +1,4 @@
+console.log(/a(?=b)/.test('ab'));
+console.log(/a(?=b)/.test('ac'));
+console.log(/a(?!b)/.test('ab'));
+console.log(/a(?!b)/.test('ac'));

package/package.json

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