porffor 0.2.0-fdf0fc5 → 0.14.0-0ad2c8a7c

package/CONTRIBUTING.md

@@ -98,7 +98,7 @@ Loads the character code at the pointer `pointer` **for a String**.[^1]
 Porffor.wasm.i32.store(pointer, length, 0, 0)
 ```
 
-Stores the length `length` at pointer `pointer`, setting the length of an object. This is mostly unneeded today as you can just do `obj.length = length`. [^2]
+Stores the length `length` at pointer `pointer`, setting the length of an object. This is mostly unneeded today as you can just do `obj.length = length`. (The `0, 4` args are necessary for the Wasm instruction, but you don't need to worry about them (`0` alignment, `0` byte offset).
 
 <br>
 
@@ -198,11 +198,14 @@ Store the character code into the `out` pointer variable, and increment it.
 
 ## Porffor-specific TS notes
 
-- For declaring variables, you must use explicit type annotations currently (eg `let a: number = 1`, not `let a = 1`)
+- For declaring variables, you must use explicit type annotations currently (eg `let a: number = 1`, not `let a = 1`).
 - You might spot `Porffor.fastOr`/`Porffor.fastAnd`, these are non-short circuiting versions of `||`/`&&`, taking any number of conditions as arguments. You shouldn't don't need to use or worry about these.
-- **There are ~no objects, you cannot use them/literals.**
+- **There are ~no objects, you cannot use them.**
 - Attempt to avoid string/array-heavy code and use more variables instead if possible, easier on memory and CPU/perf.
 - Do not set a return type for prototype methods, it can cause errors/unexpected results.
+- You cannot use other functions in the file not exported, or variables not inside the current function.
+- `if (...)` uses a fast truthy implementation which is not spec-compliant as most conditions should be strictly checked. To use spec-compliant behavior, use `if (Boolean(...))`.
+- For object (string/array/etc) literals, you must use a variable eg `const out: bytestring = 'foobar'; console.log(out);` instead of `console.log('foobar')` due to precompile's allocator constraints.
 
 <br>
 
@@ -231,7 +234,11 @@ builtins/tostring_number: impl radix
 
 Make sure you have Test262 cloned already **inside of `test262/`** (`git clone https://github.com/tc39/test262.git test262/test262`) and run `npm install` inside `test262/` too.
 
-Run `node test262` to run all the tests and get an output of total overall test results. The main thing you want to pay attention to is the emoji summary (lol):
+Run `node test262` to run all the tests and get an output of total overall test results.
+
+Warning: this will consume 1-6GB of memory and ~90% of all CPU cores while running (depending on thread count), it should take 15-120s depending on machine. You can specify how many threads with `--threads=N`, it will use the number of CPU threads by default.
+
+The main thing you want to pay attention to is the emoji summary (lol):
 ```
 🧪 50005 | 🤠 7007 (-89) | ❌ 1914 (-32) | 💀 13904 (-61) | 📝 23477 (-120) | ⏰ 2 | 🏗 2073 (+302) | 💥 1628
 ```
@@ -251,6 +258,4 @@ It will also log new passes/fails. Be careful as sometimes the overall passes ca
 
 <br>
 
-[^1]: The `0, 4` args are necessary for the Wasm instruction, but you don't need to worry about them (`0` alignment, `4` byte offset for length).
-
-[^2]: The `0, 4` args are necessary for the Wasm instruction, but you don't need to worry about them (`0` alignment, `0` byte offset).
+[^1]: The `0, 4` args are necessary for the Wasm instruction, but you don't need to worry about them (`0` alignment, `4` byte offset for length).

package/README.md

@@ -13,8 +13,8 @@ Porffor is primarily built from scratch, the only thing that is not is the parse
 ## Usage
 Expect nothing to work! Only very limited JS is currently supported. See files in `bench` for examples.
 
-### Setup
-**`npm install -g porffor`**. It's that easy (hopefully) :)
+### Install
+**`npm install -g porffor@latest`**. It's that easy (hopefully) :)
 
 ### Trying a REPL
 **`porf`**. Just run it with no script file argument.
@@ -189,6 +189,13 @@ These include some early (stage 1/0) and/or dead (last commit years ago) proposa
 - Intrinsic functions (see below)
 - Inlining wasm via ``asm`...``\` "macro"
 
+## Versioning
+Porffor uses a unique versioning system, here's an example: `0.14.0-15cb49f07`. Let's break it down:
+1. `0` - major, always `0` as Porffor is not ready yet
+2. `14` - minor, total Test262 pass percentage (floored to nearest int)
+3. `0` - micro, always `0` as unused
+4. `15cb49f07` - commit hash
+
 ## Performance
 *For the features it supports most of the time*, Porffor is *blazingly fast* compared to most interpreters and common engines running without JIT. For those with JIT, it is usually slower by default, but can catch up with compiler arguments and typed input, even more so when compiling to native binaries.
 
@@ -220,7 +227,7 @@ Mostly for reducing size. I do not really care about compiler perf/time as long
 - No tags if unused/optimized out
 
 ## Test262
-Porffor can run Test262 via some hacks/transforms which remove unsupported features whilst still doing the same asserts (eg simpler error messages using literals only). It currently passes >10% (see latest commit desc for latest and details). Use `node test262` to test, it will also show a difference of overall results between the last commit and current results.
+Porffor can run Test262 via some hacks/transforms which remove unsupported features whilst still doing the same asserts (eg simpler error messages using literals only). It currently passes >14% (see latest commit desc for latest and details). Use `node test262` to test, it will also show a difference of overall results between the last commit and current results.
 
 ## Codebase
 - `compiler`: contains the compiler itself
@@ -259,8 +266,6 @@ Basically none right now (other than giving people headaches). Potential ideas:
 No particular order and no guarentees, just what could happen soon™
 
 - Arrays
-  - More of `Array` prototype
-  - Arrays/strings inside arrays
   - Destructuring
 - Objects
   - Basic object expressions (eg `{}`, `{ a: 0 }`)
@@ -308,16 +313,10 @@ Porffor intentionally does not use Wasm proposals which are not commonly impleme
 
 - Multi-value **(required)**
 - Non-trapping float-to-int conversions **(required)**
-- Bulk memory operations (required, but uncommonly used)
-- Exception handling (optional, for errors)
+- Bulk memory operations (optional, can get away without sometimes)
+- Exception handling (optional, only for errors)
 - Tail calls (opt-in, off by default)
 
-## Isn't this the same as AssemblyScript/other Wasm langs?
-No. they are not alike at all internally and have very different goals/ideals:
-- Porffor is made as a generic JS engine, not for Wasm stuff specifically
-- Porffor primarily consumes JS
-- Porffor is written in pure JS and compiles itself, not using Binaryen/etc
-- (Also I didn't know it existed when I started this, lol)
 
 ## FAQ
 
@@ -331,5 +330,9 @@ No. they are not alike at all internally and have very different goals/ideals:
 ### 2. Why at all?
 Yes!
 
-### 3. But what about spec compliance?
-Lol, no. (sorry.)
+## 3. Isn't this the same as AssemblyScript/other Wasm langs?
+No. they are not alike at all internally and have very different goals/ideals:
+- Porffor is made as a generic JS engine, not for Wasm stuff specifically
+- Porffor primarily consumes JS
+- Porffor is written in pure JS and compiles itself, not using Binaryen/etc
+- (Also I didn't know it existed when I started this, lol)

package/asur/index.js

@@ -1155,7 +1155,7 @@ if (bc.porfFunc && paused && op) {
   switch (byg(
     paused,
     funcLines[currentFunc] + currentLine,
-    '\x1b[1masur\x1b[22m: ' + callStack.join(' -> ') + (parents.length > 1 ? \` | \${parents.slice(1).map(x => invOpcodes[x.opcode]).join(' -> ')}\` : ''),
+    '\x1b[1masur debugger\x1b[22m: ' + callStack.join(' -> ') + (parents.length > 1 ? \` | \${parents.slice(1).map(x => invOpcodes[x.opcode]).join(' -> ')}\` : ''),
     [
       {
         x: termWidth - 1 - width - 6,

package/byg/index.js

@@ -2,7 +2,6 @@ import fs from 'node:fs';
 
 const noAnsi = s => s.replace(/\u001b\[[0-9]+m/g, '');
 const printLine = (line, number, breakpoint = false, current = false, selected = false) => {
-  // console.log(`\x1b[${breakpoint ? (selected ? '106' : '46') : (selected ? '47' : '100')}m\x1b[${selected ? '30' : '97'}m${number.toFixed(0).padStart(4, ' ')}\x1b[${breakpoint ? (selected ? '96' : '36') : (selected ? '37' : '90')}m\x1b[${current ? '47' : '40'}m▌ \x1b[${current ? '47' : '40'}m\x1b[${current ? '30' : '37'}m${current ? noAnsi(line) : line}\x1b[0K`);
   console.log(`\x1b[${breakpoint ? (selected ? '43' : '103') : (selected ? '47' : '100')}m\x1b[${selected || breakpoint ? '30' : '97'}m${number.toFixed(0).padStart(4, ' ')}\x1b[${breakpoint ? (selected ? '33' : '93') : (selected ? '37' : '90')}m\x1b[${current ? '47' : '40'}m▌ \x1b[${current ? '47' : '40'}m\x1b[${current ? '30' : '37'}m${current ? noAnsi(line) : line}\x1b[0K`);
 };
 
@@ -13,13 +12,10 @@ const box = (x, y, width, height, title = '', content = [], color = ['90', '100'
 
     // top
     process.stdout.write(`\x1b[48m\x1b[${y + 1};${x + 1}H\x1b[${color[0]}m` + '▄'.repeat(width));
-
     // bottom
     process.stdout.write(`\x1b[${y + height + 1};${x + 1}H▝` + '▀'.repeat(width - 1) + '▘');
-
     // left
     process.stdout.write(`\x1b[${y + 1};${x + 1}H▗` + '\x1b[1B\x1b[1D▐'.repeat(height - 1));
-
     // right
     process.stdout.write(`\x1b[${y + 1};${x + width + 1}H▖` + '\x1b[1B\x1b[1D▌'.repeat(height - 1));
 
@@ -33,8 +29,6 @@ const box = (x, y, width, height, title = '', content = [], color = ['90', '100'
   process.stdout.write(`\x1b[${y + 1};${x + 1}H\x1b[${color[1]}m` + ' '.repeat(width) + (`\x1b[1B\x1b[${width}D` + ' '.repeat(width)).repeat(Math.max(0, height - 1)));
 
   // title
-  // if (title) process.stdout.write(`\x1b[${y + 1};${x + ((width - title.length) / 2 | 0) + 1}H\x1b[${color[1]}m\x1b[${color[2]}m\x1b[1m${title}\x1b[22m`);
-  // if (title) process.stdout.write(`\x1b[${y};${x}H\x1b[${color[3]}▗\x1b[${color[4]}m\x1b[${color[2]}m\x1b[1m${' '.repeat((width - title.length) / 2 | 0)}${title}${' '.repeat(width - (((width - title.length) / 2 | 0)) - title.length)}\x1b[0m\x1b[${color[4]}m▖`);
   if (title) process.stdout.write(`\x1b[${y};${x}H\x1b[0m\x1b[${color[3]}m▐\x1b[${color[4]}m\x1b[${color[2]}m\x1b[1m${' '.repeat((width - title.length) / 2 | 0)}${title}${' '.repeat(width - (((width - title.length) / 2 | 0)) - title.length)}\x1b[0m\x1b[${color[3]}m▌`);
 
   // content
@@ -66,8 +60,6 @@ export default ({ lines, pause, breakpoint }) => {
       process.exit();
     }
 
-    // process.stdout.write(s);
-
     if (!paused) pause();
   });
 
@@ -83,7 +75,6 @@ export default ({ lines, pause, breakpoint }) => {
 
   process.on('exit', () => {
     process.stdout.write('\x1b[0m');
-    // console.clear();
   });
 
   console.clear();
@@ -130,18 +121,9 @@ export default ({ lines, pause, breakpoint }) => {
 
       for (const x of boxes) {
         const y = x.y({ currentLinePos });
-        const height = x.height;
         if (y < 0 || y >= termHeight) continue;
 
-        // crop box if > termHeight
-        // if (y + height >= termHeight) {
-        //   const excess = y + height - termHeight;
-        //   height -= excess;
-
-        //   content = content.slice(0, height - 2);
-        // }
-
-        box(x.x, y, x.width, height, x.title, x.content);
+        box(x.x, y, x.width, x.height, x.title, x.content);
       }
 
       // text += ` | rss: ${(process.memoryUsage.rss() / 1024 / 1024).toFixed(2)}mb`;
@@ -179,7 +161,8 @@ export default ({ lines, pause, breakpoint }) => {
         }
 
         case 'b': {
-          if (!lastSpecial) { // b pressed normally
+          if (!lastSpecial) {
+            // b pressed normally
             breakpoints[currentLine + scrollOffset] = !breakpoints[currentLine + scrollOffset];
             draw();
 
@@ -188,7 +171,6 @@ export default ({ lines, pause, breakpoint }) => {
           }
 
           // arrow down
-          // if (screenOffset + termHeight <= lines.length) scrollOffset++;
           if (scrollOffset < lines.length - currentLine - 1) scrollOffset++;
           draw();
           break;
@@ -198,7 +180,6 @@ export default ({ lines, pause, breakpoint }) => {
           if (!lastSpecial) break;
 
           // arrow up
-          // if (screenOffset > 0) scrollOffset--;
           if (scrollOffset > -currentLine) scrollOffset--;
           draw();
 
@@ -209,7 +190,6 @@ export default ({ lines, pause, breakpoint }) => {
           if (!lastSpecial) break;
 
           // page up
-          // scrollOffset -= Math.min(screenOffset, termHeight - 1);
           scrollOffset -= Math.min(scrollOffset + currentLine, termHeight - 1);
           draw();
           break;
@@ -219,7 +199,6 @@ export default ({ lines, pause, breakpoint }) => {
           if (!lastSpecial) break;
 
           // page down
-          // scrollOffset += Math.min((lines.length + 1) - (screenOffset + termHeight), termHeight - 1);
           scrollOffset += Math.min(lines.length - (scrollOffset + currentLine) - 1, termHeight - 1);
           draw();
           break;

package/compiler/2c.js

@@ -1,7 +1,7 @@
 import { read_ieee754_binary64, read_signedLEB128, read_unsignedLEB128 } from './encoding.js';
 import { Blocktype, Opcodes, Valtype } from './wasmSpec.js';
 import { operatorOpcode } from './expression.js';
-import { log } from "./log.js";
+import { log } from './log.js';
 
 const CValtype = {
   i8: 'i8',
@@ -106,17 +106,6 @@ for (const x in CValtype) {
   if (Valtype[x]) CValtype[Valtype[x]] = CValtype[x];
 }
 
-const todo = msg => {
-  class TodoError extends Error {
-    constructor(message) {
-      super(message);
-      this.name = 'TodoError';
-    }
-  }
-
-  throw new TodoError(msg);
-};
-
 const removeBrackets = str => {
   // return str;
   // if (str.startsWith(`(${CValtype.i32})(${CValtype.u32})`)) return `(${CValtype.i32})(${CValtype.u32})(` + removeBrackets(str.slice(22, -1)) + ')';
@@ -130,6 +119,9 @@ const removeBrackets = str => {
 };
 
 export default ({ funcs, globals, tags, data, exceptions, pages }) => {
+  // fix declaring order for c
+  funcs.reverse();
+
   const invOperatorOpcode = Object.values(operatorOpcode).reduce((acc, x) => {
     for (const k in x) {
       acc[x[k]] = k;
@@ -167,10 +159,10 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
     prependMain.set('_data', data.map(x => `memcpy(_memory + ${x.offset}, (unsigned char[]){${x.bytes.join(',')}}, ${x.bytes.length});`).join('\n'));
   }
 
-  // for (const [ x, p ] of pages) {
-    // out += `${CValtype[p.type]} ${x.replace(': ', '_').replace(/[^0-9a-zA-Z_]/g, '')}[100]`;
-    // out += ';\n';
-  // }
+  if (importFuncs.find(x => x.name === '__Porffor_readArgv')) {
+    prepend.set('argv', `int _argc; char** _argv;`);
+    prependMain.set('argv', `_argc = argc; _argv = argv;`);
+  }
 
   if (out) out += '\n';
 
@@ -213,9 +205,11 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
 
   for (const f of funcs) {
     depth = 1;
+    brDepth = 0;
+
+    let retTmpId = 0;
 
     const invLocals = inv(f.locals, x => x.idx);
-    // if (f.returns.length > 1) todo('funcs returning >1 value unsupported');
 
     for (const x in invLocals) {
       invLocals[x] = sanitize(invLocals[x]);
@@ -223,8 +217,9 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
 
     const returns = f.returns.length > 0;
 
-    const shouldInline = f.internal;
-    out += `${f.name === 'main' ? 'int' : (f.internal ? (returns ? CValtype.f64 : 'void') : 'struct ReturnValue')} ${shouldInline ? 'inline ' : ''}${sanitize(f.name)}(${f.params.map((x, i) => `${CValtype[x]} ${invLocals[i]}`).join(', ')}) {\n`;
+    const shouldInline = false; // f.internal;
+    if (f.name === 'main') out += `int main(${prependMain.has('argv') ? 'int argc, char* argv[]' : ''}) {\n`;
+      else out += `${f.internal ? (returns ? CValtype.f64 : 'void') : 'struct ReturnValue'} ${shouldInline ? 'inline ' : ''}${sanitize(f.name)}(${f.params.map((x, i) => `${CValtype[x]} ${invLocals[i]}`).join(', ')}) {\n`;
 
     if (f.name === 'main') {
       out += [...prependMain.values()].join('\n');
@@ -247,12 +242,7 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
     const brs = [];
     let lastCond = false;
 
-    // let brDepth = 0;
-
     const blockStart = (i, loop) => {
-      // reset "stack"
-      // vals = [];
-
       rets.push(i[1]);
 
       const br = brId++;
@@ -269,25 +259,6 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
       brDepth++;
     };
 
-    const highlight = i => {
-      const surrounding = 6;
-
-      const decomp = decompile(f.wasm.slice(i - surrounding, i + surrounding + 1), '', 0, f.locals, f.params, f.returns, funcs, globals, exceptions).slice(0, -1).split('\n');
-
-      const noAnsi = s => s.replace(/\u001b\[[0-9]+m/g, '');
-      let longest = 0;
-      for (let j = 0; j < decomp.length; j++) {
-        longest = Math.max(longest, noAnsi(decomp[j]).length);
-      }
-
-      const middle = Math.floor(decomp.length / 2);
-      decomp[middle] = `\x1B[47m\x1B[30m${noAnsi(decomp[middle])}${'\u00a0'.repeat(longest - noAnsi(decomp[middle]).length)}\x1B[0m`;
-
-      console.log('\x1B[90m...\x1B[0m');
-      console.log(decomp.join('\n'));
-      console.log('\x1B[90m...\x1B[0m\n');
-    };
-
     for (let _ = 0; _ < f.wasm.length; _++) {
       const i = f.wasm[_];
       if (!i || !i[0]) continue;
@@ -415,8 +386,6 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
           const br = brs.at(-1);
           const ret = rets.at(-1);
           if (ret && ret !== Blocktype.void) {
-            // console.log(vals, ret);
-            // console.log(decompile(f.wasm.slice(_ - 5, _ + 1)));
             if (vals.length > 0) line(`_r${br} = ${removeBrackets(vals.pop())}`);
             // vals.push(`_r${br}`);
           }
@@ -425,8 +394,6 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
           line(`} else {`, false);
           depth++;
 
-          // reset "stack"
-          // vals = [];
           break;
         }
 
@@ -441,8 +408,6 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
           const br = brs.pop();
           const ret = rets.pop();
           if (ret && ret !== Blocktype.void) {
-            // console.log(vals, ret);
-            // console.log(decompile(f.wasm.slice(_ - 5, _ + 1)));
             if (vals.length > 0) line(`_r${br} = ${removeBrackets(vals.pop())}`);
             vals.push(`_r${br}`);
           }
@@ -505,6 +470,60 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
                 winIncludes.set('windows.h', true);
                 break;
 
+              case '__Porffor_readArgv':
+                includes.set('stdlib.h', true);
+
+                prepend.set('__Porffor_readArgv',
+`void __Porffor_readArgv(u32 index, u32 outPtr) {
+  if (index >= _argc) {
+    printf("expected %d arguments\\n", index);
+    exit(1);
+  }
+
+  char* arg = _argv[index];
+
+  u32 read = 0;
+  char* out = _memory + outPtr + 4;
+  char ch;
+  while ((ch = *(arg++)) != 0) {
+    out[read++] = ch;
+  }
+
+  memcpy(_memory + outPtr, &read, sizeof(read));
+}`);
+
+                line(`__Porffor_readArgv((u32)(${vals.at(-2)}), (u32)(${vals.pop()}))`);
+                vals.pop();
+                break;
+
+              case '__Porffor_readFile':
+                includes.set('stdio.h', true);
+                includes.set('stdlib.h', true);
+
+                prepend.set('__Porffor_readFile',
+`void __Porffor_readFile(u32 pathPtr, u32 outPtr) {
+  char* path = _memory + pathPtr + 4;
+  FILE* fp = fopen(path, "r");
+  if (fp == NULL) {
+    printf("failed to open file: %s\\n", path);
+    exit(1);
+  }
+
+  u32 read = 0;
+  char* out = _memory + outPtr + 4;
+  char ch;
+  while ((ch = fgetc(fp)) != EOF) {
+    out[read++] = ch;
+  }
+
+  fclose(fp);
+
+  memcpy(_memory + outPtr, &read, sizeof(read));
+}`);
+                line(`__Porffor_readFile((u32)(${vals.at(-2)}), (u32)(${vals.pop()}))`);
+                vals.pop();
+                break;
+
               default:
                 log.warning('2c', `unimplemented import: ${importFunc.name}`);
                 break;
@@ -520,7 +539,7 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
             if (func.internal) {
               vals.push(`${sanitize(func.name)}(${args.join(', ')})`);
             } else {
-              line(`const struct ReturnValue _ = ${sanitize(func.name)}(${args.join(', ')})`);
+              line(`const struct ReturnValue _${retTmpId++} = ${sanitize(func.name)}(${args.join(', ')})`);
               vals.push(`_.value`);
               vals.push(`_.type`);
             }
@@ -541,18 +560,14 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
 
         case Opcodes.br: {
           const ret = rets[brDepth - i[1] - 1];
-          // console.log(rets, brDepth, i[1], brDepth - i[1] - 1, ret, vals);
           if (ret !== Blocktype.void) line(`_r${brs[brDepth - i[1] - 1]} = ${removeBrackets(vals.pop())}`);
           line(`goto j${brs[brDepth - i[1] - 1]}`);
 
-          // // reset "stack"
-          // vals = [];
           break;
         }
 
         case Opcodes.br_if: {
           const ret = rets[brDepth - i[1] - 1];
-          // console.log(rets, brDepth, i[1], brDepth - i[1] - 1, ret, vals);
 
           let cond = removeBrackets(vals.pop());
           if (!lastCond) {
@@ -602,7 +617,6 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
           }
 
           log.warning('2c', `unimplemented op: ${invOpcodes[i[0]]}`);
-          // todo(`unimplemented op: ${invOpcodes[i[0]]}`);
       }
 
       lastCond = false;

package/compiler/assemble.js

@@ -1,8 +1,7 @@
-import { Valtype, FuncType, Empty, ExportDesc, Section, Magic, ModuleVersion, Opcodes, PageSize } from './wasmSpec.js';
-import { encodeVector, encodeString, encodeLocal, unsignedLEB128, signedLEB128, ieee754_binary64, unsignedLEB128_into, signedLEB128_into, ieee754_binary64_into } from './encoding.js';
-// import { number } from './embedding.js';
+import { Valtype, FuncType, ExportDesc, Section, Magic, ModuleVersion, Opcodes, PageSize, Reftype } from './wasmSpec.js';
+import { encodeVector, encodeString, encodeLocal, unsignedLEB128, signedLEB128, unsignedLEB128_into, signedLEB128_into, ieee754_binary64_into } from './encoding.js';
 import { importedFuncs } from './builtins.js';
-import { log } from "./log.js";
+import { log } from './log.js';
 import Prefs from './prefs.js';
 
 const createSection = (type, data) => [
@@ -66,6 +65,7 @@ export default (funcs, globals, tags, pages, data, flags) => {
     importFuncs = [...imports.values()];
 
     // fix call indexes for non-imports
+    // also fix call_indirect types
     const delta = importedFuncs.length - importFuncs.length;
     for (const f of funcs) {
       f.originalIndex = f.index;
@@ -75,6 +75,16 @@ export default (funcs, globals, tags, pages, data, flags) => {
         if ((inst[0] === Opcodes.call || inst[0] === Opcodes.return_call) && inst[1] >= importedFuncs.length) {
           inst[1] -= delta;
         }
+
+        if (inst[0] === Opcodes.call_indirect) {
+          const params = [];
+          for (let i = 0; i < inst[1]; i++) {
+            params.push(valtypeBinary, Valtype.i32);
+          }
+
+          const returns = [ valtypeBinary, Valtype.i32 ];
+          inst[1] = getType(params, returns);
+        }
       }
     }
   }
@@ -92,17 +102,37 @@ export default (funcs, globals, tags, pages, data, flags) => {
     encodeVector(funcs.map(x => getType(x.params, x.returns))) // type indexes
   );
 
-  // compilation hints section - unspecd, v8 only
-  // https://github.com/WebAssembly/design/issues/1473#issuecomment-1431274746
-  const chSection = !compileHints ? [] : customSection(
-    'compilationHints',
-    // for now just do everything as optimize eager
-    encodeVector(funcs.map(_ => chHint(0x02, 0x02, 0x02)))
+  const tableSection = !funcs.table ? [] : createSection(
+    Section.table,
+    encodeVector([ [ Reftype.funcref, 0x00, funcs.length ] ])
   );
 
+  const elementSection = !funcs.table ? [] : createSection(
+    Section.element,
+    encodeVector([ [
+      0x00,
+      Opcodes.i32_const, 0, Opcodes.end,
+      ...encodeVector(funcs.map(x => x.index))
+    ] ])
+  );
+
+  if (pages.has('func argc lut')) {
+    // generate func argc lut data
+    const bytes = [];
+    for (let i = 0; i < funcs.length; i++) {
+      const argc = Math.floor(funcs[i].params.length / 2);
+      bytes.push(argc % 256, (argc / 256 | 0) % 256);
+    }
+
+    data.push({
+      offset: pages.get('func argc lut').ind * pageSize,
+      bytes
+    });
+  }
+
   // const t0 = performance.now();
 
-  // specially optimized assembly for globals as this version is much (>5x) faster than traditional createSection(...)
+  // specially optimized assembly for globals as this version is much (>5x) faster than traditional createSection()
   const globalsValues = Object.values(globals);
 
   let globalSection = [];
@@ -227,6 +257,14 @@ export default (funcs, globals, tags, pages, data, flags) => {
     dataSection: dataSection.map(x => x.toString(16)),
   });
 
+  // compilation hints section - unspecd, v8 only
+  // https://github.com/WebAssembly/design/issues/1473#issuecomment-1431274746
+  const chSection = !compileHints ? [] : customSection(
+    'compilationHints',
+    // for now just do everything as optimize eager
+    encodeVector(funcs.map(_ => chHint(0x02, 0x02, 0x02)))
+  );
+
   return Uint8Array.from([
     ...Magic,
     ...ModuleVersion,
@@ -234,10 +272,12 @@ export default (funcs, globals, tags, pages, data, flags) => {
     ...importSection,
     ...funcSection,
     ...chSection,
+    ...tableSection,
     ...memorySection,
     ...tagSection,
     ...globalSection,
     ...exportSection,
+    ...elementSection,
     ...dataCountSection,
     ...codeSection,
     ...dataSection

package/compiler/builtins/annexb_string.js

@@ -2,7 +2,7 @@ export default () => {
   let out = `// @porf --funsafe-no-unlikely-proto-checks --valtype=i32
 `;
 
-  const annexB_noArgs = (a0, a1) => out += `
+  const noArgs = (a0, a1) => out += `
 export const __String_prototype_${a0} = (_this: string) => {
   let out: string = Porffor.s\`<${a1}>\`;
 
@@ -58,15 +58,15 @@ ${[...a1].map((x, i) => `  Porffor.wasm.i32.store8(outPtr, ${x.charCodeAt(0)}, 0
 };
 `;
 
-  annexB_noArgs('big', 'big');
-  annexB_noArgs('blink', 'blink');
-  annexB_noArgs('bold', 'b');
-  annexB_noArgs('fixed', 'tt');
-  annexB_noArgs('italics', 'i');
-  annexB_noArgs('small', 'small');
-  annexB_noArgs('strike', 'strike');
-  annexB_noArgs('sub', 'sub');
-  annexB_noArgs('sup', 'sup');
+  noArgs('big', 'big');
+  noArgs('blink', 'blink');
+  noArgs('bold', 'b');
+  noArgs('fixed', 'tt');
+  noArgs('italics', 'i');
+  noArgs('small', 'small');
+  noArgs('strike', 'strike');
+  noArgs('sub', 'sub');
+  noArgs('sup', 'sup');
 
   return out;
 };

package/compiler/builtins/annexb_string.ts

@@ -1,4 +1,5 @@
-// @porf --funsafe-no-unlikely-proto-checks --valtype=i32
+// @porf --valtype=i32
+import type {} from './porffor.d.ts';
 
 export const __String_prototype_trimLeft = (_this: string) => {
   return __String_prototype_trimStart(_this);
@@ -13,6 +14,6 @@ export const __String_prototype_trimRight = (_this: string) => {
   return __String_prototype_trimEnd(_this);
 };
 
-export const __ByteString_prototype_trimEnd = (_this: string) => {
-  return __ByteString_prototype_trimRight(_this);
+export const __ByteString_prototype_trimRight = (_this: string) => {
+  return __ByteString_prototype_trimEnd(_this);
 };