porffor 0.56.5 → 0.56.6

package/compiler/codegen.js

@@ -1530,8 +1530,8 @@ const getLastType = scope => {
   ];
 };
 
-const setLastType = (scope, type = []) => {
-  typeUsed(scope, knownType(scope, type));
+const setLastType = (scope, type = [], doNotMarkAsUsed = false) => {
+  if (!doNotMarkAsUsed) typeUsed(scope, knownType(scope, type));
   return [
     ...(typeof type === 'number' ? [ number(type, Valtype.i32) ] : type),
     [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
@@ -1659,7 +1659,7 @@ const getNodeType = (scope, node) => {
       if (node.operator === 'delete') return TYPES.boolean;
       if (node.operator === 'typeof') return TYPES.bytestring;
 
-      // todo: proper bigint support
+      // todo: non-static bigint support
       const type = getNodeType(scope, node.argument);
       const known = knownType(scope, type);
       if (known === TYPES.bigint) return TYPES.bigint;
@@ -1668,6 +1668,7 @@ const getNodeType = (scope, node) => {
     }
 
     if (node.type === 'UpdateExpression') {
+      // todo: bigint support
       return TYPES.number;
     }
 
@@ -1932,7 +1933,7 @@ const typeIsIterable = wasm => [
   number(TYPES.uint8array, Valtype.i32),
   [ Opcodes.i32_ge_s ],
   ...wasm,
-  number(TYPES.float64array, Valtype.i32),
+  number(TYPES.biguint64array, Valtype.i32),
   [ Opcodes.i32_le_s ],
   [ Opcodes.i32_and ],
   [ Opcodes.i32_or ],
@@ -3898,6 +3899,56 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
 
               [ Opcodes.f64_store, 0, 4 ]
             ],
+            [TYPES.bigint64array]: () => [
+              number(8, Valtype.i32),
+              [ Opcodes.i32_mul ],
+              [ Opcodes.i32_add ],
+              ...(op === '=' ? [] : [ [ Opcodes.local_tee, pointerTmp ] ]),
+
+              ...(op === '=' ? [
+                ...generate(scope, decl.right),
+                ...getNodeType(scope, decl.right),
+                [ Opcodes.call, includeBuiltin(scope, '__ecma262_ToBigInt').index ]
+              ] : performOp(scope, op, [
+                [ Opcodes.local_get, pointerTmp ],
+                [ Opcodes.i64_load, 0, 4 ],
+                [ Opcodes.call, includeBuiltin(scope, '__Porffor_bigint_fromS64').index ]
+              ], [
+                ...generate(scope, decl.right),
+                ...getNodeType(scope, decl.right),
+                [ Opcodes.call, includeBuiltin(scope, '__ecma262_ToBigInt').index ]
+              ], [ number(TYPES.bigint, Valtype.i32) ], [ number(TYPES.bigint, Valtype.i32) ])),
+              ...optional([ Opcodes.local_tee, newValueTmp ]),
+
+              [ Opcodes.call, includeBuiltin(scope, '__Porffor_bigint_toI64').index ],
+              [ Opcodes.i64_store, 0, 4 ],
+              setLastType(scope, TYPES.bigint, true)
+            ],
+            [TYPES.biguint64array]: () => [
+              number(8, Valtype.i32),
+              [ Opcodes.i32_mul ],
+              [ Opcodes.i32_add ],
+              ...(op === '=' ? [] : [ [ Opcodes.local_tee, pointerTmp ] ]),
+
+              ...(op === '=' ? [
+                ...generate(scope, decl.right),
+                ...getNodeType(scope, decl.right),
+                [ Opcodes.call, includeBuiltin(scope, '__ecma262_ToBigInt').index ]
+              ] : performOp(scope, op, [
+                [ Opcodes.local_get, pointerTmp ],
+                [ Opcodes.i64_load, 0, 4 ],
+                [ Opcodes.call, includeBuiltin(scope, '__Porffor_bigint_fromS64').index ]
+              ], [
+                ...generate(scope, decl.right),
+                ...getNodeType(scope, decl.right),
+                [ Opcodes.call, includeBuiltin(scope, '__ecma262_ToBigInt').index ]
+              ], [ number(TYPES.bigint, Valtype.i32) ], [ number(TYPES.bigint, Valtype.i32) ])),
+              ...optional([ Opcodes.local_tee, newValueTmp ]),
+
+              [ Opcodes.call, includeBuiltin(scope, '__Porffor_bigint_toI64').index ],
+              [ Opcodes.i64_store, 0, 4 ],
+              setLastType(scope, TYPES.bigint, true)
+            ]
           }, {
             prelude: [
               objectGet,
@@ -4552,7 +4603,7 @@ const generateForOf = (scope, decl) => {
 
   const prevDepth = depth.length;
 
-  const makeTypedArrayNext = (getOp, elementSize) => [
+  const makeTypedArrayNext = (getOp, elementSize, type = TYPES.number) => [
     // if counter == length then break
     [ Opcodes.local_get, counter ],
     [ Opcodes.local_get, length ],
@@ -4580,8 +4631,8 @@ const generateForOf = (scope, decl) => {
     [ Opcodes.i32_add ],
     [ Opcodes.local_set, counter ],
 
-    // set last type to number
-    ...setLastType(scope, TYPES.number)
+    // set last type to number or specified
+    ...setLastType(scope, type, true)
   ];
 
   // Wasm to get next element
@@ -4737,7 +4788,14 @@ const generateForOf = (scope, decl) => {
     [ TYPES.float64array, () => makeTypedArrayNext([
       [ Opcodes.f64_load, 0, 4 ]
     ], 8) ],
-
+    [ TYPES.bigint64array, () => makeTypedArrayNext([
+      [ Opcodes.i64_load, 0, 4 ],
+      [ Opcodes.call, includeBuiltin(scope, '__Porffor_bigint_fromS64').index ]
+    ], 8, TYPES.bigint) ],
+    [ TYPES.biguint64array, () => makeTypedArrayNext([
+      [ Opcodes.i64_load, 0, 4 ],
+      [ Opcodes.call, includeBuiltin(scope, '__Porffor_bigint_fromU64').index ]
+    ], 8, TYPES.bigint) ],
     [ TYPES.__porffor_generator, () => [
       // just break?! TODO: actually implement this
       [ Opcodes.br, depth.length - prevDepth ]
@@ -5927,7 +5985,7 @@ const generateMember = (scope, decl, _global, _name) => {
           [ Opcodes.i32_add ],
 
           [ Opcodes.f64_load, 0, 4 ]
-        ],
+        ]
       }, {
         prelude: [
           objectGet,
@@ -5939,6 +5997,31 @@ const generateMember = (scope, decl, _global, _name) => {
         ],
         postlude: setLastType(scope, TYPES.number)
       }),
+
+      ...wrapBC({
+        [TYPES.bigint64array]: () => [
+          [ Opcodes.call, includeBuiltin(scope, '__Porffor_bigint_fromS64').index ]
+        ],
+        [TYPES.biguint64array]: () => [
+          [ Opcodes.call, includeBuiltin(scope, '__Porffor_bigint_fromU64').index ]
+        ]
+      }, {
+        prelude: [
+          objectGet,
+          Opcodes.i32_to_u,
+          [ Opcodes.i32_load, 0, 4 ],
+
+          propertyGet,
+          Opcodes.i32_to_u,
+
+          number(8, Valtype.i32),
+          [ Opcodes.i32_mul ],
+          [ Opcodes.i32_add ],
+
+          [ Opcodes.i64_load, 0, 4 ]
+        ],
+        postlude: setLastType(scope, TYPES.bigint, true)
+      })
     } : {}),
 
     [TYPES.undefined]: internalThrow(scope, 'TypeError', `Cannot read property of undefined`, true),

package/compiler/encoding.js

@@ -96,7 +96,7 @@ export const big_signedLEB128 = n => {
       buffer.push(byte);
       break;
     } else {
-      byte |= 0x80n;
+      byte |= 0x80;
     }
 
     buffer.push(byte);

package/compiler/index.js

@@ -36,7 +36,7 @@ const progressStart = msg => {
 
   const log = (extra, after) => {
     const pre = extra ? `${extra}` : spinner[spin++ % 4];
-    process.stdout.write(`\r\u001b[2m${' '.repeat(120)}\r${' '.repeat(12 - pre.length)}${pre}  ${msg}${after ?? ''}\u001b[0m`);
+    process.stdout.write(`\r\u001b[2m${' '.repeat(60)}\r${' '.repeat(12 - pre.length)}${pre}  ${msg}${after ?? ''}\u001b[0m`);
   };
   log();
 
@@ -49,7 +49,7 @@ const progressDone = (msg, start) => {
   clearInterval(progressInterval);
 
   const timeStr = (performance.now() - start).toFixed(0);
-  console.log(`\r${' '.repeat(120)}\r\u001b[2m${' '.repeat(10 - timeStr.length)}${timeStr}ms\u001b[0m  \u001b[92m${msg}\u001b[0m`);
+  console.log(`\r${' '.repeat(60)}\r\u001b[2m${' '.repeat(10 - timeStr.length)}${timeStr}ms\u001b[0m  \u001b[92m${msg}\u001b[0m`);
   progressLines++;
 };
 const progressClear = () => {

package/compiler/types.js

@@ -56,7 +56,7 @@ registerInternalType('ArrayBuffer');
 registerInternalType('SharedArrayBuffer');
 registerInternalType('DataView');
 
-for (const x of [ 'Uint8', 'Int8', 'Uint8Clamped', 'Uint16', 'Int16', 'Uint32', 'Int32', 'Float32', 'Float64' ])
+for (const x of [ 'Uint8', 'Int8', 'Uint8Clamped', 'Uint16', 'Int16', 'Uint32', 'Int32', 'Float32', 'Float64', 'BigInt64', 'BigUint64' ])
   registerInternalType(`${x}Array`, ['iterable', 'length']);
 
 registerInternalType('WeakRef');

package/compiler/wasmSpec.js

@@ -131,9 +131,13 @@ export const Opcodes = {
   i32_ne: 0x47,
 
   i32_lt_s: 0x48,
-  i32_le_s: 0x4c,
+  i32_lt_u: 0x49,
   i32_gt_s: 0x4a,
+  i32_gt_u: 0x4b,
+  i32_le_s: 0x4c,
+  i32_le_u: 0x4d,
   i32_ge_s: 0x4e,
+  i32_ge_u: 0x4f,
 
   i32_clz: 0x67,
   i32_ctz: 0x68,
@@ -222,6 +226,8 @@ export const Opcodes = {
 
   i32_trunc_sat_f64_s: [ 0xfc, 0x02 ],
   i32_trunc_sat_f64_u: [ 0xfc, 0x03 ],
+  i64_trunc_sat_f64_s: [ 0xfc, 0x06 ],
+  i64_trunc_sat_f64_u: [ 0xfc, 0x07 ],
 
   memory_init: [ 0xfc, 0x08 ],
   data_drop: [ 0xfc, 0x09 ],

package/compiler/wrap.js

@@ -228,7 +228,9 @@ ${flags & 0b0001 ? `    get func idx: ${get}
     case TYPES.uint32array:
     case TYPES.int32array:
     case TYPES.float32array:
-    case TYPES.float64array: {
+    case TYPES.float64array:
+    case TYPES.bigint64array:
+    case TYPES.biguint64array: {
       const [ length, ptr ] = read(Uint32Array, memory, value, 2);
       return read(globalThis[TYPE_NAMES[type]], memory, ptr + 4, length);
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "porffor",
   "description": "An ahead-of-time JavaScript compiler",
-  "version": "0.56.5",
+  "version": "0.56.6",
   "author": "Oliver Medhurst <honk@goose.icu>",
   "license": "MIT",
   "scripts": {},

package/r.cjs

@@ -1,95 +1,3 @@
-var assert = mustBeTrue => {
-  if (mustBeTrue === true) {
-    return;
-  }
-
-  throw new Test262Error('assert failed');
-};
-assert; // idk why exactly but this fixes many tests by forcing indirect ref
-
-var __assert_throws = (expectedErrorConstructor, func) => {
-  if (typeof func !== 'function') {
-    throw new Test262Error('assert.throws invoked with a non-function value');
-  }
-
-  try {
-    func();
-  } catch {
-    return;
-  }
-
-  throw new Test262Error('assert.throws failed');
-};
-
-var __assert__isSameValue = (a, b) => {
-  if (a === b) {
-    // Handle +/-0 vs. -/+0
-    return a !== 0 || 1 / a === 1 / b;
-  }
-
-  // Handle NaN vs. NaN
-  return a !== a && b !== b;
-};
-
-var __assert_sameValue = (actual, expected) => {
-  if (assert._isSameValue(actual, expected)) {
-    return;
-  }
-
-  throw new Test262Error('assert.sameValue failed');
-};
-
-var __assert_notSameValue = (actual, unexpected) => {
-  if (!assert._isSameValue(actual, unexpected)) {
-    return;
-  }
-
-  throw new Test262Error('assert.notSameValue failed');
-};
-
-var typedArrayConstructors = [
-  Float64Array,
-  Float32Array,
-  Int32Array,
-  Int16Array,
-  Int8Array,
-  Uint32Array,
-  Uint16Array,
-  Uint8Array,
-  Uint8ClampedArray
-];
-
-function testWithTypedArrayConstructors(f, selected) {
-  var constructors = selected || typedArrayConstructors;
-  for (var i = 0; i < constructors.length; ++i) {
-    f(constructors[i]);
-  }
-}
-
-testWithTypedArrayConstructors(function(TA) {
-  var sample = new TA([40, 41, 42, 43]);
-
-  function testRes(result, msg) {
-    assert.sameValue(result.length, 4, msg);
-    assert.sameValue(result[0], 40, msg + " & result[0] === 40");
-    assert.sameValue(result[1], 41, msg + " & result[1] === 41");
-    assert.sameValue(result[2], 42, msg + " & result[2] === 42");
-    assert.sameValue(result[3], 43, msg + " & result[3] === 43");
-  }
-
-  testRes(sample.subarray(0), "begin == 0");
-  testRes(sample.subarray(-4), "begin == -srcLength");
-  testRes(sample.subarray(-5), "begin < -srcLength");
-
-  testRes(sample.subarray(0, 4), "begin == 0, end == srcLength");
-  testRes(sample.subarray(-4, 4), "begin == -srcLength, end == srcLength");
-  testRes(sample.subarray(-5, 4), "begin < -srcLength, end == srcLength");
-
-  testRes(sample.subarray(0, 5), "begin == 0, end > srcLength");
-  testRes(sample.subarray(-4, 5), "begin == -srcLength, end > srcLength");
-  testRes(sample.subarray(-5, 5), "begin < -srcLength, end > srcLength");
-});
-
 
 // class C {
 //   // static #method = () => 1;

package/runner/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import fs from 'node:fs';
-globalThis.version = '0.56.5';
+globalThis.version = '0.56.6';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {