porffor 0.55.24 → 0.55.25

package/compiler/2c.js

@@ -1,5 +1,5 @@
 import { read_ieee754_binary64, read_signedLEB128, read_unsignedLEB128 } from './encoding.js';
-import { Blocktype, Opcodes, Valtype } from './wasmSpec.js';
+import { Blocktype, Opcodes, Valtype, PageSize } from './wasmSpec.js';
 import { operatorOpcode } from './expression.js';
 import { log } from './log.js';
 import './prefs.js';
@@ -218,7 +218,7 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
   if (pages.size > 0) {
     includes.set('stdlib.h', true);
     prepend.set('_memory', `char* _memory; u32 _memoryPages = ${pages.size};\n`);
-    prependMain.set('_initMemory', `_memory = malloc(_memoryPages * ${pageSize});\n`);
+    prependMain.set('_initMemory', `_memory = malloc(_memoryPages * ${PageSize});\n`);
     if (Prefs['2cMemcpy']) includes.set('string.h', true);
   }
 

package/compiler/allocator.js

@@ -1,9 +1,8 @@
-import { PageSize } from './wasmSpec.js';
 import './prefs.js';
 
 const pagePtr = ind => {
   if (ind === 0) return 16;
-  return ind * PageSize;
+  return ind * pageSize;
 };
 
 export const nameToReason = (scope, name) => {
@@ -37,7 +36,7 @@ export const allocBytes = ({ scope, pages }, reason, bytes) => {
     return allocs.get(reason);
   }
 
-  let bin = bins.find(x => (PageSize - x.used) >= bytes);
+  let bin = bins.find(x => (pageSize - x.used) >= bytes);
   if (!bin) {
     // new bin
     const page = pages.size;

package/compiler/builtins.js

@@ -1,6 +1,6 @@
 import * as PrecompiledBuiltins from './builtins_precompiled.js';
 import ObjectBuiltins from './builtins_objects.js';
-import { Blocktype, Opcodes, Valtype, ValtypeSize } from './wasmSpec.js';
+import { PageSize, Blocktype, Opcodes, Valtype } from './wasmSpec.js';
 import { TYPES, TYPE_NAMES } from './types.js';
 import { number, unsignedLEB128 } from './encoding.js';
 import './prefs.js';
@@ -778,7 +778,7 @@ export const BuiltinFuncs = function() {
       wasm: [
         number(1, Valtype.i32),
         [ Opcodes.memory_grow, 0 ],
-        number(pageSize, Valtype.i32),
+        number(PageSize, Valtype.i32),
         [ Opcodes.i32_mul ]
       ]
     },
@@ -787,23 +787,23 @@ export const BuiltinFuncs = function() {
       locals: [],
       globals: [ Valtype.i32, Valtype.i32 ],
       globalNames: [ 'chunkPtr', 'chunkOffset' ],
-      globalInits: [ 0, 100 * pageSize ],
+      globalInits: [ 0, 100 * PageSize ],
       returns: [ Valtype.i32 ],
       returnType: TYPES.number,
       wasm: [
         // if chunkOffset >= chunks:
         [ Opcodes.global_get, 1 ],
-        number(pageSize * (Prefs.allocatorChunks ?? 16), Valtype.i32),
+        number(PageSize * (Prefs.allocatorChunks ?? 16), Valtype.i32),
         [ Opcodes.i32_ge_s ],
         [ Opcodes.if, Valtype.i32 ],
           // chunkOffset = 1 page
-          number(1 * pageSize, Valtype.i32),
+          number(pageSize, Valtype.i32),
           [ Opcodes.global_set, 1 ],
 
           // return chunkPtr = allocated
           number(Prefs.allocatorChunks ?? 16, Valtype.i32),
           [ Opcodes.memory_grow, 0 ],
-          number(pageSize, Valtype.i32),
+          number(PageSize, Valtype.i32),
           [ Opcodes.i32_mul ],
           [ Opcodes.global_set, 0 ],
           [ Opcodes.global_get, 0 ],

package/compiler/builtins_objects.js

@@ -1,4 +1,4 @@
-import { Blocktype, Opcodes, PageSize, Valtype } from './wasmSpec.js';
+import { Blocktype, Opcodes, Valtype } from './wasmSpec.js';
 import { TYPES } from './types.js';
 import { number } from './encoding.js';
 

package/compiler/codegen.js

@@ -3545,7 +3545,7 @@ const coctcOffset = prop => {
 
   let offset = coctc.get(prop);
   if (offset == null) {
-    offset = (coctc.lastOffset ?? 60000) - 9;
+    offset = (coctc.lastOffset ?? Prefs.coctcOffset ?? 16300) - 9;
     if (offset < 0) return 0;
 
     coctc.lastOffset = offset;

package/compiler/index.js

@@ -73,7 +73,8 @@ export default (code, module = undefined) => {
   globalThis.valtype = Prefs.valtype ?? 'f64';
   globalThis.valtypeBinary = Valtype[valtype];
 
-  globalThis.pageSize = (parseInt(Prefs.valtype) * 1024) || PageSize;
+  // use smaller page sizes internally (65536 / 4 = 16384)
+  globalThis.pageSize = Prefs.pageSize ?? (PageSize / 4);
 
   // change some prefs by default for c/native
   if (target !== 'wasm') {

package/package.json

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

package/runner/index.js

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

package/runner/repl.js

@@ -34,10 +34,9 @@ console.log(`Welcome to \x1B[1m\x1B[35mPorffor\x1B[0m \x1B[2m(${globalThis.versi
 console.log();
 
 let lastMemory, lastPages;
-const PageSize = 65536;
 const memoryToString = mem => {
   let out = '';
-  const wasmPages = mem.buffer.byteLength / PageSize;
+  const wasmPages = mem.buffer.byteLength / 65536;
 
   out += `\x1B[1mallocated ${mem.buffer.byteLength / 1024}KiB\x1B[0m (using ${wasmPages} Wasm page${wasmPages === 1 ? '' : 's'})\n\n`;