porffor 0.2.0-eeb45f8 → 0.2.0-f2bbe1f

package/README.md

@@ -215,7 +215,7 @@ Basically none right now (other than giving people headaches). Potential ideas:
 - More in future probably?
 
 ## Usage
-Basically nothing will work :). See files in `test` and `bench` for examples.
+Basically nothing will work :). See files in `test` for examples.
 
 1. Clone repo
 2. `npm install`

package/compiler/codeGen.js

@@ -55,7 +55,7 @@ const todo = msg => {
 };
 
 const isFuncType = type => type === 'FunctionDeclaration' || type === 'FunctionExpression' || type === 'ArrowFunctionExpression';
-const generate = (scope, decl, global = false, name = undefined, valueUnused = false) => {
+const generate = (scope, decl, global = false, name = undefined) => {
   switch (decl.type) {
     case 'BinaryExpression':
       return generateBinaryExp(scope, decl, global, name);
@@ -86,7 +86,7 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
       return generateExp(scope, decl);
 
     case 'CallExpression':
-      return generateCall(scope, decl, global, name, valueUnused);
+      return generateCall(scope, decl, global, name);
 
     case 'NewExpression':
       return generateNew(scope, decl, global, name);
@@ -685,15 +685,6 @@ const truthy = (scope, wasm, type, intIn = false, intOut = false) => {
         [ Opcodes.i32_eqz ], */
         ...(intOut ? [] : [ Opcodes.i32_from_u ])
       ],
-      [TYPES._bytestring]: [ // duplicate of string
-        [ Opcodes.local_get, tmp ],
-        ...(intIn ? [] : [ Opcodes.i32_to_u ]),
-
-        // get length
-        [ Opcodes.i32_load, Math.log2(ValtypeSize.i32) - 1, 0 ],
-
-        ...(intOut ? [] : [ Opcodes.i32_from_u ])
-      ],
       default: def
     }, intOut ? Valtype.i32 : valtypeBinary)
   ];
@@ -721,17 +712,6 @@ const falsy = (scope, wasm, type, intIn = false, intOut = false) => {
         [ Opcodes.i32_eqz ],
         ...(intOut ? [] : [ Opcodes.i32_from_u ])
       ],
-      [TYPES._bytestring]: [ // duplicate of string
-        [ Opcodes.local_get, tmp ],
-        ...(intIn ? [] : [ Opcodes.i32_to_u ]),
-
-        // get length
-        [ Opcodes.i32_load, Math.log2(ValtypeSize.i32) - 1, 0 ],
-
-        // if length == 0
-        [ Opcodes.i32_eqz ],
-        ...(intOut ? [] : [ Opcodes.i32_from_u ])
-      ],
       default: [
         // if value == 0
         [ Opcodes.local_get, tmp ],
@@ -1064,8 +1044,7 @@ const TYPES = {
 
   // these are not "typeof" types but tracked internally
   _array: 0x10,
-  _regexp: 0x11,
-  _bytestring: 0x12
+  _regexp: 0x11
 };
 
 const TYPE_NAMES = {
@@ -1079,8 +1058,7 @@ const TYPE_NAMES = {
   [TYPES.bigint]: 'BigInt',
 
   [TYPES._array]: 'Array',
-  [TYPES._regexp]: 'RegExp',
-  [TYPES._bytestring]: 'ByteString'
+  [TYPES._regexp]: 'RegExp'
 };
 
 const getType = (scope, _name) => {
@@ -1133,8 +1111,6 @@ const getNodeType = (scope, node) => {
     if (node.type === 'Literal') {
       if (node.regex) return TYPES._regexp;
 
-      if (typeof node.value === 'string' && byteStringable(node.value)) return TYPES._bytestring;
-
       return TYPES[typeof node.value];
     }
 
@@ -1148,15 +1124,6 @@ const getNodeType = (scope, node) => {
 
     if (node.type === 'CallExpression' || node.type === 'NewExpression') {
       const name = node.callee.name;
-      if (!name) {
-        // iife
-        if (scope.locals['#last_type']) return [ getLastType(scope) ];
-
-        // presume
-        // todo: warn here?
-        return TYPES.number;
-      }
-
       const func = funcs.find(x => x.name === name);
 
       if (func) {
@@ -1251,7 +1218,7 @@ const getNodeType = (scope, node) => {
       if (node.operator === '!') return TYPES.boolean;
       if (node.operator === 'void') return TYPES.undefined;
       if (node.operator === 'delete') return TYPES.boolean;
-      if (node.operator === 'typeof') return process.argv.includes('-bytestring') ? TYPES._bytestring : TYPES.string;
+      if (node.operator === 'typeof') return TYPES.string;
 
       return TYPES.number;
     }
@@ -1260,9 +1227,7 @@ const getNodeType = (scope, node) => {
       // hack: if something.length, number type
       if (node.property.name === 'length') return TYPES.number;
 
-      if (scope.locals['#last_type']) return [ getLastType(scope) ];
-
-      // presume
+      // we cannot guess
       return TYPES.number;
     }
 
@@ -1334,9 +1299,9 @@ const countLeftover = wasm => {
 
     if (depth === 0)
       if ([Opcodes.throw,Opcodes.drop, Opcodes.local_set, Opcodes.global_set].includes(inst[0])) count--;
-        else if ([null, Opcodes.i32_eqz, Opcodes.i64_eqz, Opcodes.f64_ceil, Opcodes.f64_floor, Opcodes.f64_trunc, Opcodes.f64_nearest, Opcodes.f64_sqrt, Opcodes.local_tee, Opcodes.i32_wrap_i64, Opcodes.i64_extend_i32_s, Opcodes.i64_extend_i32_u, Opcodes.f32_demote_f64, Opcodes.f64_promote_f32, Opcodes.f64_convert_i32_s, Opcodes.f64_convert_i32_u, Opcodes.i32_clz, Opcodes.i32_ctz, Opcodes.i32_popcnt, Opcodes.f64_neg, Opcodes.end, Opcodes.i32_trunc_sat_f64_s[0], Opcodes.i32x4_extract_lane, Opcodes.i16x8_extract_lane, Opcodes.i32_load, Opcodes.i64_load, Opcodes.f64_load, Opcodes.v128_load, Opcodes.i32_load16_u, Opcodes.i32_load16_s, Opcodes.i32_load8_u, Opcodes.i32_load8_s, Opcodes.memory_grow].includes(inst[0]) && (inst[0] !== 0xfc || inst[1] < 0x0a)) {}
+        else if ([null, Opcodes.i32_eqz, Opcodes.i64_eqz, Opcodes.f64_ceil, Opcodes.f64_floor, Opcodes.f64_trunc, Opcodes.f64_nearest, Opcodes.f64_sqrt, Opcodes.local_tee, Opcodes.i32_wrap_i64, Opcodes.i64_extend_i32_s, Opcodes.i64_extend_i32_u, Opcodes.f32_demote_f64, Opcodes.f64_promote_f32, Opcodes.f64_convert_i32_s, Opcodes.f64_convert_i32_u, Opcodes.i32_clz, Opcodes.i32_ctz, Opcodes.i32_popcnt, Opcodes.f64_neg, Opcodes.end, Opcodes.i32_trunc_sat_f64_s[0], Opcodes.i32x4_extract_lane, Opcodes.i16x8_extract_lane, Opcodes.i32_load, Opcodes.i64_load, Opcodes.f64_load, Opcodes.v128_load, Opcodes.i32_load16_u, Opcodes.i32_load16_s, Opcodes.memory_grow].includes(inst[0]) && (inst[0] !== 0xfc || inst[1] < 0x0a)) {}
         else if ([Opcodes.local_get, Opcodes.global_get, Opcodes.f64_const, Opcodes.i32_const, Opcodes.i64_const, Opcodes.v128_const].includes(inst[0])) count++;
-        else if ([Opcodes.i32_store, Opcodes.i64_store, Opcodes.f64_store, Opcodes.i32_store16, Opcodes.i32_store8].includes(inst[0])) count -= 2;
+        else if ([Opcodes.i32_store, Opcodes.i64_store, Opcodes.f64_store, Opcodes.i32_store16].includes(inst[0])) count -= 2;
         else if (Opcodes.memory_copy[0] === inst[0] && Opcodes.memory_copy[1] === inst[1]) count -= 3;
         else if (inst[0] === Opcodes.return) count = 0;
         else if (inst[0] === Opcodes.call) {
@@ -1362,7 +1327,7 @@ const disposeLeftover = wasm => {
 const generateExp = (scope, decl) => {
   const expression = decl.expression;
 
-  const out = generate(scope, expression, undefined, undefined, true);
+  const out = generate(scope, expression);
   disposeLeftover(out);
 
   return out;
@@ -1420,7 +1385,7 @@ const RTArrayUtil = {
   ]
 };
 
-const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
+const generateCall = (scope, decl, _global, _name) => {
   /* const callee = decl.callee;
   const args = decl.arguments;
 
@@ -1539,18 +1504,10 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
       // use local for cached i32 length as commonly used
       const lengthLocal = localTmp(scope, '__proto_length_cache', Valtype.i32);
       const pointerLocal = localTmp(scope, '__proto_pointer_cache', Valtype.i32);
+      const getPointer = [ [ Opcodes.local_get, pointerLocal ] ];
 
       // TODO: long-term, prototypes should be their individual separate funcs
 
-      const rawPointer = [
-        ...generate(scope, target),
-        Opcodes.i32_to_u
-      ];
-
-      const usePointerCache = !Object.values(protoCands).every(x => x.noPointerCache === true);
-      const getPointer = usePointerCache ? [ [ Opcodes.local_get, pointerLocal ] ] : rawPointer;
-
-      let allOptUnused = true;
       let lengthI32CacheUsed = false;
       const protoBC = {};
       for (const x in protoCands) {
@@ -1570,7 +1527,6 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
         const protoLocal = protoFunc.local ? localTmp(scope, `__${protoName}_tmp`, protoFunc.local) : -1;
         const protoLocal2 = protoFunc.local2 ? localTmp(scope, `__${protoName}_tmp2`, protoFunc.local2) : -1;
 
-        let optUnused = false;
         const protoOut = protoFunc(getPointer, {
           getCachedI32: () => {
             lengthI32CacheUsed = true;
@@ -1585,15 +1541,10 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
           return makeArray(scope, {
             rawElements: new Array(length)
           }, _global, _name, true, itemType);
-        }, () => {
-          optUnused = true;
-          return unusedValue;
         });
 
-        if (!optUnused) allOptUnused = false;
-
         protoBC[x] = [
-          [ Opcodes.block, unusedValue && optUnused ? Blocktype.void : valtypeBinary ],
+          [ Opcodes.block, valtypeBinary ],
           ...protoOut,
 
           ...number(protoFunc.returnType ?? TYPES.number, Valtype.i32),
@@ -1602,13 +1553,11 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
         ];
       }
 
-      // todo: if some cands use optUnused and some don't, we will probably crash
-
       return [
-        ...(usePointerCache ? [
-          ...rawPointer,
-          [ Opcodes.local_set, pointerLocal ],
-        ] : []),
+        ...generate(scope, target),
+
+        Opcodes.i32_to_u,
+        [ Opcodes.local_set, pointerLocal ],
 
         ...(!lengthI32CacheUsed ? [] : [
           ...RTArrayUtil.getLengthI32(getPointer),
@@ -1620,7 +1569,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
 
           // TODO: error better
           default: internalThrow(scope, 'TypeError', `'${protoName}' proto func tried to be called on a type without an impl`)
-        }, allOptUnused && unusedValue ? Blocktype.void : valtypeBinary),
+        }, valtypeBinary),
       ];
     }
   }
@@ -1828,8 +1777,6 @@ const brTable = (input, bc, returns) => {
 };
 
 const typeSwitch = (scope, type, bc, returns = valtypeBinary) => {
-  if (!process.argv.includes('-bytestring')) delete bc[TYPES._bytestring];
-
   const known = knownType(scope, type);
   if (known != null) {
     return bc[known] ?? bc.default;
@@ -2220,8 +2167,6 @@ const generateUnary = (scope, decl) => {
         [TYPES.undefined]: makeString(scope, 'undefined', false, '#typeof_result'),
         [TYPES.function]: makeString(scope, 'function', false, '#typeof_result'),
 
-        [TYPES._bytestring]: makeString(scope, 'string', false, '#typeof_result'),
-
         // object and internal types
         default: makeString(scope, 'object', false, '#typeof_result'),
       });
@@ -2403,14 +2348,13 @@ const generateForOf = (scope, decl) => {
   // // todo: we should only do this for strings but we don't know at compile-time :(
   // hack: this is naughty and will break things!
   let newOut = number(0, Valtype.f64), newPointer = -1;
-  if (pages.hasAnyString) {
+  if (pages.hasString) {
     0, [ newOut, newPointer ] = makeArray(scope, {
       rawElements: new Array(1)
     }, isGlobal, leftName, true, 'i16');
   }
 
   // set type for local
-  // todo: optimize away counter and use end pointer
   out.push(...typeSwitch(scope, getNodeType(scope, decl.right), {
     [TYPES._array]: [
       ...setType(scope, leftName, TYPES.number),
@@ -2596,8 +2540,6 @@ const allocPage = (reason, type) => {
 
   if (reason.startsWith('array:')) pages.hasArray = true;
   if (reason.startsWith('string:')) pages.hasString = true;
-  if (reason.startsWith('bytestring:')) pages.hasByteString = true;
-  if (reason.includes('string:')) pages.hasAnyString = true;
 
   const ind = pages.size;
   pages.set(reason, { ind, type });
@@ -2631,8 +2573,7 @@ const StoreOps = {
   f64: Opcodes.f64_store,
 
   // expects i32 input!
-  i8: Opcodes.i32_store8,
-  i16: Opcodes.i32_store16,
+  i16: Opcodes.i32_store16
 };
 
 let data = [];
@@ -2651,15 +2592,6 @@ const compileBytes = (val, itemType, signed = true) => {
   }
 };
 
-const getAllocType = itemType => {
-  switch (itemType) {
-    case 'i8': return 'bytestring';
-    case 'i16': return 'string';
-
-    default: return 'array';
-  }
-};
-
 const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty = false, itemType = valtype) => {
   const out = [];
 
@@ -2669,7 +2601,7 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
 
     // todo: can we just have 1 undeclared array? probably not? but this is not really memory efficient
     const uniqueName = name === '$undeclared' ? name + Math.random().toString().slice(2) : name;
-    arrays.set(name, allocPage(`${getAllocType(itemType)}: ${uniqueName}`, itemType) * pageSize);
+    arrays.set(name, allocPage(`${itemType === 'i16' ? 'string' : 'array'}: ${uniqueName}`, itemType) * pageSize);
   }
 
   const pointer = arrays.get(name);
@@ -2715,7 +2647,7 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
     out.push(
       ...number(0, Valtype.i32),
       ...(useRawElements ? number(elements[i], Valtype[valtype]) : generate(scope, elements[i])),
-      [ storeOp, (Math.log2(ValtypeSize[itemType]) || 1) - 1, ...unsignedLEB128(pointer + ValtypeSize.i32 + i * ValtypeSize[itemType]) ]
+      [ storeOp, Math.log2(ValtypeSize[itemType]) - 1, ...unsignedLEB128(pointer + ValtypeSize.i32 + i * ValtypeSize[itemType]) ]
     );
   }
 
@@ -2725,29 +2657,15 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
   return [ out, pointer ];
 };
 
-const byteStringable = str => {
-  if (!process.argv.includes('-bytestring')) return false;
-
-  for (let i = 0; i < str.length; i++) {
-    if (str.charCodeAt(i) > 0xFF) return false;
-  }
-
-  return true;
-};
-
 const makeString = (scope, str, global = false, name = '$undeclared') => {
   const rawElements = new Array(str.length);
-  let byteStringable = process.argv.includes('-bytestring');
   for (let i = 0; i < str.length; i++) {
-    const c = str.charCodeAt(i);
-    rawElements[i] = c;
-
-    if (byteStringable && c > 0xFF) byteStringable = false;
+    rawElements[i] = str.charCodeAt(i);
   }
 
   return makeArray(scope, {
     rawElements
-  }, global, name, false, byteStringable ? 'i8' : 'i16')[0];
+  }, global, name, false, 'i16')[0];
 };
 
 let arrays = new Map();
@@ -2775,13 +2693,10 @@ export const generateMember = (scope, decl, _global, _name) => {
     ];
   }
 
-  const object = generate(scope, decl.object);
-  const property = generate(scope, decl.property);
-
   // // todo: we should only do this for strings but we don't know at compile-time :(
   // hack: this is naughty and will break things!
   let newOut = number(0, valtypeBinary), newPointer = -1;
-  if (pages.hasAnyString) {
+  if (pages.hasString) {
     0, [ newOut, newPointer ] = makeArray(scope, {
       rawElements: new Array(1)
     }, _global, _name, true, 'i16');
@@ -2790,7 +2705,7 @@ export const generateMember = (scope, decl, _global, _name) => {
   return typeSwitch(scope, getNodeType(scope, decl.object), {
     [TYPES._array]: [
       // get index as valtype
-      ...property,
+      ...generate(scope, decl.property),
 
       // convert to i32 and turn into byte offset by * valtypeSize (4 for i32, 8 for i64/f64)
       Opcodes.i32_to_u,
@@ -2798,7 +2713,7 @@ export const generateMember = (scope, decl, _global, _name) => {
       [ Opcodes.i32_mul ],
 
       ...(aotPointer ? [] : [
-        ...object,
+        ...generate(scope, decl.object),
         Opcodes.i32_to_u,
         [ Opcodes.i32_add ]
       ]),
@@ -2817,14 +2732,14 @@ export const generateMember = (scope, decl, _global, _name) => {
 
       ...number(0, Valtype.i32), // base 0 for store later
 
-      ...property,
-      Opcodes.i32_to_u,
+      ...generate(scope, decl.property),
 
+      Opcodes.i32_to_u,
       ...number(ValtypeSize.i16, Valtype.i32),
       [ Opcodes.i32_mul ],
 
       ...(aotPointer ? [] : [
-        ...object,
+        ...generate(scope, decl.object),
         Opcodes.i32_to_u,
         [ Opcodes.i32_add ]
       ]),
@@ -2841,34 +2756,6 @@ export const generateMember = (scope, decl, _global, _name) => {
       ...number(TYPES.string, Valtype.i32),
       setLastType(scope)
     ],
-    [TYPES._bytestring]: [
-      // setup new/out array
-      ...newOut,
-      [ Opcodes.drop ],
-
-      ...number(0, Valtype.i32), // base 0 for store later
-
-      ...property,
-      Opcodes.i32_to_u,
-
-      ...(aotPointer ? [] : [
-        ...object,
-        Opcodes.i32_to_u,
-        [ Opcodes.i32_add ]
-      ]),
-
-      // load current string ind {arg}
-      [ Opcodes.i32_load8_u, Math.log2(ValtypeSize.i16) - 1, ...unsignedLEB128((aotPointer ? pointer : 0) + ValtypeSize.i32) ],
-
-      // store to new string ind 0
-      [ Opcodes.i32_store8, Math.log2(ValtypeSize.i16) - 1, ...unsignedLEB128(newPointer + ValtypeSize.i32) ],
-
-      // return new string (page)
-      ...number(newPointer),
-
-      ...number(TYPES._bytestring, Valtype.i32),
-      setLastType(scope)
-    ],
 
     default: [ [ Opcodes.unreachable ] ]
   });
@@ -2950,8 +2837,10 @@ const generateFunc = (scope, decl) => {
   const func = {
     name,
     params: Object.values(innerScope.locals).slice(0, params.length * 2).map(x => x.type),
-    index: currentFuncIndex++,
-    ...innerScope
+    returns: innerScope.returns,
+    locals: innerScope.locals,
+    throws: innerScope.throws,
+    index: currentFuncIndex++
   };
   funcIndex[name] = func.index;
 

package/compiler/opt.js

@@ -192,7 +192,6 @@ export default (funcs, globals, pages, tags) => {
           let missing = false;
           if (type === 'Array') missing = !pages.hasArray;
           if (type === 'String') missing = !pages.hasString;
-          if (type === 'ByteString') missing = !pages.hasByteString;
 
           if (missing) {
             let j = i, depth = 0;

package/compiler/prototype.js

@@ -16,8 +16,7 @@ const TYPES = {
 
   // these are not "typeof" types but tracked internally
   _array: 0x10,
-  _regexp: 0x11,
-  _bytestring: 0x12
+  _regexp: 0x11
 };
 
 // todo: turn these into built-ins once arrays and these become less hacky
@@ -72,7 +71,7 @@ export const PrototypeFuncs = function() {
     ],
 
     // todo: only for 1 argument
-    push: (pointer, length, wNewMember, _1, _2, _3, unusedValue) => [
+    push: (pointer, length, wNewMember) => [
       // get memory offset of array at last index (length)
       ...length.getCachedI32(),
       ...number(ValtypeSize[valtype], Valtype.i32),
@@ -93,28 +92,22 @@ export const PrototypeFuncs = function() {
         ...number(1, Valtype.i32),
         [ Opcodes.i32_add ],
 
-        ...(unusedValue() ? [] : [
-          ...length.setCachedI32(),
-          ...length.getCachedI32(),
-        ])
+        ...length.setCachedI32(),
+        ...length.getCachedI32(),
       ]),
 
-      ...(unusedValue() ? [] : [
-        ...length.getCachedI32(),
-        Opcodes.i32_from_u
-      ])
+      ...length.getCachedI32(),
+      Opcodes.i32_from_u
 
       // ...length.get()
     ],
 
-    pop: (pointer, length, _1, _2, _3, _4, unusedValue) => [
+    pop: (pointer, length) => [
       // if length == 0, noop
       ...length.getCachedI32(),
       [ Opcodes.i32_eqz ],
       [ Opcodes.if, Blocktype.void ],
-      ...(unusedValue() ? [] : [
-        ...number(UNDEFINED),
-      ]),
+      ...number(UNDEFINED),
       [ Opcodes.br, 1 ],
       [ Opcodes.end ],
 
@@ -126,23 +119,19 @@ export const PrototypeFuncs = function() {
         ...number(1, Valtype.i32),
         [ Opcodes.i32_sub ],
 
-        ...(unusedValue() ? [] : [
-          ...length.setCachedI32(),
-          ...length.getCachedI32(),
-        ])
+        ...length.setCachedI32(),
+        ...length.getCachedI32(),
       ]),
 
       // load last element
-      ...(unusedValue() ? [] : [
-        ...length.getCachedI32(),
-        ...number(ValtypeSize[valtype], Valtype.i32),
-        [ Opcodes.i32_mul ],
+      ...length.getCachedI32(),
+      ...number(ValtypeSize[valtype], Valtype.i32),
+      [ Opcodes.i32_mul ],
 
-        ...pointer,
-        [ Opcodes.i32_add ],
+      ...pointer,
+      [ Opcodes.i32_add ],
 
-        [ Opcodes.load, Math.log2(ValtypeSize[valtype]) - 1, ...unsignedLEB128(ValtypeSize.i32) ]
-      ])
+      [ Opcodes.load, Math.log2(ValtypeSize[valtype]) - 1, ...unsignedLEB128(ValtypeSize.i32) ]
     ],
 
     shift: (pointer, length) => [
@@ -483,152 +472,8 @@ export const PrototypeFuncs = function() {
   this[TYPES.string].at.returnType = TYPES.string;
   this[TYPES.string].charAt.returnType = TYPES.string;
   this[TYPES.string].charCodeAt.local = Valtype.i32;
-  this[TYPES.string].charCodeAt.noPointerCache = zeroChecks.charcodeat;
 
   this[TYPES.string].isWellFormed.local = Valtype.i32;
   this[TYPES.string].isWellFormed.local2 = Valtype.i32;
   this[TYPES.string].isWellFormed.returnType = TYPES.boolean;
-
-  if (process.argv.includes('-bytestring')) {
-    this[TYPES._bytestring] = {
-      at: (pointer, length, wIndex, iTmp, _, arrayShell) => {
-        const [ newOut, newPointer ] = arrayShell(1, 'i16');
-
-        return [
-          // setup new/out array
-          ...newOut,
-          [ Opcodes.drop ],
-
-          ...number(0, Valtype.i32), // base 0 for store later
-
-          ...wIndex,
-          Opcodes.i32_to_u,
-          [ Opcodes.local_tee, iTmp ],
-
-          // if index < 0: access index + array length
-          ...number(0, Valtype.i32),
-          [ Opcodes.i32_lt_s ],
-          [ Opcodes.if, Blocktype.void ],
-          [ Opcodes.local_get, iTmp ],
-          ...length.getCachedI32(),
-          [ Opcodes.i32_add ],
-          [ Opcodes.local_set, iTmp ],
-          [ Opcodes.end ],
-
-          // if still < 0 or >= length: return undefined
-          [ Opcodes.local_get, iTmp ],
-          ...number(0, Valtype.i32),
-          [ Opcodes.i32_lt_s ],
-
-          [ Opcodes.local_get, iTmp ],
-          ...length.getCachedI32(),
-          [ Opcodes.i32_ge_s ],
-          [ Opcodes.i32_or ],
-
-          [ Opcodes.if, Blocktype.void ],
-          ...number(UNDEFINED),
-          [ Opcodes.br, 1 ],
-          [ Opcodes.end ],
-
-          [ Opcodes.local_get, iTmp ],
-
-          ...pointer,
-          [ Opcodes.i32_add ],
-
-          // load current string ind {arg}
-          [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(ValtypeSize.i32) ],
-
-          // store to new string ind 0
-          [ Opcodes.i32_store8, 0, ...unsignedLEB128(newPointer + ValtypeSize.i32) ],
-
-          // return new string (pointer)
-          ...number(newPointer)
-        ];
-      },
-
-      // todo: out of bounds properly
-      charAt: (pointer, length, wIndex, _1, _2, arrayShell) => {
-        const [ newOut, newPointer ] = arrayShell(1, 'i16');
-
-        return [
-          // setup new/out array
-          ...newOut,
-          [ Opcodes.drop ],
-
-          ...number(0, Valtype.i32), // base 0 for store later
-
-          ...wIndex,
-
-          Opcodes.i32_to,
-
-          ...pointer,
-          [ Opcodes.i32_add ],
-
-          // load current string ind {arg}
-          [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(ValtypeSize.i32) ],
-
-          // store to new string ind 0
-          [ Opcodes.i32_store8, 0, ...unsignedLEB128(newPointer + ValtypeSize.i32) ],
-
-          // return new string (page)
-          ...number(newPointer)
-        ];
-      },
-
-      charCodeAt: (pointer, length, wIndex, iTmp) => {
-        return [
-          ...wIndex,
-          Opcodes.i32_to,
-
-          ...(zeroChecks.charcodeat ? [] : [
-            [ Opcodes.local_set, iTmp ],
-
-            // index < 0
-            ...(noUnlikelyChecks ? [] : [
-              [ Opcodes.local_get, iTmp ],
-              ...number(0, Valtype.i32),
-              [ Opcodes.i32_lt_s ],
-            ]),
-
-            // index >= length
-            [ Opcodes.local_get, iTmp ],
-            ...length.getCachedI32(),
-            [ Opcodes.i32_ge_s ],
-
-            ...(noUnlikelyChecks ? [] : [ [ Opcodes.i32_or ] ]),
-            [ Opcodes.if, Blocktype.void ],
-            ...number(NaN),
-            [ Opcodes.br, 1 ],
-            [ Opcodes.end ],
-
-            [ Opcodes.local_get, iTmp ],
-          ]),
-
-          ...pointer,
-          [ Opcodes.i32_add ],
-
-          // load current string ind {arg}
-          [ Opcodes.i32_load8_u, 0, ...unsignedLEB128(ValtypeSize.i32) ],
-          Opcodes.i32_from_u
-        ];
-      },
-
-      isWellFormed: () => {
-        return [
-          // we know it must be true as it is a bytestring lol
-          ...number(1)
-        ]
-      }
-    };
-
-    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;
-  }
 };

package/compiler/wasmSpec.js

@@ -57,12 +57,9 @@ export const Opcodes = {
   i64_load: 0x29,
   f64_load: 0x2b,
 
-  i32_load8_s: 0x2c,
-  i32_load8_u: 0x2d,
   i32_load16_s: 0x2e,
   i32_load16_u: 0x2f,
 
-  i32_store8: 0x3a,
   i32_store16: 0x3b,
 
   i32_store: 0x36,

package/compiler/wrap.js

@@ -19,8 +19,7 @@ const TYPES = {
 
   // internal
   [internalTypeBase]: '_array',
-  [internalTypeBase + 1]: '_regexp',
-  [internalTypeBase + 2]: '_bytestring'
+  [internalTypeBase + 1]: '_regexp'
 };
 
 export default async (source, flags = [ 'module' ], customImports = {}, print = str => process.stdout.write(str)) => {
@@ -49,9 +48,6 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
       }
     });
   } catch (e) {
-    // 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]);
 
@@ -181,13 +177,6 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
             return Array.from(new Uint16Array(memory.buffer, pointer + 4, length)).map(x => String.fromCharCode(x)).join('');
           }
 
-          case '_bytestring': {
-            const pointer = ret;
-            const length = new Int32Array(memory.buffer, pointer, 1);
-
-            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);

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.2.0-eeb45f8",
+  "version": "0.2.0-f2bbe1f",
   "author": "CanadaHonk",
   "license": "MIT",
   "dependencies": {