porffor 0.16.0-79cd8c0c8 → 0.16.0-8107e135a

package/CONTRIBUTING.md

@@ -26,7 +26,7 @@ You can also swap out `node` in the alias to use another runtime like Deno (`den
 
 ### Precompile
 
-**If you update any file inside `compiler/builtins` you will need to do this for it to update inside Porffor otherwise your changes will have no effect.** Run `node compiler/precompile.js` to precompile. It may error during this, if so, you might have an error in your code or there could be a compiler error with Porffor (feel free to ask for help as soon as you encounter any errors with it).
+**If you update any file inside `compiler/builtins` you will need to do this for it to update inside Porffor otherwise your changes will have no effect.** Run `./porf precompile` to precompile. It may error during this, if so, you might have an error in your code or there could be a compiler error with Porffor (feel free to ask for help as soon as you encounter any errors with it).
 
 <br>
 

package/compiler/allocators/grow.js

@@ -0,0 +1,25 @@
+import { Opcodes, Valtype } from '../wasmSpec.js';
+import { number } from '../embedding.js';
+import Prefs from '../prefs.js';
+
+export default class GrowAllocator {
+  constructor() {
+    Prefs.rmUnusedTypes = false;
+  }
+
+  alloc() {
+    return [
+      // get current page count
+      [ Opcodes.memory_size, 0 ],
+
+      // grow by 1 page
+      [ Opcodes.i32_const, 1 ],
+      [ Opcodes.memory_grow, 0 ],
+      [ Opcodes.drop ],
+
+      // get ptr (page count * page size)
+      number(65536, Valtype.i32)[0],
+      [ Opcodes.i32_mul ]
+    ];
+  }
+}

package/compiler/allocators/index.js

@@ -0,0 +1,10 @@
+import StaticAllocator from './static.js';
+import GrowAllocator from './grow.js';
+
+export default name => {
+  switch (name) {
+    case 'static': return new StaticAllocator();
+    case 'grow': return new GrowAllocator();
+    default: throw new Error(`unknown allocator: ${name}`);
+  }
+};

package/compiler/allocators/static.js

@@ -0,0 +1,42 @@
+import { Valtype } from '../wasmSpec.js';
+import { number } from '../embedding.js';
+import Prefs from '../prefs.js';
+
+const allocType = itemType => {
+  switch (itemType) {
+    case 'i8': return 'bytestring';
+    case 'i16': return 'string';
+
+    default: return 'array';
+  }
+};
+
+const ptr = ind => {
+  if (ind === 0) return 1;
+  return ind * pageSize;
+};
+
+
+export default class StaticAllocator {
+  constructor() {
+  }
+
+  alloc({ scope, pages }, name, { itemType }) {
+    const reason = `${allocType(itemType)}: ${Prefs.scopedPageNames ? (scope.name + '/') : ''}${name}`;
+
+    if (pages.has(reason)) return number(ptr(pages.get(reason).ind), Valtype.i32);
+
+    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;
+
+    let ind = pages.size;
+    pages.set(reason, { ind, type: itemType });
+
+    scope.pages ??= new Map();
+    scope.pages.set(reason, { ind, type: itemType });
+
+    return number(ptr(ind), Valtype.i32);
+  }
+}

package/compiler/assemble.js

@@ -240,7 +240,13 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
 
   const dataSection = data.length === 0 ? [] : createSection(
     Section.data,
-    encodeVector(data.map(x => [ 0x00, Opcodes.i32_const, ...signedLEB128(x.offset), Opcodes.end, ...encodeVector(x.bytes) ]))
+    encodeVector(data.map(x => {
+      // type: active
+      if (x.offset != null) return [ 0x00, Opcodes.i32_const, ...signedLEB128(x.offset), Opcodes.end, ...encodeVector(x.bytes) ];
+
+      // type: passive
+      return [ 0x01, ...encodeVector(x.bytes) ];
+    }))
   );
 
   const dataCountSection = data.length === 0 ? [] : createSection(

package/compiler/builtins/date.ts

@@ -722,12 +722,10 @@ export const __Porffor_date_allocate = (): Date => {
   const hack: bytestring = '';
 
   if (hack.length == 0) {
-    hack.length = Porffor.wasm`i32.const 1
+    hack.length = Porffor.wasm`memory.size 0
+i32.const 1
 memory.grow 0
 drop
-memory.size 0
-i32.const 1
-i32.sub
 i32.const 65536
 i32.mul
 i32.from_u`;

package/compiler/builtins/set.ts

@@ -2,12 +2,10 @@ import type {} from './porffor.d.ts';
 
 // dark wasm magic for dealing with memory, sorry.
 export const __Porffor_allocate = (): number => {
-  Porffor.wasm`i32.const 1
+  Porffor.wasm`memory.size 0
+i32.const 1
 memory.grow 0
 drop
-memory.size 0
-i32.const 1
-i32.sub
 i32.const 65536
 i32.mul
 i32.from_u