porffor 0.16.0-6572d1c74 → 0.16.0-688a50c13

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/wrap.js

@@ -11,13 +11,13 @@ const fs = (typeof process?.version !== 'undefined' ? (await import('node:fs'))
 const bold = x => `\u001b[1m${x}\u001b[0m`;
 
 export const readByteStr = (memory, ptr) => {
-  const length = (new Int32Array(memory.buffer, ptr, 1))[0];
+  const length = (new Int32Array(memory.buffer.slice(ptr, ptr + 4), 0, 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;
+  (new Int32Array(memory.buffer.slice(ptr, ptr + 4), 0, 1))[0] = length;
 
   const arr = new Uint8Array(memory.buffer, ptr + 4, length);
   for (let i = 0; i < length; i++) {
@@ -46,17 +46,17 @@ const porfToJSValue = ({ memory, funcs, pages }, value, type) => {
     }
 
     case TYPES.string: {
-      const length = (new Int32Array(memory.buffer, value, 1))[0];
+      const length = (new Int32Array(memory.buffer.slice(value, value + 4), 0, 1))[0];
       return Array.from(new Uint16Array(memory.buffer, value + 4, length)).map(x => String.fromCharCode(x)).join('');
     }
 
     case TYPES.bytestring: {
-      const length = (new Int32Array(memory.buffer, value, 1))[0];
+      const length = (new Int32Array(memory.buffer.slice(value, value + 4), 0, 1))[0];
       return Array.from(new Uint8Array(memory.buffer, value + 4, length)).map(x => String.fromCharCode(x)).join('');
     }
 
     case TYPES.array: {
-      const length = (new Int32Array(memory.buffer, value, 1))[0];
+      const length = (new Int32Array(memory.buffer.slice(value, value + 4), 0, 1))[0];
 
       const out = [];
       for (let i = 0; i < length; i++) {
@@ -77,12 +77,12 @@ const porfToJSValue = ({ memory, funcs, pages }, value, type) => {
     }
 
     case TYPES.date: {
-      const t = (new Float64Array(memory.buffer, value, 1))[0];
+      const t = (new Float64Array(memory.buffer.slice(value, value + 8), 0, 1))[0];
       return new Date(t);
     }
 
     case TYPES.set: {
-      const size = (new Int32Array(memory.buffer, value, 1))[0];
+      const size = (new Int32Array(memory.buffer.slice(value, value + 4), 0, 1))[0];
 
       const out = new Set();
       for (let i = 0; i < size; i++) {
@@ -102,17 +102,17 @@ const porfToJSValue = ({ memory, funcs, pages }, value, type) => {
       return out;
     }
 
-    case TYPES.symbol: {
-      const descStore = pages.get('bytestring: __Porffor_symbol_descStore/ptr').ind * pageSize;
-      const offset = descStore + 4 + ((value - 1) * 9);
+    // case TYPES.symbol: {
+    //   const descStore = pages.get('bytestring: __Porffor_symbol_descStore/ptr').ind * pageSize;
+    //   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 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);
+    //   const desc = porfToJSValue({ memory, funcs, pages }, v, t);
 
-      return Symbol(desc);
-    }
+    //   return Symbol(desc);
+    // }
 
     default: return value;
   }
@@ -128,7 +128,7 @@ export default (source, flags = [ 'module' ], customImports = {}, print = str =>
 
   if (source.includes?.('export ')) flags.push('module');
 
-  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`));

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-6572d1c74",
+  "version": "0.16.0-688a50c13",
   "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,6 +1,4 @@
 #!/usr/bin/env node
-
-import compile from '../compiler/wrap.js';
 import fs from 'node:fs';
 
 const start = performance.now();
@@ -59,10 +57,15 @@ 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('./profile.js');
     await new Promise(() => {}); // do nothing for the rest of this file
@@ -105,6 +108,8 @@ if (!file) {
 
 const source = fs.readFileSync(file, 'utf8');
 
+const compile = (await import('../compiler/wrap.js')).default;
+
 let cache = '';
 const print = str => {
   /* cache += str;