porffor 0.2.0-fde989a → 0.2.0-fdf0fc5

package/compiler/prototype.js

@@ -2,33 +2,19 @@ import { Opcodes, Blocktype, Valtype, ValtypeSize, PageSize } from "./wasmSpec.j
 import { number } from "./embedding.js";
 import { unsignedLEB128 } from "./encoding.js";
 import { UNDEFINED } from "./builtins.js";
-
-// todo: do not duplicate this
-const TYPES = {
-  number: 0x00,
-  boolean: 0x01,
-  string: 0x02,
-  undefined: 0x03,
-  object: 0x04,
-  function: 0x05,
-  symbol: 0x06,
-  bigint: 0x07,
-
-  // these are not "typeof" types but tracked internally
-  _array: 0x10,
-  _regexp: 0x11,
-  _bytestring: 0x12
-};
+import Prefs from './prefs.js';
+import { TYPES } from './types.js';
 
 // todo: turn these into built-ins once arrays and these become less hacky
 
 export const PrototypeFuncs = function() {
-  const noUnlikelyChecks = process.argv.includes('-funsafe-no-unlikely-proto-checks');
-  let zeroChecks = process.argv.find(x => x.startsWith('-funsafe-zero-proto-checks='));
-  if (zeroChecks) zeroChecks = zeroChecks.split('=')[1].split(',').reduce((acc, x) => { acc[x.toLowerCase()] = true; return acc; }, {});
+  const noUnlikelyChecks = Prefs.funsafeNoUnlikelyProtoChecks;
+
+  let zeroChecks;
+  if (Prefs.zeroChecks) zeroChecks = Prefs.zeroChecks.split('=')[1].split(',').reduce((acc, x) => { acc[x.toLowerCase()] = true; return acc; }, {});
     else zeroChecks = {};
 
-  this[TYPES._array] = {
+  this[TYPES.array] = {
     // lX = local accessor of X ({ get, set }), iX = local index of X, wX = wasm ops of X
     at: (pointer, length, wIndex, iTmp) => [
       ...wIndex,
@@ -148,7 +134,7 @@ export const PrototypeFuncs = function() {
     shift: (pointer, length) => [
       // if length == 0, noop
       ...length.getCachedI32(),
-      Opcodes.i32_eqz,
+      [ Opcodes.i32_eqz ],
       [ Opcodes.if, Blocktype.void ],
       ...number(UNDEFINED),
       [ Opcodes.br, 1 ],
@@ -267,10 +253,10 @@ export const PrototypeFuncs = function() {
     ]
   };
 
-  this[TYPES._array].at.local = Valtype.i32;
-  this[TYPES._array].push.noArgRetLength = true;
-  this[TYPES._array].fill.local = valtypeBinary;
-  this[TYPES._array].fill.returnType = TYPES._array;
+  this[TYPES.array].at.local = Valtype.i32;
+  this[TYPES.array].push.noArgRetLength = true;
+  this[TYPES.array].fill.local = valtypeBinary;
+  this[TYPES.array].fill.returnType = TYPES.array;
 
   this[TYPES.string] = {
     at: (pointer, length, wIndex, iTmp, _, arrayShell) => {
@@ -342,8 +328,8 @@ export const PrototypeFuncs = function() {
         ...number(0, Valtype.i32), // base 0 for store later
 
         ...wIndex,
-
         Opcodes.i32_to,
+
         ...number(ValtypeSize.i16, Valtype.i32),
         [ Opcodes.i32_mul ],
 
@@ -383,7 +369,7 @@ export const PrototypeFuncs = function() {
 
           ...(noUnlikelyChecks ? [] : [ [ Opcodes.i32_or ] ]),
           [ Opcodes.if, Blocktype.void ],
-          ...number(NaN),
+          ...number(valtype === 'i32' ? -1 : NaN),
           [ Opcodes.br, 1 ],
           [ Opcodes.end ],
 
@@ -489,10 +475,10 @@ export const PrototypeFuncs = function() {
   this[TYPES.string].isWellFormed.local2 = Valtype.i32;
   this[TYPES.string].isWellFormed.returnType = TYPES.boolean;
 
-  if (process.argv.includes('-bytestring')) {
-    this[TYPES._bytestring] = {
+  if (Prefs.bytestring) {
+    this[TYPES.bytestring] = {
       at: (pointer, length, wIndex, iTmp, _, arrayShell) => {
-        const [ newOut, newPointer ] = arrayShell(1, 'i16');
+        const [ newOut, newPointer ] = arrayShell(1, 'i8');
 
         return [
           // setup new/out array
@@ -548,7 +534,7 @@ export const PrototypeFuncs = function() {
 
       // todo: out of bounds properly
       charAt: (pointer, length, wIndex, _1, _2, arrayShell) => {
-        const [ newOut, newPointer ] = arrayShell(1, 'i16');
+        const [ newOut, newPointer ] = arrayShell(1, 'i8');
 
         return [
           // setup new/out array
@@ -558,7 +544,6 @@ export const PrototypeFuncs = function() {
           ...number(0, Valtype.i32), // base 0 for store later
 
           ...wIndex,
-
           Opcodes.i32_to,
 
           ...pointer,
@@ -597,7 +582,7 @@ export const PrototypeFuncs = function() {
 
             ...(noUnlikelyChecks ? [] : [ [ Opcodes.i32_or ] ]),
             [ Opcodes.if, Blocktype.void ],
-            ...number(NaN),
+            ...number(valtype === 'i32' ? -1 : NaN),
             [ Opcodes.br, 1 ],
             [ Opcodes.end ],
 
@@ -621,14 +606,14 @@ export const PrototypeFuncs = function() {
       }
     };
 
-    this[TYPES._bytestring].at.local = Valtype.i32;
-    this[TYPES._bytestring].at.returnType = TYPES._bytestring;
-    this[TYPES._bytestring].charAt.returnType = TYPES._bytestring;
-    this[TYPES._bytestring].charCodeAt.local = Valtype.i32;
-    this[TYPES._bytestring].charCodeAt.noPointerCache = zeroChecks.charcodeat;
+    this[TYPES.bytestring].at.local = Valtype.i32;
+    this[TYPES.bytestring].at.returnType = TYPES.bytestring;
+    this[TYPES.bytestring].charAt.returnType = TYPES.bytestring;
+    this[TYPES.bytestring].charCodeAt.local = Valtype.i32;
+    this[TYPES.bytestring].charCodeAt.noPointerCache = zeroChecks.charcodeat;
 
-    this[TYPES._bytestring].isWellFormed.local = Valtype.i32;
-    this[TYPES._bytestring].isWellFormed.local2 = Valtype.i32;
-    this[TYPES._bytestring].isWellFormed.returnType = TYPES.boolean;
+    this[TYPES.bytestring].isWellFormed.local = Valtype.i32;
+    this[TYPES.bytestring].isWellFormed.local2 = Valtype.i32;
+    this[TYPES.bytestring].isWellFormed.returnType = TYPES.boolean;
   }
 };

package/compiler/types.js

@@ -0,0 +1,38 @@
+export const TYPES = {
+  number: 0x00,
+  boolean: 0x01,
+  string: 0x02,
+  undefined: 0x03,
+  object: 0x04,
+  function: 0x05,
+  symbol: 0x06,
+  bigint: 0x07
+};
+
+export const TYPE_NAMES = {
+  [TYPES.number]: 'Number',
+  [TYPES.boolean]: 'Boolean',
+  [TYPES.string]: 'String',
+  [TYPES.undefined]: 'undefined',
+  [TYPES.object]: 'Object',
+  [TYPES.function]: 'Function',
+  [TYPES.symbol]: 'Symbol',
+  [TYPES.bigint]: 'BigInt'
+};
+
+export const INTERNAL_TYPE_BASE = 0x10;
+let internalTypeIndex = INTERNAL_TYPE_BASE;
+const registerInternalType = name => {
+  const n = internalTypeIndex++;
+  TYPES[name.toLowerCase()] = n;
+  TYPE_NAMES[n] = name;
+};
+
+// note: when adding a new internal type, please also add a deserializer to wrap.js
+// (it is okay to add a throw todo deserializer for wips)
+
+registerInternalType('Array');
+registerInternalType('RegExp');
+registerInternalType('ByteString');
+registerInternalType('Date');
+registerInternalType('Set');

package/compiler/wasmSpec.js

@@ -1,4 +1,13 @@
-import { enumify } from "../util/enum.js";
+const enumify = (...args) => {
+  const obj = {};
+
+  for (let i = 0; i < args.length; i++) {
+    obj[i] = args[i];
+    obj[args[i]] = i;
+  }
+
+  return obj;
+};
 
 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');
@@ -32,17 +41,16 @@ export const Opcodes = {
   throw: 0x08,
   rethrow: 0x09,
 
-  call: 0x10,
-  call_indirect: 0x11,
-  return_call: 0x12,
-  return_call_indirect: 0x13,
-
   end: 0x0b,
   br: 0x0c,
   br_if: 0x0d,
   br_table: 0x0e,
   return: 0x0f,
+
   call: 0x10,
+  call_indirect: 0x11,
+  return_call: 0x12,
+  return_call_indirect: 0x13,
 
   drop: 0x1a,
 
@@ -62,13 +70,22 @@ export const Opcodes = {
   i32_load16_s: 0x2e,
   i32_load16_u: 0x2f,
 
-  i32_store8: 0x3a,
-  i32_store16: 0x3b,
+  i64_load8_s: 0x30,
+  i64_load8_u: 0x31,
+  i64_load16_s: 0x32,
+  i64_load16_u: 0x33,
 
   i32_store: 0x36,
   i64_store: 0x37,
   f64_store: 0x39,
 
+  i32_store8: 0x3a,
+  i32_store16: 0x3b,
+
+  i64_store8: 0x3c,
+  i64_store16: 0x3d,
+
+  memory_size: 0x3f,
   memory_grow: 0x40,
 
   i32_const: 0x41,
@@ -100,6 +117,8 @@ export const Opcodes = {
   i32_shl: 0x74,
   i32_shr_s: 0x75,
   i32_shr_u: 0x76,
+  i32_rotl: 0x77,
+  i32_rotr: 0x78,
 
   i64_eqz: 0x50,
   i64_eq: 0x51,
@@ -123,6 +142,7 @@ export const Opcodes = {
   i64_shr_s: 0x87,
   i64_shr_u: 0x88,
   i64_rotl: 0x89,
+  i64_rotr: 0x8a,
 
   f64_eq: 0x61,
   f64_ne: 0x62,

package/compiler/wrap.js

@@ -1,50 +1,45 @@
 import compile from './index.js';
 import decompile from './decompile.js';
 import { encodeVector, encodeLocal } from './encoding.js';
-// import fs from 'node:fs';
+import Prefs from './prefs.js';
+import { log } from './log.js';
+import { TYPES } from './types.js';
 
 const bold = x => `\u001b[1m${x}\u001b[0m`;
 
-const typeBase = 0x00;
-const internalTypeBase = 0x10;
-const TYPES = {
-  [typeBase]: 'number',
-  [typeBase + 1]: 'boolean',
-  [typeBase + 2]: 'string',
-  [typeBase + 3]: 'undefined',
-  [typeBase + 4]: 'object',
-  [typeBase + 5]: 'function',
-  [typeBase + 6]: 'symbol',
-  [typeBase + 7]: 'bigint',
-
-  // internal
-  [internalTypeBase]: '_array',
-  [internalTypeBase + 1]: '_regexp',
-  [internalTypeBase + 2]: '_bytestring'
-};
-
 export default async (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);
 
+  globalThis.porfDebugInfo = { funcs, globals };
+
   if (source.includes('export function')) flags.push('module');
 
-  // fs.writeFileSync('out.wasm', Buffer.from(wasm));
+  // (await import('node:fs')).writeFileSync('out.wasm', Buffer.from(wasm));
 
   times.push(performance.now() - t1);
-  if (flags.includes('info')) console.log(bold(`compiled in ${times[0].toFixed(2)}ms`));
+  if (Prefs.profileCompiler) console.log(bold(`compiled in ${times[0].toFixed(2)}ms`));
 
   const t2 = performance.now();
 
   let instance;
   try {
-    0, { instance } = await WebAssembly.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, {
       '': {
         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)),
-        t: _ => performance.now(),
+        t: () => performance.now(),
+        u: () => performance.timeOrigin,
+        y: () => {},
+        z: () => {},
         ...customImports
       }
     });
@@ -52,8 +47,10 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
     // only backtrace for runner, not test262/etc
     if (!process.argv[1].includes('/runner')) throw e;
 
-    const funcInd = parseInt(e.message.match(/function #([0-9]+) /)[1]);
-    const blobOffset = parseInt(e.message.split('@')[1]);
+    const funcInd = parseInt(e.message.match(/function #([0-9]+) /)?.[1]);
+    const blobOffset = parseInt(e.message.split('@')?.[1]);
+
+    if (!funcInd) throw e;
 
     // convert blob offset -> function wasm offset.
     // this is not good code and is somewhat duplicated
@@ -131,7 +128,7 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
   }
 
   times.push(performance.now() - t2);
-  if (flags.includes('info')) console.log(`instantiated in ${times[1].toFixed(2)}ms`);
+  if (Prefs.profileCompiler) console.log(`instantiated in ${times[1].toFixed(2)}ms`);
 
   const exports = {};
 
@@ -159,42 +156,50 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
 
         // if (ret >= typeBase && ret <= typeBase + 8) return ret > (typeBase + 7) ? 'object' : TYPES[ret];
 
-        switch (TYPES[type]) {
-          case 'boolean': return Boolean(ret);
-          case 'undefined': return undefined;
-          case 'object': return ret === 0 ? null : {};
+        switch (type) {
+          case TYPES.boolean: return Boolean(ret);
+          case TYPES.undefined: return undefined;
+          case TYPES.object: return ret === 0 ? null : {};
 
-          case '_array': {
+          case TYPES.string: {
             const pointer = ret;
-            const length = new Int32Array(memory.buffer, pointer, 1);
+            const length = (new Int32Array(memory.buffer, pointer, 1))[0];
 
-            // have to slice because of memory alignment
-            const buf = memory.buffer.slice(pointer + 4, pointer + 4 + 8 * length);
+            return Array.from(new Uint16Array(memory.buffer, pointer + 4, length)).map(x => String.fromCharCode(x)).join('');
+          }
 
-            return Array.from(new Float64Array(buf));
+          case TYPES.function: {
+            // wasm func index, including all imports
+            const func = funcs.find(x => (x.originalIndex ?? x.index) === ret);
+            // if (!func) return ret;
+            if (!func) return function () {};
+
+            // make fake empty func for repl/etc
+            return {[func.name]() {}}[func.name];
           }
 
-          case 'string': {
+          case TYPES.array: {
             const pointer = ret;
-            const length = new Int32Array(memory.buffer, pointer, 1);
+            const length = (new Int32Array(memory.buffer, pointer, 1))[0];
 
-            return Array.from(new Uint16Array(memory.buffer, pointer + 4, length)).map(x => String.fromCharCode(x)).join('');
+            // have to slice because of memory alignment
+            const buf = memory.buffer.slice(pointer + 4, pointer + 4 + 8 * length);
+
+            return Array.from(new Float64Array(buf));
           }
 
-          case '_bytestring': {
+          case TYPES.bytestring: {
             const pointer = ret;
-            const length = new Int32Array(memory.buffer, pointer, 1);
+            const length = (new Int32Array(memory.buffer, pointer, 1))[0];
 
             return Array.from(new Uint8Array(memory.buffer, pointer + 4, length)).map(x => String.fromCharCode(x)).join('');
           }
 
-          case 'function': {
-            // wasm func index, including all imports
-            const func = funcs.find(x => (x.originalIndex ?? x.index) === ret);
-            if (!func) return ret;
+          case TYPES.date: {
+            const pointer = ret;
+            const value = (new Float64Array(memory.buffer, pointer, 1))[0];
 
-            // make fake empty func for repl/etc
-            return {[func.name]() {}}[func.name];
+            return new Date(value);
           }
 
           default: return ret;

package/package.json

@@ -1,21 +1,25 @@
 {
   "name": "porffor",
   "description": "a basic experimental wip aot optimizing js -> wasm engine/compiler/runtime in js",
-  "version": "0.2.0-fde989a",
+  "version": "0.2.0-fdf0fc5",
   "author": "CanadaHonk",
   "license": "MIT",
+  "scripts": {
+    "precompile": "node ./compiler/precompile.js"
+  },
   "dependencies": {
-    "acorn": "^8.9.0"
+    "acorn": "^8.11.3",
+    "node-repl-polyfill": "^0.1.1"
   },
   "optionalDependencies": {
-    "@babel/parser": "^7.23.6",
+    "@babel/parser": "^7.24.4",
     "hermes-parser": "^0.18.2",
     "meriyah": "^4.3.9"
   },
   "bin": {
     "porf": "./runner/index.js"
   },
-  "main": "./runner/index.js",
+  "main": "./compiler/wrap.js",
   "type": "module",
   "repository": {
     "type": "git",
@@ -25,4 +29,4 @@
     "url": "https://github.com/CanadaHonk/porffor/issues"
   },
   "homepage": "https://porffor.goose.icu"
-}
+}

package/porf

@@ -1,2 +1,4 @@
 #!/bin/sh
 node runner/index.js "$@"
+# deno run -A runner/index.js "$@"
+# bun runner/index.js "$@"

package/rhemyn/compile.js

@@ -1,7 +1,8 @@
-import { Blocktype, Opcodes, Valtype, PageSize, ValtypeSize } from '../compiler/wasmSpec.js';
+import { Blocktype, Opcodes, Valtype, ValtypeSize } from '../compiler/wasmSpec.js';
 import { number } from '../compiler/embedding.js';
-import { signedLEB128, unsignedLEB128 } from '../compiler/encoding.js';
 import parse from './parse.js';
+import Prefs from '../compiler/prefs.js';
+import { TYPES } from '../compiler/types.js';
 
 // local indexes
 const BasePointer = 0; // base string pointer
@@ -13,7 +14,7 @@ const Length = 5;
 const Tmp = 6;
 
 let exprLastGet = false;
-const generate = (node, negated = false, get = true, func = 'test') => {
+const generate = (node, negated = false, get = true, stringSize = 2, func = 'test') => {
   let out = [];
   switch (node.type) {
     case 'Expression':
@@ -41,7 +42,7 @@ const generate = (node, negated = false, get = true, func = 'test') => {
         // generate checks
         ...node.body.flatMap((x, i) => {
           exprLastGet = x.type !== 'Group' && i === (node.body.length - 1);
-          return generate(x, negated);
+          return generate(x, negated, true, stringSize, func);
         }),
 
         // reached end without branching out, successful match
@@ -55,9 +56,9 @@ const generate = (node, negated = false, get = true, func = 'test') => {
 
         [ Opcodes.end ],
 
-        // increment iter pointer by sizeof i16
+        // increment iter pointer by string size
         [ Opcodes.local_get, IterPointer ],
-        ...number(ValtypeSize.i16, Valtype.i32),
+        ...number(stringSize, Valtype.i32),
         [ Opcodes.i32_add ],
         [ Opcodes.local_set, IterPointer ],
 
@@ -80,7 +81,7 @@ const generate = (node, negated = false, get = true, func = 'test') => {
         })[func], Valtype.i32)
       ];
 
-      if (globalThis.regexLog) {
+      if (Prefs.regexLog) {
         const underline = x => `\u001b[4m\u001b[1m${x}\u001b[0m`;
         console.log(`\n${underline('ast')}`);
         console.log(node);
@@ -90,34 +91,34 @@ const generate = (node, negated = false, get = true, func = 'test') => {
       break;
 
     case 'Character':
-      out = generateChar(node, node.negated ^ negated, get);
+      out = generateChar(node, node.negated ^ negated, get, stringSize);
       break;
 
     case 'Set':
-      out = generateSet(node, node.negated, get);
+      out = generateSet(node, node.negated, get, stringSize);
       break;
 
     case 'Group':
-      out = generateGroup(node, negated, get);
+      out = generateGroup(node, negated, get, stringSize);
       break;
 
     case 'Range':
-      out = generateRange(node, negated, get);
+      out = generateRange(node, negated, get, stringSize);
       break;
   }
 
   return out;
 };
 
-const getNextChar = () => [
+const getNextChar = (stringSize) => [
   // get char from pointer
   [ Opcodes.local_get, Pointer ],
-  [ Opcodes.i32_load16_u, Math.log2(ValtypeSize.i16) - 1, ...unsignedLEB128(0) ],
+  [ stringSize == 2 ? Opcodes.i32_load16_u : Opcodes.i32_load8_u, 0, 0 ],
 
   ...(exprLastGet ? [] : [
-    // pointer += sizeof i16
+    // pointer += string size
     [ Opcodes.local_get, Pointer ],
-    ...number(ValtypeSize.i16, Valtype.i32),
+    ...number(stringSize, Valtype.i32),
     [ Opcodes.i32_add ],
     [ Opcodes.local_set, Pointer ]
   ])
@@ -133,21 +134,21 @@ const checkFailure = () => [
   [ Opcodes.br_if, 0 ]
 ];
 
-const generateChar = (node, negated, get) => {
+const generateChar = (node, negated, get, stringSize) => {
   return [
-    ...(get ? getNextChar() : []),
+    ...(get ? getNextChar(stringSize) : []),
     ...number(node.char.charCodeAt(0), Valtype.i32),
     negated ? [ Opcodes.i32_eq ] : [ Opcodes.i32_ne ],
     ...(get ? checkFailure(): [])
   ];
 };
 
-const generateSet = (node, negated, get) => {
+const generateSet = (node, negated, get, stringSize) => {
   // for a single char we do not need a tmp, it is like just
   const singleChar = node.body.length === 1 && node.body[0].type === 'Character';
 
   let out = [
-    ...(get ? getNextChar() : []),
+    ...(get ? getNextChar(stringSize) : []),
     ...(singleChar ? [] : [ [ Opcodes.local_set, Tmp ] ]),
   ];
 
@@ -155,11 +156,11 @@ const generateSet = (node, negated, get) => {
     out = [
       ...out,
       ...(singleChar ? [] : [ [ Opcodes.local_get, Tmp ] ]),
-      ...generate(x, negated, false)
+      ...generate(x, negated, false, stringSize)
     ];
   }
 
-  out = out.concat(new Array(node.body.length - 1).fill(negated ? [ Opcodes.i32_or ] : [ Opcodes.i32_and ]));
+  if (node.body.length > 0) out = out.concat(new Array(node.body.length - 1).fill(negated ? [ Opcodes.i32_or ] : [ Opcodes.i32_and ]));
 
   return [
     ...out,
@@ -167,9 +168,9 @@ const generateSet = (node, negated, get) => {
   ];
 };
 
-const generateRange = (node, negated, get) => {
+const generateRange = (node, negated, get, stringSize) => {
   return [
-    ...(get ? getNextChar() : []),
+    ...(get ? getNextChar(stringSize) : []),
     ...(get ? [ [ Opcodes.local_tee, Tmp ] ] : []),
 
     ...number(node.from.charCodeAt(0), Valtype.i32),
@@ -187,11 +188,29 @@ const generateRange = (node, negated, get) => {
 };
 
 const generateGroup = (node, negated, get) => {
+  // todo
+  return [];
+};
 
+const wrapFunc = (regex, func, name, index) => {
+  const parsed = parse(regex);
+
+  return outputFunc([
+    [ Opcodes.local_get, 1 ],
+    ...number(TYPES.string, Valtype.i32),
+    [ Opcodes.i32_eq ],
+    [ Opcodes.if, Valtype.i32 ],
+    // string
+    ...generate(parsed, false, true, 2, func),
+    [ Opcodes.else ],
+    // bytestring
+    ...generate(parsed, false, true, 1, func),
+    [ Opcodes.end ]
+  ], name, index);
 };
 
-export const test = (regex, index = 0, name = 'regex_test_' + regex) => outputFunc(generate(parse(regex), false, true, 'test'), name, index);
-export const search = (regex, index = 0, name = 'regex_search_' + regex) => outputFunc(generate(parse(regex), false, true, 'search'), name, index);
+export const test = (regex, index = 0, name = 'regex_test_' + regex) => wrapFunc(regex, 'test', name, index);
+export const search = (regex, index = 0, name = 'regex_search_' + regex) => wrapFunc(regex, 'search', name, index);
 
 const outputFunc = (wasm, name, index) => ({
   name,
@@ -199,9 +218,9 @@ const outputFunc = (wasm, name, index) => ({
   wasm,
 
   export: true,
-  params: [ Valtype.i32 ],
+  params: [ Valtype.i32, Valtype.i32 ],
   returns: [ Valtype.i32 ],
-  returnType: 0xffffffffffff1, // boolean - todo: do not hardcode this
+  returnType: TYPES.boolean,
   locals: {
     basePointer: { idx: 0, type: Valtype.i32 },
     iterPointer: { idx: 1, type: Valtype.i32 },