porffor 0.16.0-ec15a329e → 0.16.0-f9e625159

package/compiler/prefs.js

@@ -1,10 +1,9 @@
-const onByDefault = [ 'bytestring', 'treeshakeWasmImports', 'alwaysMemory', 'indirectCalls', 'optUnused' ];
+const onByDefault = [ 'bytestring', 'treeshakeWasmImports', 'alwaysMemory', 'indirectCalls', 'optUnused', 'data', 'rmUnusedTypes' ];
 
 let cache = {};
 const obj = new Proxy({}, {
   get(_, p) {
-    // intentionally misses with undefined values cached
-    if (cache[p]) return cache[p];
+    if (cache[p] != null) return cache[p];
 
     const ret = (() => {
       // fooBar -> foo-bar
@@ -23,9 +22,14 @@ const obj = new Proxy({}, {
     // do not cache in web demo as args are changed live
     if (!globalThis.document) cache[p] = ret;
     return ret;
+  },
+
+  set(_, p, v) {
+    cache[p] = v;
+    return true;
   }
 });
 
-obj.uncache = () => cache = {};
+export const uncache = () => cache = {};
 
 export default obj;

package/compiler/prototype.js

@@ -1,6 +1,5 @@
 import { Opcodes, Blocktype, Valtype, ValtypeSize } from './wasmSpec.js';
 import { number } from './embedding.js';
-import { unsignedLEB128 } from './encoding.js';
 import { UNDEFINED } from './builtins.js';
 import { TYPES } from './types.js';
 import Prefs from './prefs.js';
@@ -55,10 +54,10 @@ export const PrototypeFuncs = function() {
 
       // read from memory
       [ Opcodes.local_get, iTmp ],
-      [ Opcodes.load, 0, ...unsignedLEB128(ValtypeSize.i32) ],
+      [ Opcodes.load, 0, ValtypeSize.i32 ],
 
       [ Opcodes.local_get, iTmp ],
-      [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(ValtypeSize.i32 + ValtypeSize[valtype]) ]
+      [ Opcodes.i32_load8_u, 0, ValtypeSize.i32 + ValtypeSize[valtype] ]
     ],
 
     // todo: only for 1 argument
@@ -74,12 +73,12 @@ export const PrototypeFuncs = function() {
       // store value
       [ Opcodes.local_get, iTmp ],
       ...wNewMember,
-      [ Opcodes.store, 0, ...unsignedLEB128(ValtypeSize.i32) ],
+      [ Opcodes.store, 0, ValtypeSize.i32 ],
 
       // store type
       [ Opcodes.local_get, iTmp ],
       ...wType,
-      [ Opcodes.i32_store8, 0, ...unsignedLEB128(ValtypeSize.i32 + ValtypeSize[valtype]) ],
+      [ Opcodes.i32_store8, 0, ValtypeSize.i32 + ValtypeSize[valtype] ],
 
       // bump array length by 1 and return it
       ...length.setI32([
@@ -137,10 +136,10 @@ export const PrototypeFuncs = function() {
         [ Opcodes.local_set, iTmp ],
 
         [ Opcodes.local_get, iTmp ],
-        [ Opcodes.load, 0, ...unsignedLEB128(ValtypeSize.i32) ],
+        [ Opcodes.load, 0, ValtypeSize.i32 ],
 
         [ Opcodes.local_get, iTmp ],
-        [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(ValtypeSize.i32 + ValtypeSize[valtype]) ]
+        [ Opcodes.i32_load8_u, 0, ValtypeSize.i32 + ValtypeSize[valtype] ]
       ])
     ],
 
@@ -168,10 +167,10 @@ export const PrototypeFuncs = function() {
       // load first element
       // todo/perf: unusedValue opt
       ...pointer,
-      [ Opcodes.load, 0, ...unsignedLEB128(ValtypeSize.i32) ],
+      [ Opcodes.load, 0, ValtypeSize.i32 ],
 
       ...pointer,
-      [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(ValtypeSize.i32 + ValtypeSize[valtype]) ],
+      [ Opcodes.i32_load8_u, 0, ValtypeSize.i32 + ValtypeSize[valtype] ],
 
       // offset page by -1 ind
       // ...number(pointer + ValtypeSize.i32, Valtype.i32), // dst = base array index + length size
@@ -250,12 +249,12 @@ export const PrototypeFuncs = function() {
       // store value
       [ Opcodes.local_get, iTmp2 ],
       [ Opcodes.local_get, iTmp ],
-      [ Opcodes.store, 0, ...unsignedLEB128(ValtypeSize.i32) ],
+      [ Opcodes.store, 0, ValtypeSize.i32 ],
 
       // store type
       [ Opcodes.local_get, iTmp2 ],
       ...wType,
-      [ Opcodes.i32_store8, 0, ...unsignedLEB128(ValtypeSize.i32 + ValtypeSize[valtype]) ],
+      [ Opcodes.i32_store8, 0, ValtypeSize.i32 + ValtypeSize[valtype] ],
 
       // pointer - sizeof value
       ...length.getCachedI32(),
@@ -292,11 +291,8 @@ export const PrototypeFuncs = function() {
       const [ newOut, newPointer ] = arrayShell(1, 'i16');
 
       return [
-        // setup new/out array
+        // setup new/out array and use pointer for store
         ...newOut,
-        [ Opcodes.drop ],
-
-        ...number(0, Valtype.i32), // base 0 for store later
 
         ...wIndex,
         Opcodes.i32_to_u,
@@ -335,13 +331,14 @@ export const PrototypeFuncs = function() {
         [ Opcodes.i32_add ],
 
         // load current string ind {arg}
-        [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ...unsignedLEB128(ValtypeSize.i32) ],
+        [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 ],
 
         // store to new string ind 0
-        [ Opcodes.i32_store16, Math.log2(ValtypeSize.i16) - 1, ...unsignedLEB128(newPointer + ValtypeSize.i32) ],
+        [ Opcodes.i32_store16, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 ],
 
         // return new string (pointer)
-        ...number(newPointer)
+        ...newPointer,
+        Opcodes.i32_from_u
       ];
     },
 
@@ -350,11 +347,8 @@ export const PrototypeFuncs = function() {
       const [ newOut, newPointer ] = arrayShell(1, 'i16');
 
       return [
-        // setup new/out array
+        // setup new/out array and use as pointer for store
         ...newOut,
-        [ Opcodes.drop ],
-
-        ...number(0, Valtype.i32), // base 0 for store later
 
         ...wIndex,
         Opcodes.i32_to,
@@ -366,13 +360,14 @@ export const PrototypeFuncs = function() {
         [ Opcodes.i32_add ],
 
         // load current string ind {arg}
-        [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ...unsignedLEB128(ValtypeSize.i32) ],
+        [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 ],
 
         // store to new string ind 0
-        [ Opcodes.i32_store16, Math.log2(ValtypeSize.i16) - 1, ...unsignedLEB128(newPointer + ValtypeSize.i32) ],
+        [ Opcodes.i32_store16, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 ],
 
         // return new string (page)
-        ...number(newPointer)
+        ...newPointer,
+        Opcodes.i32_from_u
       ];
     },
 
@@ -411,7 +406,7 @@ export const PrototypeFuncs = function() {
       [ Opcodes.i32_add ],
 
       // load current string ind {arg}
-      [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ...unsignedLEB128(ValtypeSize.i32) ],
+      [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 ],
       Opcodes.i32_from_u
     ],
 
@@ -433,7 +428,7 @@ export const PrototypeFuncs = function() {
       [ Opcodes.block, Blocktype.void ],
 
       [ Opcodes.local_get, iTmp ],
-      [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ...unsignedLEB128(ValtypeSize.i32) ],
+      [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 ],
       [ Opcodes.local_set, iTmp2 ],
 
       // if not surrogate, continue
@@ -455,7 +450,7 @@ export const PrototypeFuncs = function() {
 
       // if not followed by trailing surrogate, return false
       [ Opcodes.local_get, iTmp ],
-      [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ...unsignedLEB128(ValtypeSize.i32 + ValtypeSize.i16) ],
+      [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ValtypeSize.i32 + ValtypeSize.i16 ],
       ...number(0xFC00, Valtype.i32),
       [ Opcodes.i32_and ],
       ...number(0xDC00, Valtype.i32),
@@ -507,11 +502,8 @@ export const PrototypeFuncs = function() {
         const [ newOut, newPointer ] = arrayShell(1, 'i8');
 
         return [
-          // setup new/out array
+          // setup new/out array and use pointer for store later
           ...newOut,
-          [ Opcodes.drop ],
-
-          ...number(0, Valtype.i32), // base 0 for store later
 
           ...wIndex,
           Opcodes.i32_to_u,
@@ -548,13 +540,14 @@ export const PrototypeFuncs = function() {
           [ Opcodes.i32_add ],
 
           // load current string ind {arg}
-          [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(ValtypeSize.i32) ],
+          [ Opcodes.i32_load8_u, 0, ValtypeSize.i32 ],
 
           // store to new string ind 0
-          [ Opcodes.i32_store8, 0, ...unsignedLEB128(newPointer + ValtypeSize.i32) ],
+          [ Opcodes.i32_store8, 0, ValtypeSize.i32 ],
 
           // return new string (pointer)
-          ...number(newPointer)
+          ...newPointer,
+          Opcodes.i32_from_u
         ];
       },
 
@@ -563,11 +556,8 @@ export const PrototypeFuncs = function() {
         const [ newOut, newPointer ] = arrayShell(1, 'i8');
 
         return [
-          // setup new/out array
+          // setup new/out array and use pointer for later
           ...newOut,
-          [ Opcodes.drop ],
-
-          ...number(0, Valtype.i32), // base 0 for store later
 
           ...wIndex,
           Opcodes.i32_to,
@@ -576,13 +566,14 @@ export const PrototypeFuncs = function() {
           [ Opcodes.i32_add ],
 
           // load current string ind {arg}
-          [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(ValtypeSize.i32) ],
+          [ Opcodes.i32_load8_u, 0, ValtypeSize.i32 ],
 
           // store to new string ind 0
-          [ Opcodes.i32_store8, 0, ...unsignedLEB128(newPointer + ValtypeSize.i32) ],
+          [ Opcodes.i32_store8, 0, ValtypeSize.i32 ],
 
           // return new string (page)
-          ...number(newPointer)
+          ...newPointer,
+          Opcodes.i32_from_u
         ];
       },
 
@@ -618,7 +609,7 @@ export const PrototypeFuncs = function() {
         [ Opcodes.i32_add ],
 
         // load current string ind {arg}
-        [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(ValtypeSize.i32) ],
+        [ Opcodes.i32_load8_u, 0, ValtypeSize.i32 ],
         Opcodes.i32_from_u
       ],
 

package/compiler/wasmSpec.js

@@ -191,6 +191,8 @@ export const Opcodes = {
   i32_trunc_sat_f64_s: [ 0xfc, 0x02 ],
   i32_trunc_sat_f64_u: [ 0xfc, 0x03 ],
 
+  memory_init: [ 0xfc, 0x08 ],
+  data_drop: [ 0xfc, 0x09 ],
   memory_copy: [ 0xfc, 0x0a ],
 
   // simd insts are 0xFD simdop: varuint32
@@ -209,8 +211,6 @@ export const Opcodes = {
   i32x4_add: [ 0xfd, 0xae, 0x01 ],
   i32x4_sub: [ 0xfd, 0xb1, 0x01 ],
   i32x4_mul: [ 0xfd, 0xb5, 0x01 ],
-
-  i32x4_dot_i16x8_s: [ 0xfd, 0xba, 0x01 ],
 };
 
 export const FuncType = 0x60;

package/compiler/wrap.js

@@ -6,8 +6,25 @@ import { TYPES } from './types.js';
 import { log } from './log.js';
 import Prefs from './prefs.js';
 
+const fs = (typeof process?.version !== 'undefined' ? (await import('node:fs')) : undefined);
+
 const bold = x => `\u001b[1m${x}\u001b[0m`;
 
+export const readByteStr = (memory, ptr) => {
+  const length = (new Int32Array(memory.buffer, ptr, 1))[0];
+  return Array.from(new Uint8Array(memory.buffer, ptr + 4, length)).map(x => String.fromCharCode(x)).join('');
+};
+
+export const writeByteStr = (memory, ptr, str) => {
+  const length = str.length;
+  (new Int32Array(memory.buffer, ptr, 1))[0] = length;
+
+  const arr = new Uint8Array(memory.buffer, ptr + 4, length);
+  for (let i = 0; i < length; i++) {
+    arr[i] = str.charCodeAt(i);
+  }
+};
+
 const porfToJSValue = ({ memory, funcs, pages }, value, type) => {
   switch (type) {
     case TYPES.boolean: return Boolean(value);
@@ -87,13 +104,14 @@ const porfToJSValue = ({ memory, funcs, pages }, value, type) => {
 
     case TYPES.symbol: {
       const descStore = pages.get('bytestring: __Porffor_symbol_descStore/ptr').ind * pageSize;
+      if (!descStore) return Symbol();
+
       const offset = descStore + 4 + ((value - 1) * 9);
 
       const v = (new Float64Array(memory.buffer.slice(offset, offset + 8), 0, 1))[0];
       const t = (new Uint8Array(memory.buffer, offset + 8, 1))[0];
 
       const desc = porfToJSValue({ memory, funcs, pages }, v, t);
-
       return Symbol(desc);
     }
 
@@ -101,28 +119,31 @@ const porfToJSValue = ({ memory, funcs, pages }, value, type) => {
   }
 };
 
-export default async (source, flags = [ 'module' ], customImports = {}, print = str => process.stdout.write(str)) => {
+export default (source, flags = [ 'module' ], customImports = {}, print = str => process.stdout.write(str)) => {
   const times = [];
 
   const t1 = performance.now();
-  const { wasm, funcs, globals, tags, exceptions, pages, c } = compile(source, flags);
+  const { wasm, funcs, globals, tags, exceptions, pages, c } = typeof source === 'object' ? source : compile(source, flags);
 
   globalThis.porfDebugInfo = { funcs, globals };
 
-  if (source.includes('export function')) flags.push('module');
+  if (source.includes?.('export ')) flags.push('module');
 
-  // (await import('node:fs')).writeFileSync('out.wasm', Buffer.from(wasm));
+  // fs.writeFileSync('out.wasm', Buffer.from(wasm));
 
   times.push(performance.now() - t1);
   if (Prefs.profileCompiler) console.log(bold(`compiled in ${times[0].toFixed(2)}ms`));
 
   const backtrace = (funcInd, blobOffset) => {
-    if (funcInd == null || blobOffset == null) return false;
+    if (funcInd == null || blobOffset == null ||
+        Number.isNaN(funcInd) || Number.isNaN(blobOffset)) return false;
 
     // convert blob offset -> function wasm offset.
     // this is not good code and is somewhat duplicated
     // I just want it to work for debugging, I don't care about perf/yes
     const func = funcs.find(x => x.index === funcInd);
+    if (!func) return false;
+
     const locals = Object.values(func.locals).sort((a, b) => a.idx - b.idx).slice(func.params.length).sort((a, b) => a.idx - b.idx);
 
     let localDecl = [], typeCount = 0, lastType;
@@ -197,13 +218,15 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
 
   let instance;
   try {
-    let wasmEngine = WebAssembly;
-    if (Prefs.asur) {
-      log.warning('wrap', 'using our !experimental! asur wasm engine instead of host to run');
-      wasmEngine = await import('../asur/index.js');
-    }
-
-    0, { instance } = await wasmEngine.instantiate(wasm, {
+    // let wasmEngine = WebAssembly;
+    // if (Prefs.asur) {
+    //   log.warning('wrap', 'using our !experimental! asur wasm engine instead of host to run');
+    //   wasmEngine = await import('../asur/index.js');
+    // }
+
+    // 0, { instance } = await wasmEngine.instantiate(wasm, {
+    const module = new WebAssembly.Module(wasm);
+    instance = new WebAssembly.Instance(module, {
       '': {
         p: valtype === 'i64' ? i => print(Number(i).toString()) : i => print(i.toString()),
         c: valtype === 'i64' ? i => print(String.fromCharCode(Number(i))) : i => print(String.fromCharCode(i)),
@@ -211,12 +234,31 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
         u: () => performance.timeOrigin,
         y: () => {},
         z: () => {},
+        w: (ind, outPtr) => { // readArgv
+          const args = process.argv.slice(2).filter(x => !x.startsWith('-'));
+          const str = args[ind];
+          if (!str) return -1;
+
+          writeByteStr(memory, outPtr, str);
+          return str.length;
+        },
+        q: (pathPtr, outPtr) => { // readFile
+          try {
+            const path = readByteStr(memory, pathPtr);
+            const contents = fs.readFileSync(path, 'utf8');
+            writeByteStr(memory, outPtr, contents);
+            return contents.length;
+          } catch {
+            return -1;
+          }
+        },
         ...customImports
       }
     });
   } catch (e) {
     // only backtrace for runner, not test262/etc
     if (!process.argv[1].includes('/runner')) throw e;
+    if (!(e instanceof WebAssembly.CompileError)) throw e;
 
     const funcInd = parseInt(e.message.match(/function #([0-9]+) /)?.[1]);
     const blobOffset = parseInt(e.message.split('@')?.[1]);

package/package.json

@@ -1,12 +1,10 @@
 {
   "name": "porffor",
   "description": "a basic experimental wip aot optimizing js -> wasm engine/compiler/runtime in js",
-  "version": "0.16.0-ec15a329e",
+  "version": "0.16.0-f9e625159",
   "author": "CanadaHonk",
   "license": "MIT",
-  "scripts": {
-    "precompile": "node ./compiler/precompile.js"
-  },
+  "scripts": {},
   "dependencies": {
     "acorn": "^8.11.3",
     "node-repl-polyfill": "^0.1.1"
@@ -28,5 +26,5 @@
   "bugs": {
     "url": "https://github.com/CanadaHonk/porffor/issues"
   },
-  "homepage": "https://porffor.goose.icu"
+  "homepage": "https://porffor.dev"
 }

package/runner/index.js

@@ -1,8 +1,11 @@
 #!/usr/bin/env node
-
-import compile from '../compiler/wrap.js';
 import fs from 'node:fs';
 
+// deno compat
+if (typeof process === 'undefined' && typeof Deno !== 'undefined') {
+  globalThis.process = await import('node:process');
+}
+
 const start = performance.now();
 
 if (process.argv.includes('--compile-hints')) {
@@ -59,12 +62,22 @@ if (process.argv.includes('--help')) {
 }
 
 let file = process.argv.slice(2).find(x => x[0] !== '-');
-if (['run', 'wasm', 'native', 'c', 'profile', 'debug', 'debug-wasm'].includes(file)) {
+if (['precompile', 'run', 'wasm', 'native', 'c', 'profile', 'debug', 'debug-wasm'].includes(file)) {
   // remove this arg
   process.argv.splice(process.argv.indexOf(file), 1);
 
+  if (file === 'precompile') {
+    await import('../compiler/precompile.js');
+    await new Promise(() => {}); // do nothing for the rest of this file
+  }
+
   if (file === 'profile') {
-    await import('./profiler.js');
+    await import('./profile.js');
+    await new Promise(() => {}); // do nothing for the rest of this file
+  }
+
+  if (file === 'debug') {
+    await import('./debug.js');
     await new Promise(() => {}); // do nothing for the rest of this file
   }
 
@@ -76,11 +89,6 @@ if (['run', 'wasm', 'native', 'c', 'profile', 'debug', 'debug-wasm'].includes(fi
     process.argv.push('--asur', '--wasm-debug');
   }
 
-  if (file === 'debug') {
-    await import('./debug.js');
-    await new Promise(() => {}); // do nothing for the rest of this file
-  }
-
   file = process.argv.slice(2).find(x => x[0] !== '-');
 
   const nonOptOutFile = process.argv.slice(process.argv.indexOf(file) + 1).find(x => x[0] !== '-');
@@ -89,6 +97,8 @@ if (['run', 'wasm', 'native', 'c', 'profile', 'debug', 'debug-wasm'].includes(fi
   }
 }
 
+globalThis.file = file;
+
 if (!file) {
   if (process.argv.includes('-v') || process.argv.includes('--version')) {
     // just print version
@@ -103,6 +113,8 @@ if (!file) {
 
 const source = fs.readFileSync(file, 'utf8');
 
+const compile = (await import('../compiler/wrap.js')).default;
+
 let cache = '';
 const print = str => {
   /* cache += str;
@@ -115,17 +127,20 @@ const print = str => {
   process.stdout.write(str);
 };
 
+let runStart;
 try {
   if (process.argv.includes('-b')) {
     const { wasm, exports } = await compile(source, process.argv.includes('--module') ? [ 'module' ] : [], {}, print);
 
+    runStart = performance.now();
     if (!process.argv.includes('--no-run')) exports.main();
 
     console.log(`\n\nwasm size: ${wasm.byteLength} bytes`);
   } else {
     const { exports } = await compile(source, process.argv.includes('--module') ? [ 'module' ] : [], {}, print);
 
-    if (!process.argv.includes('-no-run')) exports.main();
+    runStart = performance.now();
+    if (!process.argv.includes('--no-run')) exports.main();
   }
   // if (cache) process.stdout.write(cache);
 } catch (e) {
@@ -133,4 +148,4 @@ try {
   console.error(process.argv.includes('-i') ? e : `${e.constructor.name}: ${e.message}`);
 }
 
-if (process.argv.includes('-t')) console.log(`${process.argv.includes('-b') ? '' : '\n\n'}total time: ${(performance.now() - start).toFixed(2)}ms`);
+if (process.argv.includes('-t')) console.log(`${process.argv.includes('-b') ? '' : '\n\n'}total time: ${(performance.now() - start).toFixed(2)}ms\nexecution time: ${(performance.now() - runStart).toFixed(2)}ms`);