porffor 0.25.8 → 0.25.10

package/compiler/codegen.js

@@ -376,7 +376,7 @@ const generateReturn = (scope, decl) => {
       ...generate(scope, arg),
       ...(scope.returnType != null ? [] : getNodeType(scope, arg)),
 
-      [ Opcodes.call, ...unsignedLEB128(includeBuiltin(scope, '__Porffor_promise_resolve').index) ],
+      [ Opcodes.call, includeBuiltin(scope, '__Porffor_promise_resolve').index ],
       [ Opcodes.drop ],
       [ Opcodes.drop ],
 
@@ -546,7 +546,7 @@ const concatStrings = (scope, left, right, leftType, rightType, allBytestrings =
       [ Opcodes.if, Blocktype.void ],
       [ Opcodes.local_get, leftPointer ],
       [ Opcodes.local_get, leftLength ],
-      [ Opcodes.call, ...unsignedLEB128(funcIndex.__Porffor_bytestringToString) ],
+      [ Opcodes.call, funcIndex.__Porffor_bytestringToString ],
       [ Opcodes.local_set, leftPointer ],
       [ Opcodes.end ],
 
@@ -556,7 +556,7 @@ const concatStrings = (scope, left, right, leftType, rightType, allBytestrings =
       [ Opcodes.if, Blocktype.void ],
       [ Opcodes.local_get, rightPointer ],
       [ Opcodes.local_get, rightLength ],
-      [ Opcodes.call, ...unsignedLEB128(funcIndex.__Porffor_bytestringToString) ],
+      [ Opcodes.call, funcIndex.__Porffor_bytestringToString ],
       [ Opcodes.local_set, rightPointer ],
       [ Opcodes.end ]
     ]),
@@ -662,7 +662,7 @@ const compareStrings = (scope, left, right, leftType, rightType, allBytestrings
       [ Opcodes.if, Blocktype.void ],
       [ Opcodes.local_get, leftPointer ],
       [ Opcodes.local_get, leftLength ],
-      [ Opcodes.call, ...unsignedLEB128(funcIndex.__Porffor_bytestringToString) ],
+      [ Opcodes.call, funcIndex.__Porffor_bytestringToString ],
       [ Opcodes.local_set, leftPointer ],
       [ Opcodes.end ],
 
@@ -673,7 +673,7 @@ const compareStrings = (scope, left, right, leftType, rightType, allBytestrings
       [ Opcodes.local_get, rightPointer ],
       [ Opcodes.local_get, rightPointer ],
       [ Opcodes.i32_load, 0, 0 ],
-      [ Opcodes.call, ...unsignedLEB128(funcIndex.__Porffor_bytestringToString) ],
+      [ Opcodes.call, funcIndex.__Porffor_bytestringToString ],
       [ Opcodes.local_set, rightPointer ],
       [ Opcodes.end ]
     ]),
@@ -1016,7 +1016,7 @@ const performOp = (scope, op, left, right, leftType, rightType, _global = false,
     return finalize([
       ...left,
       ...right,
-      [ Opcodes.call, ...unsignedLEB128(idx) ]
+      [ Opcodes.call, idx ]
     ]);
   }
 
@@ -1239,7 +1239,7 @@ const asmFuncToAsm = (scope, func) => {
       if (idx == null) throw new Error(`builtin('${n}') failed: could not find func (from ${scope.name})`);
       if (offset) idx -= importedFuncs.length;
 
-      return float ? ieee754_binary64(idx) : unsignedLEB128(idx);
+      return float ? ieee754_binary64(idx) : idx;
     },
     glbl: (opcode, name, type) => {
       const globalName = '#porf#' + name; // avoid potential name clashing with user js
@@ -1940,7 +1940,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
         ...getNodeType(scope, decl.arguments[0]),
 
         // call regex func
-        [ Opcodes.call, ...unsignedLEB128(idx) ],
+        [ Opcodes.call, idx ],
         Opcodes.i32_from_u,
 
         ...setLastType(scope, Rhemyn.types[funcName])
@@ -1983,7 +1983,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
         ...getNodeType(scope, target),
 
         // call regex func
-        [ Opcodes.call, ...unsignedLEB128(idx) ],
+        [ Opcodes.call, idx ],
         Opcodes.i32_from,
 
         ...setLastType(scope, Rhemyn.types[protoName])
@@ -2170,10 +2170,16 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
         const op = wasmOps[opName];
 
         const argOut = [];
-        for (let i = 0; i < op.args.length; i++) argOut.push(
-          ...generate(scope, decl.arguments[i]),
-          ...(op.args[i] ? [ Opcodes.i32_to ] : [])
-        );
+        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 ] : [])
+          );
+
+          globalThis.noi32F64CallConv = false;
+        }
 
         // literals only
         const imms = decl.arguments.slice(op.args.length).map(x => x.value);
@@ -2491,13 +2497,13 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
     if (valtypeBinary === Valtype.i32 &&
       (func && func.params[paramOffset + i * (typedParams ? 2 : 1)] === Valtype.f64)
     ) {
-      out.push([ Opcodes.f64_convert_i32_s ]);
+      out.push(Opcodes.i32_from);
     }
 
     if (typedParams) out = out.concat(getNodeType(scope, arg));
   }
 
-  out.push([ Opcodes.call, ...unsignedLEB128(idx) ]);
+  out.push([ Opcodes.call, idx ]);
 
   if (!typedReturns) {
     // let type;
@@ -2515,7 +2521,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
     out.push(Opcodes.i32_from);
   }
 
-  if (builtinFuncs[name] && builtinFuncs[name].returns?.[0] === Valtype.f64 && valtypeBinary === Valtype.i32) {
+  if (builtinFuncs[name] && builtinFuncs[name].returns?.[0] === Valtype.f64 && valtypeBinary === Valtype.i32 && !globalThis.noi32F64CallConv) {
     out.push(Opcodes.i32_trunc_sat_f64_s);
   }
 
@@ -3127,12 +3133,12 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
             [ Opcodes.local_get, localTmp(scope, '#objset_property', Valtype.i32) ],
             [ Opcodes.local_get, localTmp(scope, '#objset_property_type', Valtype.i32) ],
 
-            [ Opcodes.call, ...unsignedLEB128(includeBuiltin(scope, '__Porffor_object_get').index) ],
+            [ Opcodes.call, includeBuiltin(scope, '__Porffor_object_get').index ],
             ...setLastType(scope)
           ], generate(scope, decl.right), getLastType(scope), getNodeType(scope, decl.right), false, name, true)),
           ...getNodeType(scope, decl),
 
-          [ Opcodes.call, ...unsignedLEB128(includeBuiltin(scope, '__Porffor_object_set').index) ],
+          [ Opcodes.call, includeBuiltin(scope, '__Porffor_object_set').index ],
           [ Opcodes.drop ],
           // ...setLastType(scope, getNodeType(scope, decl)),
         ],
@@ -3431,7 +3437,7 @@ const generateUnary = (scope, decl) => {
           ...getNodeType(scope, property),
           ...toPropertyKey(scope, true),
 
-          [ Opcodes.call, ...unsignedLEB128(includeBuiltin(scope, '__Porffor_object_delete').index) ],
+          [ Opcodes.call, includeBuiltin(scope, '__Porffor_object_delete').index ],
           [ Opcodes.drop ],
           Opcodes.i32_from_u
         ];
@@ -3744,7 +3750,7 @@ const generateForOf = (scope, decl) => {
       ...setType(scope, leftName, TYPES.string),
 
       // allocate out string
-      [ Opcodes.call, ...unsignedLEB128(includeBuiltin(scope, '__Porffor_allocate').index) ],
+      [ Opcodes.call, includeBuiltin(scope, '__Porffor_allocate').index ],
       [ Opcodes.local_tee, localTmp(scope, '#forof_allocd', Valtype.i32) ],
 
       // set length to 1
@@ -3798,7 +3804,7 @@ const generateForOf = (scope, decl) => {
       ...setType(scope, leftName, TYPES.bytestring),
 
       // allocate out string
-      [ Opcodes.call, ...unsignedLEB128(includeBuiltin(scope, '__Porffor_allocate').index) ],
+      [ Opcodes.call, includeBuiltin(scope, '__Porffor_allocate').index ],
       [ Opcodes.local_tee, localTmp(scope, '#forof_allocd', Valtype.i32) ],
 
       // set length to 1
@@ -4588,7 +4594,7 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
 
       if (name === '#member_prop_assign') {
         out.push(
-          [ Opcodes.call, ...unsignedLEB128(includeBuiltin(scope, '__Porffor_allocate').index) ]
+          [ Opcodes.call, includeBuiltin(scope, '__Porffor_allocate').index ]
         );
         shouldGet = false;
       }
@@ -4728,7 +4734,7 @@ const generateArray = (scope, decl, global = false, name = '$undeclared', initEm
 };
 
 const toPropertyKey = (scope, i32Conv = false) => [
-  [ Opcodes.call, ...unsignedLEB128(includeBuiltin(scope, '__ecma262_ToPropertyKey').index) ],
+  [ Opcodes.call, includeBuiltin(scope, '__ecma262_ToPropertyKey').index ],
   ...(i32Conv ? [
     [ Opcodes.local_set, localTmp(scope, '#swap', Valtype.i32) ],
     Opcodes.i32_to_u,
@@ -4738,7 +4744,7 @@ const toPropertyKey = (scope, i32Conv = false) => [
 
 const generateObject = (scope, decl, global = false, name = '$undeclared') => {
   const out = [
-    [ Opcodes.call, ...unsignedLEB128(includeBuiltin(scope, '__Porffor_allocate').index) ]
+    [ Opcodes.call, includeBuiltin(scope, '__Porffor_allocate').index ]
   ];
 
   if (decl.properties.length > 0) {
@@ -4746,8 +4752,8 @@ const generateObject = (scope, decl, global = false, name = '$undeclared') => {
     out.push([ Opcodes.local_tee, tmp ]);
 
     for (const x of decl.properties) {
-      const { method, shorthand, computed, kind, key, value } = x;
-      if (kind !== 'init') return todo(scope, 'complex objects are not supported yet', true);
+      // method, shorthand are made into useful values by parser for us :)
+      const { computed, kind, key, value } = x;
 
       let k = key;
       if (!computed && key.type !== 'Literal') k = {
@@ -4764,9 +4770,10 @@ const generateObject = (scope, decl, global = false, name = '$undeclared') => {
         ...toPropertyKey(scope, true),
 
         ...generate(scope, value),
+        ...(kind !== 'init' ? [ Opcodes.i32_to_u ] : []),
         ...getNodeType(scope, value),
 
-        [ Opcodes.call, ...unsignedLEB128(includeBuiltin(scope, '__Porffor_object_set').index) ],
+        [ Opcodes.call, includeBuiltin(scope, `__Porffor_object_expr_${kind}`).index ],
 
         [ Opcodes.drop ],
         [ Opcodes.drop ]
@@ -4887,7 +4894,7 @@ const generateMember = (scope, decl, _global, _name, _objectWasm = undefined) =>
         [ Opcodes.i32_eq ],
         [ Opcodes.if, Blocktype.void ],
           [ Opcodes.local_get, tmp ],
-          [ Opcodes.call, ...unsignedLEB128(includeBuiltin(scope, '__Porffor_funcLut_length').index) ],
+          [ Opcodes.call, includeBuiltin(scope, '__Porffor_funcLut_length').index ],
           Opcodes.i32_from_u,
 
           ...setLastType(scope, TYPES.number),
@@ -4946,7 +4953,7 @@ const generateMember = (scope, decl, _global, _name, _objectWasm = undefined) =>
 
     [TYPES.string]: [
       // allocate out string
-      [ Opcodes.call, ...unsignedLEB128(includeBuiltin(scope, '__Porffor_allocate').index) ],
+      [ Opcodes.call, includeBuiltin(scope, '__Porffor_allocate').index ],
       [ Opcodes.local_tee, localTmp(scope, '#member_allocd', Valtype.i32) ],
 
       // set length to 1
@@ -4980,7 +4987,7 @@ const generateMember = (scope, decl, _global, _name, _objectWasm = undefined) =>
 
     [TYPES.bytestring]: [
       // allocate out string
-      [ Opcodes.call, ...unsignedLEB128(includeBuiltin(scope, '__Porffor_allocate').index) ],
+      [ Opcodes.call, includeBuiltin(scope, '__Porffor_allocate').index ],
       [ Opcodes.local_tee, localTmp(scope, '#member_allocd', Valtype.i32) ],
 
       // set length to 1
@@ -5018,7 +5025,7 @@ const generateMember = (scope, decl, _global, _name, _objectWasm = undefined) =>
       ...getNodeType(scope, property),
       ...toPropertyKey(scope, true),
 
-      [ Opcodes.call, ...unsignedLEB128(includeBuiltin(scope, '__Porffor_object_get').index) ],
+      [ Opcodes.call, includeBuiltin(scope, '__Porffor_object_get').index ],
       ...setLastType(scope)
     ],
 
@@ -5031,7 +5038,7 @@ const generateMember = (scope, decl, _global, _name, _objectWasm = undefined) =>
       ...getNodeType(scope, property),
       ...toPropertyKey(scope, true),
 
-      [ Opcodes.call, ...unsignedLEB128(includeBuiltin(scope, '__Porffor_object_get').index) ],
+      [ Opcodes.call, includeBuiltin(scope, '__Porffor_object_get').index ],
       ...setLastType(scope)
     ],
 
@@ -5302,7 +5309,7 @@ const generateFunc = (scope, decl) => {
   if (decl.async) {
     // make promise at the start
     wasm.unshift(
-      [ Opcodes.call, ...unsignedLEB128(includeBuiltin(func, '__Porffor_promise_create').index) ],
+      [ Opcodes.call, includeBuiltin(func, '__Porffor_promise_create').index ],
       [ Opcodes.drop ],
       [ Opcodes.local_set, func.locals['#async_out_promise'].idx ]
     );
@@ -5341,7 +5348,7 @@ const generateFunc = (scope, decl) => {
     // inject promise job runner func at the end of main if used
     if (Object.hasOwn(funcIndex, '__ecma262_HostEnqueuePromiseJob')) {
       wasm.push(
-        [ Opcodes.call, ...unsignedLEB128(includeBuiltin(scope, '__Porffor_promise_runJobs').index) ],
+        [ Opcodes.call, includeBuiltin(scope, '__Porffor_promise_runJobs').index ],
         [ Opcodes.drop ],
         [ Opcodes.drop ]
       );

package/compiler/decompile.js

@@ -98,7 +98,7 @@ export default (wasm, name = '', ind = 0, locals = {}, params = [], returns = []
     }
 
     if (inst[0] === Opcodes.call || inst[0] === Opcodes.return_call) {
-      const idx = read_unsignedLEB128(inst.slice(1));
+      const idx = inst[1];
       const callFunc = funcs.find(x => x.index === idx);
       if (callFunc) out += ` ;; $${callFunc.name} ${makeSignature(callFunc.params, callFunc.returns)}`;
       if (globalThis.importFuncs && idx < importFuncs.length) {

package/compiler/index.js

@@ -117,14 +117,11 @@ export default (code, flags) => {
 
     const done = new Set();
     for (let i = 0; i < data.length; i++) {
-      // const run = (x, done = new Set()) => {
       const run = x => {
         const out = [ x.name, [] ];
         if (x.includes && !done.has(x.name)) {
           done.add(x.name);
           for (const y of x.includes) {
-            // out[1].push(run(funcsByName[y], new Set(done)));
-            // out[1].push(run(funcsByName[y], done));
             out[1].push(run(funcsByName[y], done));
           }
         }

package/compiler/precompile.js

@@ -57,6 +57,7 @@ const compile = async (file, _funcs) => {
 
   const paramOverrides = {
     __Porffor_object_set: [ Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.f64, Valtype.i32 ],
+    __Porffor_object_expr_init: [ Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.f64, Valtype.i32 ],
     __Porffor_object_define: [ Valtype.i32, Valtype.i32, Valtype.i32, Valtype.i32, Valtype.f64, Valtype.i32, Valtype.i32, Valtype.i32 ],
   };
 
@@ -91,7 +92,7 @@ const compile = async (file, _funcs) => {
         const y = wasm[i];
         const n = wasm[i + 1];
         if (y[0] === Opcodes.call) {
-          const idx = read_unsignedLEB128(y.slice(1));
+          const idx = y[1];
           const f = funcs.find(x => x.index === idx);
           if (!f) continue;
 
@@ -203,8 +204,8 @@ ${funcs.map(x => {
       .replace(/\["alloc","(.*?)","(.*?)",(.*?)\]/g, (_, reason, type, valtype) => `...number(allocPage(scope, '${reason}', '${type}') * pageSize, ${valtype})`)
       .replace(/\["global",(.*?),"(.*?)",(.*?)\]/g, (_, opcode, name, valtype) => `...glbl(${opcode}, '${name}', ${valtype})`)
       .replace(/\"local","(.*?)",(.*?)\]/g, (_, name, valtype) => `loc('${name}', ${valtype})]`)
-      .replace(/\[16,"(.*?)"]/g, (_, name) => `[16, ...builtin('${name}')]`)
-      .replace(/\[68,"funcref","(.*?)"]/g, (_, name, offset) => `[68,...builtin('${name}', true, true)]`)
+      .replace(/\[16,"(.*?)"]/g, (_, name) => `[16, builtin('${name}')]`)
+      .replace(/\[68,"funcref","(.*?)"]/g, (_, name, offset) => `[68, ...builtin('${name}', true, true)]`)
       .replace(/\["throw","(.*?)","(.*?)"\]/g, (_, constructor, message) => `...internalThrow(scope, '${constructor}', \`${message}\`)`)
       .replace(/\["get object","(.*?)"\]/g, (_, objName) => `...generateIdent(scope, { name: '${objName}' })`);
 

package/compiler/wrap.js

@@ -75,9 +75,10 @@ const porfToJSValue = ({ memory, funcs, pages }, value, type, override = undefin
           porfToJSValue({ memory, funcs, pages }, vValue, vType);
 
         const flags = tail & 0xff;
+        const accessor = flags & 0b0001;
 
         let get, set;
-        if (flags & 0b0001) {
+        if (accessor) {
           0, [ get, set ] = read(Uint32Array, memory, value + offset + 4, 2);
         }
 
@@ -99,11 +100,21 @@ ${flags & 0b0001 ? `    get func idx: ${get}
         const configurable = flags & 0b0010;
         const enumerable = flags & 0b0100;
 
-        Object.defineProperty(out, k, {
-          value: v,
-          configurable,
-          enumerable,
-        });
+        if (accessor) {
+          // mock get/set funcs
+          Object.defineProperty(out, k, {
+            get: () => {},
+            set: () => {},
+            configurable,
+            enumerable,
+          });
+        } else {
+          Object.defineProperty(out, k, {
+            value: v,
+            configurable,
+            enumerable,
+          });
+        }
       }
 
       return out;

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.25.8+67d2a88c7",
+  "version": "0.25.10+a33e02d25",
   "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.25.8+67d2a88c7';
+globalThis.version = '0.25.10+a33e02d25';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {