porffor 0.25.0 → 0.25.2

package/compiler/codegen.js

@@ -1189,7 +1189,7 @@ const generateBinaryExp = (scope, decl, _global, _name) => {
 const asmFuncToAsm = (scope, func) => {
   return func(scope, {
     TYPES, TYPE_NAMES, typeSwitch, makeArray, makeString, allocPage, internalThrow,
-    getNodeType, generateIdent,
+    getNodeType, generate, generateIdent,
     builtin: n => {
       let idx = funcIndex[n] ?? importedFuncs[n];
       if (idx == null && builtinFuncs[n]) {
@@ -1772,10 +1772,10 @@ const RTArrayUtil = {
   ]
 };
 
-const createNewTarget = (scope, decl, idx) => {
+const createNewTarget = (scope, decl, idx = 0) => {
   if (decl._new) {
     return [
-      ...number(idx),
+      ...(typeof idx === 'number' ? number(idx) : idx),
       ...number(TYPES.function, Valtype.i32)
     ];
   }
@@ -1786,7 +1786,7 @@ const createNewTarget = (scope, decl, idx) => {
   ];
 };
 
-const createThisArg = (scope, decl, getFunc, knownThis = undefined) => {
+const createThisArg = (scope, decl, knownThis = undefined) => {
   if (knownThis) {
     // todo: check compliance
     return knownThis;
@@ -2248,6 +2248,12 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
         ];
       }
 
+      const newTargetWasm = decl._newTargetWasm ?? createNewTarget(scope, decl, [
+        [ Opcodes.local_get, funcLocal ],
+        Opcodes.i32_from_u
+      ]);
+      const thisWasm = decl._thisWasm ?? createThisArg(scope, decl, knownThis);
+
       const gen = argc => {
         const argsOut = [];
         for (let i = 0; i < argc; i++) {
@@ -2273,8 +2279,8 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
           // no type return
           checkFlag(0b10, [
             // no type return & constr
-            ...createNewTarget(scope, decl),
-            ...createThisArg(scope, decl, [], knownThis),
+            ...newTargetWasm,
+            ...thisWasm,
             ...argsOut,
             [ Opcodes.local_get, funcLocal ],
             [ Opcodes.call_indirect, argc + 2, 0, 'no_type_return' ],
@@ -2288,8 +2294,8 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
           // type return
           checkFlag(0b10, [
             // type return & constr
-            ...createNewTarget(scope, decl),
-            ...createThisArg(scope, decl, [], knownThis),
+            ...newTargetWasm,
+            ...thisWasm,
             ...argsOut,
             [ Opcodes.local_get, funcLocal ],
             [ Opcodes.call_indirect, argc + 2, 0 ],
@@ -2371,8 +2377,8 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
   }
 
   if (func && func.constr) {
-    out.push(...createNewTarget(scope, decl, idx - importedFuncs.length));
-    out.push(...createThisArg(scope, decl, func));
+    out.push(...(decl._newTargetWasm ?? createNewTarget(scope, decl, idx - importedFuncs.length)));
+    out.push(...(decl._thisWasm ?? createThisArg(scope, decl)));
     paramOffset += 4;
   }
 
@@ -3956,7 +3962,7 @@ const generateForIn = (scope, decl) => {
   depth.push('if');
   depth.push('forin');
   depth.push('block');
-  depth.push('block');
+  depth.push('if');
 
   // setup local for left
   generate(scope, decl.left);
@@ -3978,6 +3984,7 @@ const generateForIn = (scope, decl) => {
     [TYPES.object]: [
       [ Opcodes.loop, Blocktype.void ],
 
+      // read key
       [ Opcodes.local_get, pointer ],
       [ Opcodes.i32_load, 0, 5 ],
       [ Opcodes.local_tee, localTmp(scope, '#forin_tmp', Valtype.i32) ],
@@ -4003,11 +4010,18 @@ const generateForIn = (scope, decl) => {
       [ isGlobal ? Opcodes.global_set : Opcodes.local_set, local.idx ],
 
       [ Opcodes.block, Blocktype.void ],
-      [ Opcodes.block, Blocktype.void ],
+
+      // todo/perf: do not read key for non-enumerables
+      // only run body if entry is enumerable
+      [ Opcodes.local_get, pointer ],
+      [ Opcodes.i32_load8_u, 0, 17 ],
+      [ Opcodes.i32_const, 0b0100 ],
+      [ Opcodes.i32_and ],
+      [ Opcodes.if, Blocktype.void ],
       ...generate(scope, decl.body),
       [ Opcodes.end ],
 
-      // increment iter pointer by 14
+      // increment pointer by 14
       [ Opcodes.local_get, pointer ],
       ...number(14, Valtype.i32),
       [ Opcodes.i32_add ],
@@ -4116,7 +4130,7 @@ const generateBreak = (scope, decl) => {
     while: 2, // loop > if (wanted branch) (we are here)
     dowhile: 2, // loop > block (wanted branch) > block (we are here)
     forof: 2, // loop > block (wanted branch) > block (we are here)
-    forin: 2, // loop > block (wanted branch) > block (we are here)
+    forin: 2, // loop > block (wanted branch) > if (we are here)
     if: 1, // break inside if, branch 0 to skip the rest of the if
     switch: 1
   })[type];
@@ -4139,7 +4153,7 @@ const generateContinue = (scope, decl) => {
     while: 1, // loop (wanted branch) > if (we are here)
     dowhile: 3, // loop > block > block (wanted branch) (we are here)
     forof: 3, // loop > block > block (wanted branch) (we are here)
-    forin: 3 // loop > block > block (wanted branch) (we are here)
+    forin: 3 // loop > block > if (wanted branch) (we are here)
   })[type];
 
   return [

package/compiler/precompile.js

@@ -204,9 +204,10 @@ ${funcs.map(x => {
       .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(/\["throw","(.*?)","(.*?)"\]/g, (_, constructor, message) => `...internalThrow(scope, '${constructor}', \`${message}\`)`);
+      .replace(/\["throw","(.*?)","(.*?)"\]/g, (_, constructor, message) => `...internalThrow(scope, '${constructor}', \`${message}\`)`)
+      .replace(/\["get object","(.*?)"\]/g, (_, objName) => `...generateIdent(scope, { name: '${objName}' })`);
 
-    return `(scope, {${`${str.includes('allocPage(') ? 'allocPage,' : ''}${str.includes('glbl(') ? 'glbl,' : ''}${str.includes('loc(') ? 'loc,' : ''}${str.includes('builtin(') ? 'builtin,' : ''}${str.includes('internalThrow(') ? 'internalThrow,' : ''}`.slice(0, -1)}}) => ` + str;
+    return `(scope, {${`${str.includes('allocPage(') ? 'allocPage,' : ''}${str.includes('glbl(') ? 'glbl,' : ''}${str.includes('loc(') ? 'loc,' : ''}${str.includes('builtin(') ? 'builtin,' : ''}${str.includes('internalThrow(') ? 'internalThrow,' : ''}${str.includes('generateIdent(') ? 'generateIdent,' : ''}`.slice(0, -1)}}) => ` + str;
   };
 
   const locals = Object.entries(x.locals).sort((a,b) => a[1].idx - b[1].idx)

package/compiler/wrap.js

@@ -69,7 +69,10 @@ const porfToJSValue = ({ memory, funcs, pages }, value, type) => {
 
         const vValue = read(Float64Array, memory, value + offset + 4, 1)[0];
         const vType = tail >>> 8;
-        const v = porfToJSValue({ memory, funcs, pages }, vValue, vType);
+
+        // do not recursive call forever for direct circular
+        const v = vValue === value && vType === type ? out :
+          porfToJSValue({ memory, funcs, pages }, vValue, vType);
 
         const flags = tail & 0xff;
 

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.0+65ef4f661",
+  "version": "0.25.2+bd0735a02",
   "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.0+65ef4f661';
+globalThis.version = '0.25.2+bd0735a02';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {
@@ -26,18 +26,20 @@ if (process.argv.includes('--help')) {
   console.log(`\x1B[1m\x1B[35mPorffor\x1B[0m is a JavaScript engine/runtime/compiler. \x1B[90m(${globalThis.version})\x1B[0m`);
 
   // basic usage
-  console.log(`Usage: \x1B[1mporf [command] path/to/script.js [...prefs] [...args]\x1B[0m`);
+  console.log(`Usage: \x1B[1mporf [command] [...prefs] path/to/script.js [...args]\x1B[0m`);
 
   // commands
   console.log(`\n\x1B[1mCommands:\x1B[0m`);
   for (const [ cmd, [ color, desc ] ] of Object.entries({
     run: [ 34, 'Run a JS file' ],
     wasm: [ 34, 'Compile a JS file to a Wasm binary\n' ],
+
     c: [ 31, 'Compile a JS file to C source code' ],
     native: [ 31, 'Compile a JS file to a native binary\n' ],
+
     profile: [ 33, 'Profile a JS file' ],
     debug: [ 33, 'Debug a JS file' ],
-    'debug-wasm': [ 33, 'Debug the compiled Wasm of a JS file' ]
+    'debug-wasm': [ 33, 'Debug the compiled Wasm of a JS file' ],
   })) {
     console.log(`  \x1B[1m\x1B[${color}m${cmd}\x1B[0m${' '.repeat(20 - cmd.length - (desc.startsWith('🧪') ? 3 : 0))}${desc}`);
   }

package/todo.txt

@@ -1,2 +0,0 @@
-- retain previous attrs if they are undefined (configurable, other attrs?, set/get) in defineProperty
-- make missing objects