porffor 0.17.0-30b9c5fa5 → 0.17.0-3c2d70d66

package/compiler/opt.js

@@ -203,6 +203,9 @@ export default (funcs, globals, pages, tags, exceptions) => {
           if (type === 'Array') missing = !pages.hasArray;
           if (type === 'String') missing = !pages.hasString;
           if (type === 'ByteString') missing = !pages.hasByteString;
+          if (['Set', 'Uint8Array', 'Int8Array', 'Uint8ClampedArray', 'Uint16Array', 'Int16Array', 'Uint32Array', 'Int32Array', 'Float32Array', 'Float64Array'].includes(type)) {
+            missing = funcs.find(x => x.name === type) == null;
+          }
 
           if (missing) {
             let j = i, depth = 0;

package/compiler/precompile.js

@@ -6,6 +6,8 @@ import { join } from 'node:path';
 
 import { fileURLToPath } from 'node:url';
 const __dirname = fileURLToPath(new URL('.', import.meta.url));
+globalThis.precompileCompilerPath = __dirname;
+globalThis.precompile = true;
 
 const argv = process.argv.slice();
 
@@ -14,7 +16,7 @@ const compile = async (file, [ _funcs, _globals ]) => {
   let first = source.slice(0, source.indexOf('\n'));
 
   if (first.startsWith('export default')) {
-    source = (await import(file)).default();
+    source = await (await import(file)).default();
     first = source.slice(0, source.indexOf('\n'));
   }
 
@@ -117,7 +119,7 @@ ${funcs.map(x => {
     locals: ${JSON.stringify(Object.values(x.locals).slice(x.params.length).map(x => x.type))},
     localNames: ${JSON.stringify(Object.keys(x.locals))},
 ${x.data && x.data.length > 0 ? `    data: ${JSON.stringify(x.data)},` : ''}
-${x.table ? `    table: true` : ''}
+${x.table ? `    table: true,` : ''}${x.constr ? `    constr: true,` : ''}
   };`.replaceAll('\n\n', '\n').replaceAll('\n\n', '\n').replaceAll('\n\n', '\n');
 }).join('\n')}
 };`;

package/compiler/prototype.js

@@ -208,72 +208,6 @@ export const PrototypeFuncs = function() {
       //   ...number(1, Valtype.i32),
       //   [ Opcodes.i32_sub ]
       // ]),
-    ],
-
-    fill: (pointer, length, wElement, wType, iTmp, iTmp2) => [
-      ...wElement,
-      [ Opcodes.local_set, iTmp ],
-
-      // use cached length i32 as pointer
-      ...length.getCachedI32(),
-
-      // length - 1 for indexes
-      ...number(1, Valtype.i32),
-      [ Opcodes.i32_sub ],
-
-      // * sizeof value
-      ...number(ValtypeSize[valtype] + 1, Valtype.i32),
-      [ Opcodes.i32_mul ],
-
-      ...length.setCachedI32(),
-
-      ...(noUnlikelyChecks ? [] : [
-        ...length.getCachedI32(),
-        ...number(0, Valtype.i32),
-        [ Opcodes.i32_lt_s ],
-        [ Opcodes.if, Blocktype.void ],
-        ...pointer,
-        Opcodes.i32_from_u,
-        [ Opcodes.br, 1 ],
-        [ Opcodes.end ]
-      ]),
-
-      [ Opcodes.loop, Blocktype.void ],
-
-      // calculate offset
-      ...length.getCachedI32(),
-      ...pointer,
-      [ Opcodes.i32_add ],
-      [ Opcodes.local_set, iTmp2 ],
-
-      // store value
-      [ Opcodes.local_get, iTmp2 ],
-      [ Opcodes.local_get, iTmp ],
-      [ Opcodes.store, 0, ValtypeSize.i32 ],
-
-      // store type
-      [ Opcodes.local_get, iTmp2 ],
-      ...wType,
-      [ Opcodes.i32_store8, 0, ValtypeSize.i32 + ValtypeSize[valtype] ],
-
-      // pointer - sizeof value
-      ...length.getCachedI32(),
-      ...number(ValtypeSize[valtype] + 1, Valtype.i32),
-      [ Opcodes.i32_sub ],
-
-      ...length.setCachedI32(),
-
-      // if pointer >= 0, loop
-      ...length.getCachedI32(),
-      ...number(0, Valtype.i32),
-      [ Opcodes.i32_ge_s ],
-      [ Opcodes.br_if, 0 ],
-
-      [ Opcodes.end ],
-
-      // return this array
-      ...pointer,
-      Opcodes.i32_from_u,
     ]
   };
 
@@ -282,9 +216,6 @@ export const PrototypeFuncs = function() {
   this[TYPES.array].push.noArgRetLength = true;
   this[TYPES.array].push.local = Valtype.i32;
   this[TYPES.array].pop.local = Valtype.i32;
-  this[TYPES.array].fill.local = valtypeBinary;
-  this[TYPES.array].fill.local2 = Valtype.i32;
-  this[TYPES.array].fill.returnType = TYPES.array;
 
   this[TYPES.string] = {
     at: (pointer, length, wIndex, wType, iTmp, _, arrayShell) => {

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.17.0-30b9c5fa5",
+  "version": "0.17.0-3c2d70d66",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {},

package/rhemyn/compile.js

@@ -12,15 +12,36 @@ const Length = 4;
 const Tmp = 5;
 const QuantifierTmp = 6; // the temporary variable used for quanitifers
 
+const doesSucceedZero = (node) => {
+  for (const n of node.body) {
+    if (n.type === "Group") {
+      if (!doesSucceedZero(node)) return false;
+    }
+    if (!n.quantifier || n.quantifier[0] > 0) {
+      return false;
+    }
+  }
+  return true;
+}
+
 const generate = (node, negated = false, get = true, stringSize = 2, func = 'test') => {
   let out = [];
   switch (node.type) {
     case 'Expression':
+      let succeedsZero = doesSucceedZero(node);
+
       out = [
         // set length local
         [ Opcodes.local_get, BasePointer ],
         [ Opcodes.i32_load, Math.log2(ValtypeSize.i32) - 1, 0 ],
-        [ Opcodes.local_set, Length ],
+        [ Opcodes.local_tee, Length ],
+
+        ...number(0, Valtype.i32),
+        [ Opcodes.i32_eq ],
+        [ Opcodes.if, Blocktype.void ],
+          ...number(succeedsZero ? 1 : 0, Valtype.i32),
+          [ Opcodes.return ],
+        [ Opcodes.end ],
 
         // pointer = base + sizeof i32
         [ Opcodes.local_get, BasePointer ],
@@ -43,14 +64,15 @@ const generate = (node, negated = false, get = true, stringSize = 2, func = 'tes
             [ Opcodes.return ],
           [ Opcodes.end ],
 
-          // increment counter by 1, check if eq length, if not loop
+          // counter++, if length > counter, loop
+          [ Opcodes.local_get, Length ],
+
           [ Opcodes.local_get, Counter ],
           ...number(1, Valtype.i32),
           [ Opcodes.i32_add ],
           [ Opcodes.local_tee, Counter ],
 
-          [ Opcodes.local_get, Length ],
-          [ Opcodes.i32_ne ],
+          [ Opcodes.i32_gt_s ],
 
           [ Opcodes.br_if, 0 ],
         [ Opcodes.end ],
@@ -122,6 +144,18 @@ const wrapQuantifier = (node, method, get, stringSize) => {
     ...number(0, Valtype.i32),
     [Opcodes.local_set, QuantifierTmp],
 
+    // if len - counter == 0, if min == 0, succeed, else fail
+    [ Opcodes.local_get, Length ],
+    [ Opcodes.local_get, Counter ],
+    [ Opcodes.i32_sub ],
+    ...number(0, Valtype.i32),
+    [ Opcodes.i32_eq ],
+    ...(min == 0 ? [
+      [ Opcodes.if, Blocktype.void ],
+    ] : [
+      [ Opcodes.br_if, 0 ],
+    ]),
+
     // start loop
     [Opcodes.loop, Blocktype.void],
       [ Opcodes.block, Blocktype.void ],
@@ -166,13 +200,7 @@ const wrapQuantifier = (node, method, get, stringSize) => {
     [Opcodes.i32_lt_s],
     ...(get ? checkFailure(): []),
 
-    // counter += tmp - 1
-    [ Opcodes.local_get, QuantifierTmp ],
-    ...number(1, Valtype.i32),
-    [ Opcodes.i32_sub ],
-    [ Opcodes.local_get, Counter ],
-    [ Opcodes.i32_add ],
-    [ Opcodes.local_set, Counter ]
+    ...(min == 0 ? [ [ Opcodes.end ] ] : []),
   ];
 }
 
@@ -190,7 +218,7 @@ const generateChar = (node, negated, get, stringSize) => {
 
   return [
     ...out,
-    ...(get ? checkFailure(): [])
+    ...(get ? checkFailure(): []),
   ];
 };
 
@@ -225,7 +253,7 @@ const generateSet = (node, negated, get, stringSize) => {
 
   return [
     ...out,
-    ...checkFailure()
+    ...checkFailure(),
   ];
 };
 
@@ -267,21 +295,26 @@ const wrapFunc = (regex, func, name, index) => {
     // bytestring
     ...generate(parsed, false, true, 1, func),
     [ Opcodes.end ]
-  ], name, index);
+  ], name, index, types[func]);
 };
 
 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) => ({
+export const types = {
+  test: TYPES.boolean,
+  search: TYPES.number
+};
+
+const outputFunc = (wasm, name, index, returnType) => ({
   name,
   index,
   wasm,
+  returnType,
 
   export: true,
   params: [ Valtype.i32, Valtype.i32 ],
   returns: [ Valtype.i32 ],
-  returnType: TYPES.boolean,
   locals: {
     basePointer: { idx: 0, type: Valtype.i32 },
     inputType: { idx: 1, type: Valtype.i32 },