porffor 0.22.8 → 0.22.10

package/compiler/codegen.js

@@ -295,7 +295,7 @@ const internalThrow = (scope, constructor, message, expectsValue = Prefs.alwaysV
       arguments: [
         {
           type: 'Literal',
-          value: message
+          value: Prefs.d ? `${message} (in ${scope.name})` : message
         }
       ]
     }
@@ -316,13 +316,11 @@ const generateIdent = (scope, decl) => {
       return wasm.slice();
     }
 
-    // todo: enable this by default in future
     if (!Object.hasOwn(funcIndex, name) && Object.hasOwn(builtinFuncs, name)) {
       includeBuiltin(scope, name);
-      return number(funcIndex[name] - importedFuncs.length);
     }
 
-    if (isExistingProtoFunc(name) || Object.hasOwn(internalConstrs, name) || Object.hasOwn(builtinFuncs, name)) {
+    if (isExistingProtoFunc(name) || Object.hasOwn(internalConstrs, name)) {
       // todo: return an actual something
       return number(1);
     }
@@ -1177,6 +1175,7 @@ const generateBinaryExp = (scope, decl, _global, _name) => {
 const asmFuncToAsm = (scope, func) => {
   return func(scope, {
     TYPES, TYPE_NAMES, typeSwitch, makeArray, makeString, allocPage, internalThrow,
+    getNodeType, generateIdent,
     builtin: n => {
       let idx = funcIndex[n] ?? importedFuncs[n];
       if (idx == null && builtinFuncs[n]) {
@@ -1228,7 +1227,7 @@ const asmFuncToAsm = (scope, func) => {
   });
 };
 
-const asmFunc = (name, { wasm, params = [], locals: localTypes = [], globals: globalTypes = [], globalInits = [], returns = [], returnType, localNames = [], globalNames = [], data: _data = [], table = false, constr = false, hasRestArgument = false } = {}) => {
+const asmFunc = (name, { wasm, params = [], typedParams = false, locals: localTypes = [], globals: globalTypes = [], globalInits = [], returns = [], returnType, localNames = [], globalNames = [], data: _data = [], table = false, constr = false, hasRestArgument = false } = {}) => {
   if (wasm == null) { // called with no builtin
     log.warning('codegen', `${name} has no built-in!`);
     wasm = [];
@@ -1256,6 +1255,7 @@ const asmFunc = (name, { wasm, params = [], locals: localTypes = [], globals: gl
   const func = {
     name,
     params,
+    typedParams,
     locals,
     localInd: allLocals.length,
     returns,
@@ -2263,7 +2263,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
 
             // get if func we are calling is a constructor or not
             [ Opcodes.local_get, funcLocal ],
-            ...number(3, Valtype.i32),
+            ...number(128, Valtype.i32),
             [ Opcodes.i32_mul ],
             ...number(2, Valtype.i32),
             [ Opcodes.i32_add ],
@@ -2284,7 +2284,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
             ...brTable([
               // get argc of func we are calling
               [ Opcodes.local_get, funcLocal ],
-              ...number(3, Valtype.i32),
+              ...number(128, Valtype.i32),
               [ Opcodes.i32_mul ],
               [ Opcodes.i32_load16_u, 0, ...unsignedLEB128(allocPage(scope, 'func lut') * pageSize), 'read func lut' ]
             ], tableBc, valtypeBinary)
@@ -2296,7 +2296,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
 
   const func = funcs[idx - importedFuncs.length]; // idx === scope.index ? scope : funcs.find(x => x.index === idx);
   const userFunc = func && !func.internal;
-  const typedParams = userFunc || builtinFuncs[name]?.typedParams;
+  const typedParams = userFunc || func?.typedParams;
   const typedReturns = (userFunc && func.returnType == null) || builtinFuncs[name]?.typedReturns;
   let paramCount = func && (typedParams ? Math.floor(func.params.length / 2) : func.params.length);
 
@@ -2791,9 +2791,11 @@ const generateVar = (scope, decl) => {
 
     if (x.init && isFuncType(x.init.type)) {
       // hack for let a = function () { ... }
-      x.init.id = { name };
-      generateFunc(scope, x.init);
-      continue;
+      if (!x.init.id) {
+        x.init.id = { name };
+        generateFunc(scope, x.init);
+        continue;
+      }
     }
 
     if (topLevel && Object.hasOwn(builtinVars, name)) {
@@ -2919,7 +2921,7 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
       [ Opcodes.local_set, localTmp(scope, '#member_prop_assign') ],
 
       // todo: review last type usage here
-      ...typeSwitch(scope, getNodeType(scope, decl.left.object), {
+      ...typeSwitch(scope, getNodeType(scope, object), {
         [TYPES.array]: [
           ...objectWasm,
           Opcodes.i32_to_u,
@@ -3140,7 +3142,16 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
           ]
         }),
 
-        default: internalThrow(scope, 'TypeError', `Cannot assign member with non-array`)
+        // default: internalThrow(scope, 'TypeError', `Cannot assign member with this type`)
+        default: [
+          ...objectWasm,
+          [ Opcodes.drop ],
+
+          ...propertyWasm,
+          [ Opcodes.drop ],
+
+          ...generate(scope, decl.right)
+        ]
       }, valtypeBinary)
     ];
   }
@@ -3534,18 +3545,6 @@ const generateForOf = (scope, decl) => {
   const [ local, isGlobal ] = lookupName(scope, leftName);
   if (!local) return todo(scope, 'for of failed to get left local (probably destructure)');
 
-  // // todo: we should only do this for strings but we don't know at compile-time :(
-  // hack: this is naughty and will break things!
-  let newOut = number(0, Valtype.i32), newPointer = number(0, Valtype.i32);
-
-  const known = knownType(scope, getNodeType(scope, decl.right));
-  if ((known === TYPES.string || known === TYPES.bytestring) || (pages.hasAnyString && known == null)) {
-    // todo: we use i16 even for bytestrings which should not make a bad thing happen, just be confusing for debugging?
-    0, [ newOut, newPointer ] = makeArray(scope, {
-      rawElements: new Array(0)
-    }, isGlobal, leftName, true, 'i16', true);
-  }
-
   // set type for local
   // todo: optimize away counter and use end pointer
   out.push(...typeSwitch(scope, getNodeType(scope, decl.right), {
@@ -3591,8 +3590,9 @@ const generateForOf = (scope, decl) => {
     [TYPES.string]: [
       ...setType(scope, leftName, TYPES.string),
 
-      // setup new/out array
-      ...newOut,
+      // allocate out string
+      [ Opcodes.call, ...unsignedLEB128(includeBuiltin(scope, '__Porffor_allocate').index) ],
+      [ Opcodes.local_tee, localTmp(scope, '#forof_allocd', Valtype.i32) ],
 
       // set length to 1
       ...number(1, Valtype.i32),
@@ -3601,7 +3601,7 @@ const generateForOf = (scope, decl) => {
       [ Opcodes.loop, Blocktype.void ],
 
       // use as pointer for store later
-      ...newPointer,
+      [ Opcodes.local_get, localTmp(scope, '#forof_allocd', Valtype.i32) ],
 
       // load current string ind {arg}
       [ Opcodes.local_get, pointer ],
@@ -3611,7 +3611,7 @@ const generateForOf = (scope, decl) => {
       [ Opcodes.i32_store16, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 ],
 
       // return new string (page)
-      ...newPointer,
+      [ Opcodes.local_get, localTmp(scope, '#forof_allocd', Valtype.i32) ],
       Opcodes.i32_from_u,
 
       [ isGlobal ? Opcodes.global_set : Opcodes.local_set, local.idx ],
@@ -3644,8 +3644,9 @@ const generateForOf = (scope, decl) => {
     [TYPES.bytestring]: [
       ...setType(scope, leftName, TYPES.bytestring),
 
-      // setup new/out array
-      ...newOut,
+      // allocate out string
+      [ Opcodes.call, ...unsignedLEB128(includeBuiltin(scope, '__Porffor_allocate').index) ],
+      [ Opcodes.local_tee, localTmp(scope, '#forof_allocd', Valtype.i32) ],
 
       // set length to 1
       ...number(1, Valtype.i32),
@@ -3654,7 +3655,7 @@ const generateForOf = (scope, decl) => {
       [ Opcodes.loop, Blocktype.void ],
 
       // use as pointer for store later
-      ...newPointer,
+      [ Opcodes.local_get, localTmp(scope, '#forof_allocd', Valtype.i32) ],
 
       // load current string ind {arg}
       [ Opcodes.local_get, pointer ],
@@ -3666,7 +3667,7 @@ const generateForOf = (scope, decl) => {
       [ Opcodes.i32_store8, 0, ValtypeSize.i32 ],
 
       // return new string (page)
-      ...newPointer,
+      [ Opcodes.local_get, localTmp(scope, '#forof_allocd', Valtype.i32) ],
       Opcodes.i32_from_u,
 
       [ isGlobal ? Opcodes.global_set : Opcodes.local_set, local.idx ],
@@ -4261,11 +4262,9 @@ const StoreOps = {
 let data = [];
 
 const compileBytes = (val, itemType) => {
-  // todo: this is a mess and needs confirming / ????
   switch (itemType) {
     case 'i8': return [ val % 256 ];
     case 'i16': return [ val % 256, (val / 256 | 0) % 256 ];
-    case 'i16': return [ val % 256, (val / 256 | 0) % 256 ];
     case 'i32': return [...new Uint8Array(new Int32Array([ val ]).buffer)];
     // todo: i64
 
@@ -4624,17 +4623,13 @@ const generateMember = (scope, decl, _global, _name) => {
   const name = decl.object.name;
 
   // hack: .name
-  if (decl.property.name === 'name') {
-    if (hasFuncWithName(name)) {
-      let nameProp = name;
+  if (decl.property.name === 'name' && hasFuncWithName(name)) {
+    let nameProp = name;
 
-      // eg: __String_prototype_toLowerCase -> toLowerCase
-      if (nameProp.startsWith('__')) nameProp = nameProp.split('_').pop();
+    // eg: __String_prototype_toLowerCase -> toLowerCase
+    if (nameProp.startsWith('__')) nameProp = nameProp.split('_').pop();
 
-      return withType(scope, makeString(scope, nameProp, _global, _name, true), TYPES.bytestring);
-    } else {
-      return withType(scope, number(0), TYPES.undefined);
-    }
+    return withType(scope, makeString(scope, nameProp, _global, _name, true), TYPES.bytestring);
   }
 
   // hack: .length
@@ -4643,7 +4638,7 @@ const generateMember = (scope, decl, _global, _name) => {
 
     const func = funcs.find(x => x.name === name);
     if (func) {
-      const typedParams = !func.internal || builtinFuncs[name]?.typedParams;
+      const typedParams = !func.internal || func.typedParams;
       return withType(scope, number(typedParams ? Math.floor(func.params.length / 2) : (func.constr ? (func.params.length - 1) : func.params.length)), TYPES.number);
     }
 
@@ -4668,7 +4663,7 @@ const generateMember = (scope, decl, _global, _name) => {
 
     const type = getNodeType(scope, decl.object);
     const known = knownType(scope, type);
-    if (known != null) {
+    if (known != null && known != TYPES.function) {
       if (typeHasFlag(known, TYPE_FLAGS.length)) return [
         ...out,
 
@@ -4679,28 +4674,32 @@ const generateMember = (scope, decl, _global, _name) => {
       return number(0);
     }
 
-    const useTmp = !Prefs.lengthNoTmp;
-    const tmp = useTmp && localTmp(scope, '#length_tmp', Valtype.i32);
+    const tmp = localTmp(scope, '#length_tmp', Valtype.i32);
     return [
-      ...(useTmp ? [
-        ...out,
-        [ Opcodes.local_set, tmp ],
-      ] : []),
+      ...out,
+      [ Opcodes.local_set, tmp ],
 
       ...getNodeType(scope, decl.object),
       ...number(TYPE_FLAGS.length, Valtype.i32),
       [ Opcodes.i32_and ],
       [ Opcodes.if, valtypeBinary ],
-        ...(useTmp ? [ [ Opcodes.local_get, tmp ] ] : out),
+        [ Opcodes.local_get, tmp ],
         [ Opcodes.i32_load, Math.log2(ValtypeSize.i32) - 1, 0 ],
         Opcodes.i32_from_u,
 
         ...setLastType(scope, TYPES.number),
       [ Opcodes.else ],
-        ...(useTmp ? [] : [
-          ...out,
-          [ Opcodes.drop ]
-        ]),
+        ...getNodeType(scope, decl.object),
+        ...number(TYPES.function, Valtype.i32),
+        [ Opcodes.i32_eq ],
+        [ Opcodes.if, Blocktype.void ],
+          [ Opcodes.local_get, tmp ],
+          [ Opcodes.call, ...unsignedLEB128(includeBuiltin(scope, '__Porffor_funcLut_length').index) ],
+          Opcodes.i32_from_u,
+
+          ...setLastType(scope, TYPES.number),
+          [ Opcodes.br, 1 ],
+        [ Opcodes.end ],
 
         ...number(0),
         ...setLastType(scope, TYPES.undefined),
@@ -4739,22 +4738,13 @@ const generateMember = (scope, decl, _global, _name) => {
   const object = decl.object;
   const property = getMemberProperty(decl);
 
+  // generate now (it gets cached)
+  generate(scope, object);
+
   // todo/perf: use i32 object (and prop?) locals
   const objectWasm = [ [ Opcodes.local_get, localTmp(scope, '#member_obj') ] ];
   const propertyWasm = [ [ Opcodes.local_get, localTmp(scope, '#member_prop') ] ];
 
-  // // todo: we should only do this for strings but we don't know at compile-time :(
-  // hack: this is naughty and will break things!
-  let newOut = number(0, Valtype.i32), newPointer = number(0, Valtype.i32);
-
-  const known = knownType(scope, getNodeType(scope, object));
-  if ((known === TYPES.string || known === TYPES.bytestring) || (pages.hasAnyString && known == null)) {
-    // todo: we use i16 even for bytestrings which should not make a bad thing happen, just be confusing for debugging?
-    0, [ newOut, newPointer ] = makeArray(scope, {
-      rawElements: new Array(0)
-    }, _global, _name, true, 'i16', true);
-  }
-
   const out = typeSwitch(scope, getNodeType(scope, object), {
     [TYPES.array]: [
       ...loadArray(scope, objectWasm, propertyWasm),
@@ -4762,15 +4752,16 @@ const generateMember = (scope, decl, _global, _name) => {
     ],
 
     [TYPES.string]: [
-      // setup new/out array
-      ...newOut,
+      // allocate out string
+      [ Opcodes.call, ...unsignedLEB128(includeBuiltin(scope, '__Porffor_allocate').index) ],
+      [ Opcodes.local_tee, localTmp(scope, '#member_allocd', Valtype.i32) ],
 
       // set length to 1
       ...number(1, Valtype.i32),
       [ Opcodes.i32_store, 0, 0 ],
 
       // use as pointer for store later
-      ...newPointer,
+      [ Opcodes.local_get, localTmp(scope, '#member_allocd', Valtype.i32) ],
 
       ...propertyWasm,
       Opcodes.i32_to_u,
@@ -4789,21 +4780,22 @@ const generateMember = (scope, decl, _global, _name) => {
       [ Opcodes.i32_store16, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 ],
 
       // return new string (page)
-      ...newPointer,
+      [ Opcodes.local_get, localTmp(scope, '#member_allocd', Valtype.i32) ],
       Opcodes.i32_from_u,
       ...setLastType(scope, TYPES.string)
     ],
 
     [TYPES.bytestring]: [
-      // setup new/out array
-      ...newOut,
+      // allocate out string
+      [ Opcodes.call, ...unsignedLEB128(includeBuiltin(scope, '__Porffor_allocate').index) ],
+      [ Opcodes.local_tee, localTmp(scope, '#member_allocd', Valtype.i32) ],
 
       // set length to 1
       ...number(1, Valtype.i32),
       [ Opcodes.i32_store, 0, 0 ],
 
       // use as pointer for store later
-      ...newPointer,
+      [ Opcodes.local_get, localTmp(scope, '#member_allocd', Valtype.i32) ],
 
       ...propertyWasm,
       Opcodes.i32_to_u,
@@ -4819,7 +4811,7 @@ const generateMember = (scope, decl, _global, _name) => {
       [ Opcodes.i32_store8, 0, ValtypeSize.i32 ],
 
       // return new string (page)
-      ...newPointer,
+      [ Opcodes.local_get, localTmp(scope, '#member_allocd', Valtype.i32) ],
       Opcodes.i32_from_u,
       ...setLastType(scope, TYPES.bytestring)
     ],
@@ -4837,6 +4829,19 @@ const generateMember = (scope, decl, _global, _name) => {
       ...setLastType(scope)
     ],
 
+    [TYPES.function]: [
+      ...objectWasm,
+      Opcodes.i32_to_u,
+      ...getNodeType(scope, object),
+
+      ...propertyWasm,
+      ...getNodeType(scope, property),
+      ...toPropertyKey(scope, true),
+
+      [ Opcodes.call, ...unsignedLEB128(includeBuiltin(scope, '__Porffor_object_get').index) ],
+      ...setLastType(scope)
+    ],
+
     ...wrapBC({
       [TYPES.uint8array]: [
         [ Opcodes.i32_add ],
@@ -4915,7 +4920,11 @@ const generateMember = (scope, decl, _global, _name) => {
       postlude: setLastType(scope, TYPES.number)
     }),
 
-    default: internalThrow(scope, 'TypeError', 'Unsupported member expression object', true)
+    // default: internalThrow(scope, 'TypeError', 'Unsupported member expression object', true)
+    default: [
+      ...number(0),
+      ...setLastType(scope, TYPES.undefined)
+    ]
   });
 
   if (decl.optional) {
@@ -5291,7 +5300,7 @@ export default program => {
   Opcodes.lt = [ Opcodes.i32_lt_s, Opcodes.i64_lt_s, Opcodes.f64_lt ][valtypeInd];
 
   builtinFuncs = new BuiltinFuncs();
-  builtinVars = new BuiltinVars();
+  builtinVars = new BuiltinVars({ builtinFuncs });
   prototypeFuncs = new PrototypeFuncs();
   allocator = makeAllocator(Prefs.allocator ?? 'static');
 

package/compiler/havoc.js

@@ -90,29 +90,4 @@ export const f64ToI32s = (func, targets) => {
       }
     }
   }
-};
-
-export const withLocalDomains = (func, targets, domains) => {
-  const { wasm } = func;
-
-  // update wasm
-  for (let i = 0; i < wasm.length; i++) {
-    const op = wasm[i];
-    const opcode = op[0];
-    const idx = op[1];
-
-    let target;
-    if ((opcode === Opcodes.local_get || opcode === Opcodes.local_tee) &&
-        (target = targets.indexOf(idx)) !== -1) {
-      const n1 = wasm[i + 1];
-      if (n1?.[0] !== Opcodes.i32_const && n1?.[0] !== Opcodes.f64_const) continue;
-
-      const n2 = wasm[i + 2];
-      if (!n2?.[0]) continue;
-
-      switch (n2[0]) {
-
-      }
-    }
-  }
 };

package/compiler/precompile.js

@@ -212,4 +212,4 @@ ${x.table ? `    table: 1,` : ''}${x.constr ? `    constr: 1,` : ''}${x.hasRestA
 };`;
 };
 
-fs.writeFileSync(join(__dirname, 'generated_builtins.js'), await precompile());
+fs.writeFileSync(join(__dirname, 'builtins_precompiled.js'), await precompile());

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.22.8+ad11daa09",
+  "version": "0.22.10+6aec34f0a",
   "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.22.8+ad11daa09';
+globalThis.version = '0.22.10+6aec34f0a';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {