porffor 0.50.25 → 0.50.26

package/compiler/2c.js

@@ -918,5 +918,5 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
   const makeIncludes = includes => [...includes.keys()].map(x => `#include <${x}>\n`).join('');
   out = platformSpecific(makeIncludes(winIncludes), makeIncludes(unixIncludes), false) + '\n' + makeIncludes(includes) + '\n' + alwaysPreface + [...prepend.values()].join('\n') + '\n\n' + out;
 
-  return `// generated by porffor ${globalThis.version}\n` + out.trim();
+  return `// generated by porffor ${globalThis.version ?? ''}\n` + out.trim();
 };

package/compiler/opt.js

@@ -11,11 +11,6 @@ export default (funcs, globals, pages, tags, exceptions) => {
   const tailCall = Prefs.tailCall;
   if (tailCall) log.warning('opt', 'tail call proposal is not widely implemented! (you used --tail-call)');
 
-  // todo: this breaks exceptions after due to indexes not being adjusted
-  // const tagUse = tags.reduce((acc, x) => { acc[x.idx] = 0; return acc; }, {});
-  // const exceptionUse = exceptions.reduce((acc, _, i) => { acc[i] = 0; return acc; }, {});
-
-  // wasm transform pass
   let fi = 0;
   for (const f of funcs) {
     const wasm = f.wasm;
@@ -34,13 +29,6 @@ export default (funcs, globals, pages, tags, exceptions) => {
         inst = [ ...inst ];
         wasm[i] = inst;
 
-        // if (inst[0] === Opcodes.throw) {
-        //   tagUse[inst[1]]++;
-
-        //   const exceptId = read_signedLEB128(wasm[i - 1].slice(1));
-        //   exceptionUse[exceptId]++;
-        // }
-
         if (inst[0] === Opcodes.block) {
           // remove unneeded blocks (no brs inside)
           // block
@@ -251,19 +239,4 @@ export default (funcs, globals, pages, tags, exceptions) => {
       }
     }
   }
-
-  // for (const x in tagUse) {
-  //   if (tagUse[x] === 0) {
-  //     const el = tags.find(y => y.idx === x);
-  //     tags.splice(tags.indexOf(el), 1);
-  //   }
-  // }
-
-  // for (const x of Object.keys(exceptionUse).sort((a, b) => b - a)) {
-  //   if (exceptionUse[x] === 0) {
-  //     exceptions.splice(+x, 1);
-  //   }
-  // }
-
-  // return funcs;
 };

package/compiler/wasmSpec.js

@@ -1,18 +1,36 @@
-const enumify = (...args) => {
-  const obj = {};
-
-  for (let i = 0; i < args.length; i++) {
-    obj[i] = args[i];
-    obj[args[i]] = i;
-  }
+export const Magic = [ 0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00 ];
+export const PageSize = 65536; // 64KiB
+export const FuncType = 0x60;
 
-  return obj;
+export const Section = {
+  custom: 0,
+  type: 1,
+  import: 2,
+  func: 3,
+  table: 4,
+  memory: 5,
+  global: 6,
+  export: 7,
+  start: 8,
+  element: 9,
+  code: 10,
+  data: 11,
+  data_count: 12,
+  tag: 13
 };
 
-export const Section = enumify('custom', 'type', 'import', 'func', 'table', 'memory', 'global', 'export', 'start', 'element', 'code', 'data', 'data_count', 'tag');
-export const ExportDesc = enumify('func', 'table', 'mem', 'global', 'tag');
+export const ExportDesc = {
+  func: 0,
+  table: 1,
+  mem: 2,
+  global: 3,
+  tag: 4
+};
 
-export const Mut = enumify('const', 'var');
+export const Mut = {
+  const: 0,
+  var: 1
+};
 
 export const Valtype = {
   i32: 0x7f,
@@ -21,13 +39,21 @@ export const Valtype = {
   v128: 0x7b
 };
 
+export const ValtypeSize = {
+  i8: 1,
+  i16: 2,
+  i32: 4,
+  i64: 8,
+  f64: 8
+};
+
 export const Reftype = {
   funcref: 0x70,
   externref: 0x6f
 };
 
 export const Blocktype = {
-  void: 0x40,
+  void: 0x40
 };
 
 export const Opcodes = {
@@ -221,21 +247,4 @@ export const Opcodes = {
   v128_or: [ 0xfd, 80 ],
   v128_xor: [ 0xfd, 81 ],
   v128_any_true: [ 0xfd, 83 ]
-};
-
-export const FuncType = 0x60;
-export const Empty = 0x00;
-
-export const Magic = [ 0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00 ];
-
-export const PageSize = 65536; // 64KiB (1024 * 8)
-
-export const ValtypeSize = {
-  i32: 4,
-  i64: 8,
-  f64: 8,
-
-  // special
-  i8: 1,
-  i16: 2
 };

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