porffor 0.34.0 → 0.34.1

package/compiler/2c.js

@@ -217,12 +217,14 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
     if (Prefs['2cMemcpy']) includes.set('string.h', true);
   }
 
-  if (data.length > 0) {
+  const activeData = data.filter(x => x.page != null);
+  if (activeData.length > 0) {
+    const dataOffset = x => pages.get(x.page).ind * pageSize;
     if (Prefs['2cMemcpy']) {
-      prependMain.set('_data', data.map(x => `memcpy(_memory + ${x.offset}, (unsigned char[]){${x.bytes.join(',')}}, ${x.bytes.length});`).join('\n  '));
+      prependMain.set('_data', activeData.map(x => `memcpy(_memory + ${dataOffset(x)}, (unsigned char[]){${x.bytes.join(',')}}, ${x.bytes.length});`).join('\n  '));
       includes.set('string.h', true);
     } else {
-      prependMain.set('_data', data.map(x => x.bytes.reduce((acc, y, i) => acc + `_memory[${x.offset + i}]=(u8)${y};`, '')).join('\n  '));
+      prependMain.set('_data', activeData.map(x => x.bytes.reduce((acc, y, i) => acc + `_memory[${dataOffset(x) + i}]=(u8)${y};`, '')).join('\n  '));
     }
   }
 

package/compiler/assemble.js

@@ -99,32 +99,9 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
   // also fix call_indirect types
   // also encode call indexes
   for (const f of funcs) {
-    f.originalIndex = f.index;
-    f.index -= importDelta;
-
-    for (const inst of f.wasm) {
-      if ((inst[0] === Opcodes.call || inst[0] === Opcodes.return_call) && inst[1] >= importedFuncs.length) {
-        const idx = inst[1] - importDelta;
-        inst.pop(); // remove idx
-        unsignedLEB128_into(idx, inst); // add unsigned leb128 encoded index to inst
-      }
-
-      if (inst[0] === Opcodes.call_indirect) {
-        if (!funcs.table) funcs.table = true;
-
-        const params = [];
-        for (let i = 0; i < inst[1]; i++) {
-          params.push(valtypeBinary, Valtype.i32);
-        }
-
-        let returns = [ valtypeBinary, Valtype.i32 ];
-        if (inst.at(-1) === 'no_type_return') {
-          inst.pop();
-          returns = [ valtypeBinary ];
-        }
-
-        inst[1] = getType(params, returns);
-      }
+    if (f.originalIndex == null) {
+      f.originalIndex = f.index;
+      f.index -= importDelta;
     }
   }
 
@@ -333,6 +310,29 @@ export default (funcs, globals, tags, pages, data, flags, noTreeshake = false) =
           ieee754_binary64_into(n, o);
         }
 
+        if ((o[0] === Opcodes.call || o[0] === Opcodes.return_call) && o[1] >= importedFuncs.length) {
+          const n = o[1] - importDelta;
+          o = [...o];
+          o.pop();
+          unsignedLEB128_into(n, o);
+        }
+
+        if (o[0] === Opcodes.call_indirect) {
+          o = [...o];
+          const params = [];
+          for (let i = 0; i < o[1]; i++) {
+            params.push(valtypeBinary, Valtype.i32);
+          }
+
+          let returns = [ valtypeBinary, Valtype.i32 ];
+          if (o.at(-1) === 'no_type_return') {
+            o.pop();
+            returns = [ valtypeBinary ];
+          }
+
+          o[1] = getType(params, returns);
+        }
+
         for (let j = 0; j < o.length; j++) {
           const x = o[j];
           if (x == null || !(x <= 0xff)) continue;

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.34.0+947ac1287",
+  "version": "0.34.1+a499f0fdc",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {},

package/runner/index.js

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