porffor 0.37.16 → 0.37.17

package/compiler/codegen.js

@@ -1015,7 +1015,7 @@ const asmFunc = (name, { wasm, params = [], typedParams = false, locals: localTy
   const existing = funcByName(name);
   if (existing) return existing;
 
-  const nameParam = i => localNames[i] ?? (i >= params.length ? ['a', 'b', 'c'][i - params.length] : ['x', 'y', 'z'][i]);
+  const nameParam = i => localNames[i] ?? `l${i}`;
 
   const allLocals = params.concat(localTypes);
   const locals = {};
@@ -1170,15 +1170,7 @@ const setType = (scope, _name, type) => {
   const out = typeof type === 'number' ? number(type, Valtype.i32) : type;
 
   if (Object.hasOwn(scope.locals, name)) {
-    if (scope.locals[name]?.metadata?.type != null) {
-      const metadata = scope.locals[name].metadata;
-      if (metadata.inferredType && knownType(scope, type) !== metadata.type) {
-        delete metadata.type;
-        delete metadata.inferredType;
-      }
-
-      return [];
-    }
+    if (scope.locals[name]?.metadata?.type != null) return [];
 
     const typeLocal = scope.locals[name + '#type'];
     if (typeLocal) return [
@@ -1191,15 +1183,7 @@ const setType = (scope, _name, type) => {
   }
 
   if (Object.hasOwn(globals, name)) {
-    if (globals[name]?.metadata?.type != null) {
-      const metadata = globals[name].metadata;
-      if (metadata.inferredType && knownType(scope, type) !== metadata.type) {
-        delete metadata.type;
-        delete metadata.inferredType;
-      }
-
-      return [];
-    }
+    if (globals[name]?.metadata?.type != null) return [];
 
     const typeLocal = globals[name + '#type'];
     if (typeLocal) return [
@@ -1414,6 +1398,11 @@ const getNodeType = (scope, node) => {
       return TYPES.number;
     }
 
+    if (node.type === 'TemplateLiteral') {
+      // could be normal string but shrug
+      return TYPES.bytestring;
+    }
+
     if (node.type === 'TaggedTemplateExpression') {
       // hack
       switch (node.tag.name) {
@@ -2615,12 +2604,15 @@ const knownType = (scope, type) => {
     return read_signedLEB128(type[0].slice(1));
   }
 
-  if (type.length === 1 && type[0][0] === Opcodes.local_get) {
+  if (typedInput && type.length === 1 && type[0][0] === Opcodes.local_get) {
     const idx = type[0][1];
 
     // type idx = var idx + 1
     const name = Object.values(scope.locals).find(x => x.idx === idx)?.name;
-    if (scope.locals[name]?.metadata?.type != null) return v.metadata.type;
+    if (name) {
+      const local = scope.locals[name];
+      if (local.metadata?.type != null) return v.metadata.type;
+    }
   }
 
   return null;
@@ -2945,6 +2937,59 @@ const setLocalWithType = (scope, name, isGlobal, decl, tee = false, overrideType
 };
 
 const generateVarDstr = (scope, kind, pattern, init, defaultValue, global) => {
+  // statically analyzed ffi dlopen hack to let 2c handle it
+  if (init && init.type === 'CallExpression' && init.callee.name === '__Porffor_dlopen') {
+    if (Prefs.target !== 'native' && !Prefs.native) throw new Error('Porffor.dlopen is only supported for native target (use --native)');
+
+    // disable pgo if using ffi (lol)
+    Prefs.pgo = false;
+
+    try {
+      let usedNames = [];
+      for (const x of pattern.properties) {
+        const name = x.key.name;
+        usedNames.push(name);
+      }
+
+      let path = init.arguments[0].value;
+      let symbols = {};
+
+      for (const x of init.arguments[1].properties) {
+        const name = x.key.name;
+        if (!usedNames.includes(name)) continue;
+
+        let parameters, result;
+        for (const y of x.value.properties) {
+          switch (y.key.name) {
+            case 'parameters':
+              parameters = y.value.elements.map(z => z.value);
+              break;
+
+            case 'result':
+              result = y.value.value;
+              break;
+          }
+        }
+
+        symbols[name] = { parameters, result };
+
+        // mock ffi function
+        asmFunc(name, {
+          wasm: [],
+          params: parameters.map(x => Valtype.i32),
+          returns: result ? [ Valtype.i32 ] : [],
+          returnType: TYPES.number
+        })
+      }
+
+      return [ [ null, 'dlopen', path, symbols ] ];
+    } catch (e) {
+      console.error('bad Porffor.dlopen syntax');
+      throw e;
+    }
+  }
+
+
   const topLevel = scope.name === 'main';
 
   if (typeof pattern === 'string') {
@@ -2975,25 +3020,14 @@ const generateVarDstr = (scope, kind, pattern, init, defaultValue, global) => {
     // let generated;
     // if (init) generated = generate(scope, init, global, name);
 
-    const typed = typedInput && pattern.typeAnnotation && extractTypeAnnotation(pattern);
-    let idx = allocVar(scope, name, global, !(typed && typed.type != null));
+    const typed = typedInput && pattern.typeAnnotation;
+    let idx = allocVar(scope, name, global, !(typed && extractTypeAnnotation(pattern).type != null));
+    addVarMetadata(scope, name, global, { kind });
 
-    let metadata = { kind };
     if (typed) {
-      metadata = {
-        ...metadata,
-        ...typed
-      };
-    } else if (init) {
-      const knownInit = knownType(scope, getNodeType(scope, init));
-      if (knownInit != null) {
-        metadata.type = knownInit;
-        metadata.inferredType = true;
-      }
+      addVarMetadata(scope, name, global, extractTypeAnnotation(pattern));
     }
 
-    addVarMetadata(scope, name, global, metadata);
-
     if (init) {
       const alreadyArray = scope.arrays?.get(name) != null;
 
@@ -5209,7 +5243,7 @@ const countParams = (func, name = undefined) => {
   name ??= func.name;
   let params = func.params.length;
   if (func.constr) params -= 4;
-  if (!builtinFuncs[name] || builtinFuncs[name]?.typedParams) params = Math.floor(params / 2);
+  if (!func.internal || builtinFuncs[name]?.typedParams) params = Math.floor(params / 2);
 
   return func.argc = params;
 };

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.37.16+2b7968825",
+  "version": "0.37.17+5b3ce1ba8",
   "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.37.16+2b7968825';
+globalThis.version = '0.37.17+5b3ce1ba8';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {