porffor 0.37.12 → 0.37.14

package/compiler/2c.js

@@ -208,12 +208,11 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
   for (const x in globals) {
     const g = globals[x];
 
-    out += `${CValtype[g.type]} ${sanitize(x)} = ${g.init ?? 0}`;
-    out += ';\n';
+    out += `${CValtype[g.type]} ${sanitize(x)} = ${g.init ?? 0};\n`;
   }
 
   if (pages.size > 0) {
-    prepend.set('_memory', `char _memory[${pages.size * pageSize}];\n`);
+    prepend.set('_memory', `static char _memory[${pages.size * pageSize}];\n`);
     if (Prefs['2cMemcpy']) includes.set('string.h', true);
   }
 
@@ -222,9 +221,8 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
     const dataOffset = x => pages.get(x.page).ind * pageSize;
     if (Prefs['2cMemcpy']) {
       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', activeData.map(x => x.bytes.reduce((acc, y, i) => acc + `_memory[${dataOffset(x) + i}]=(u8)${y};`, '')).join('\n  '));
+      prependMain.set('_data', activeData.map(x => x.bytes.reduce((acc, y, i) => acc + (y === 0 ? '' : `_memory[${dataOffset(x) + i}]=(u8)${y};`), '')).join('\n  '));
     }
   }
 

package/compiler/builtins/__internal_string.ts

@@ -17,9 +17,56 @@ export const __Porffor_strcmp = (a: any, b: any): boolean => {
       // bytestring, bytestring
       // this path is hyper-optimized as it is by far the most common and (perf) important
 
-      let ap: i32 = a - 4;
-      let bp: i32 = b - 4;
+      let ap: i32 = a - 28;
+      let bp: i32 = b - 28;
       Porffor.wasm`
+;; load in 2 i64x2 chunks while length >= 32
+local.get ${al}
+i32.const 32
+i32.ge_s
+if 64
+  loop 64
+    local.get ${ap}
+    local.get ${al}
+    i32.add
+    v128.load 0 0
+
+    local.get ${bp}
+    local.get ${al}
+    i32.add
+    v128.load 0 0
+
+    v128.xor
+
+    local.get ${ap}
+    local.get ${al}
+    i32.add
+    v128.load 0 16
+
+    local.get ${bp}
+    local.get ${al}
+    i32.add
+    v128.load 0 16
+
+    v128.xor
+    v128.or
+    v128.any_true
+    if 64
+      i32.const 0
+      i32.const 2
+      return
+    end
+
+    local.get ${al}
+    i32.const 32
+    i32.sub
+    local.tee ${al}
+    i32.const 32
+    i32.ge_s
+    br_if 0
+  end
+end
+
 ;; load in i64 chunks while length >= 8
 local.get ${al}
 i32.const 8
@@ -29,12 +76,12 @@ if 64
     local.get ${ap}
     local.get ${al}
     i32.add
-    i64.load 0 0
+    i64.load 0 24
 
     local.get ${bp}
     local.get ${al}
     i32.add
-    i64.load 0 0
+    i64.load 0 24
 
     i64.ne
     if 64
@@ -59,15 +106,15 @@ i32.const 2
 i32.ge_s
 if 64
   loop 64
-    local.get ${ap}
+    local.get ${a}
     local.get ${al}
     i32.add
-    i32.load16_u 0 6
+    i32.load16_u 0 2
 
-    local.get ${bp}
+    local.get ${b}
     local.get ${al}
     i32.add
-    i32.load16_u 0 6
+    i32.load16_u 0 2
 
     i32.ne
     if 64

package/compiler/builtins_precompiled.js

@@ -17,7 +17,7 @@ usedTypes:[80,7,195],
 globalInits:{underlyingKeys:(_,{allocPage,glbl,loc})=>[...number(allocPage(_,'array: __internal_object.ts/underlyingKeys','f64'),124),...glbl(36,'underlyingKeys',124),...glbl(35,'underlyingKeys',124),[252,3],[33,loc('#makearray_pointer_tmp',127)],[32,loc('#makearray_pointer_tmp',127)],[65,0],[54,1,0],[32,loc('#makearray_pointer_tmp',127)],[68,0],[252,3],[54,1,0],[32,loc('#makearray_pointer_tmp',127)],[26]],underlyingVals:(_,{allocPage,glbl,loc})=>[...number(allocPage(_,'array: __internal_object.ts/underlyingVals','f64'),124),...glbl(36,'underlyingVals',124),...glbl(35,'underlyingVals',124),[252,3],[33,loc('#makearray_pointer_tmp',127)],[32,loc('#makearray_pointer_tmp',127)],[65,0],[54,1,0],[32,loc('#makearray_pointer_tmp',127)],[68,0],[252,3],[54,1,0],[32,loc('#makearray_pointer_tmp',127)],[26]]},data:{"bytestring: __Porffor_object_makeObject/key1":[9,0,0,0,112,114,111,116,111,116,121,112,101],"bytestring: __Porffor_object_makeObject/key2":[11,0,0,0,99,111,110,115,116,114,117,99,116,111,114]},
 };
 this.__Porffor_strcmp = {
-wasm:()=>[[32,0],[32,2],[70],[4,64],[65,1],[65,2],[15],[11],[32,0],[40,0,0],[33,4],[32,2],[40,0,0],[33,5],[32,4],[32,5],[71],[4,64],[65,0],[65,2],[15],[11],[32,1],[65,195,1],[70],[4,64],[32,3],[65,195,1],[70],[4,64],[32,0],[65,4],[107],[33,6],[32,2],[65,4],[107],[33,7],[32,4],[65,8],[78],[4,64],[3,64],[32,6],[32,4],[106],[41,0,0],[32,7],[32,4],[106],[41,0,0],[82],[4,64],[65,0],[65,2],[15],[11],[32,4],[65,8],[107],[34,4],[65,8],[78],[13,0],[11],[11],[32,4],[65,2],[78],[4,64],[3,64],[32,6],[32,4],[106],[47,0,6],[32,7],[32,4],[106],[47,0,6],[71],[4,64],[65,0],[65,2],[15],[11],[32,4],[65,2],[107],[34,4],[65,2],[78],[13,0],[11],[11],[32,4],[65,1],[70],[4,64],[32,0],[45,0,4],[32,2],[45,0,4],[71],[4,64],[65,0],[65,2],[15],[11],[11],[65,1],[65,2],[15],[5],[65,0],[33,8],[3,64],[32,8],[32,4],[72],[4,64],[32,0],[32,8],[106],[45,0,4],[32,2],[32,8],[65,2],[108],[106],[47,0,4],[71],[4,64],[65,0],[65,2],[15],[11],[32,8],[65,1],[106],[33,8],[12,1],[11],[11],[65,1],[65,2],[15],[11],[5],[32,3],[65,195,1],[70],[4,64],[65,0],[33,8],[3,64],[32,8],[32,4],[72],[4,64],[32,0],[32,8],[65,2],[108],[106],[47,0,4],[32,2],[32,8],[106],[45,0,4],[71],[4,64],[65,0],[65,2],[15],[11],[32,8],[65,1],[106],[33,8],[12,1],[11],[11],[65,1],[65,2],[15],[5],[32,0],[65,4],[107],[33,6],[32,2],[65,4],[107],[33,7],[3,64],[32,6],[32,4],[65,2],[108],[106],[41,0,0],[32,7],[32,4],[65,2],[108],[106],[41,0,0],[82],[4,64],[65,0],[65,2],[15],[11],[32,4],[65,4],[107],[34,4],[65,4],[78],[13,0],[11],[65,0],[33,8],[3,64],[32,8],[32,4],[72],[4,64],[32,0],[32,8],[65,2],[108],[106],[47,0,4],[32,2],[32,8],[65,2],[108],[106],[47,0,4],[71],[4,64],[65,0],[65,2],[15],[11],[32,8],[65,1],[106],[33,8],[12,1],[11],[11],[65,1],[65,2],[15],[11],[11],[65,0],[65,128,1],[15]],
+wasm:()=>[[32,0],[32,2],[70],[4,64],[65,1],[65,2],[15],[11],[32,0],[40,0,0],[33,4],[32,2],[40,0,0],[33,5],[32,4],[32,5],[71],[4,64],[65,0],[65,2],[15],[11],[32,1],[65,195,1],[70],[4,64],[32,3],[65,195,1],[70],[4,64],[32,0],[65,28],[107],[33,6],[32,2],[65,28],[107],[33,7],[32,4],[65,32],[78],[4,64],[3,64],[32,6],[32,4],[106],[253,0,0,0],[32,7],[32,4],[106],[253,0,0,0],[253,81],[32,6],[32,4],[106],[253,0,0,16],[32,7],[32,4],[106],[253,0,0,16],[253,81],[253,80],[253,83],[4,64],[65,0],[65,2],[15],[11],[32,4],[65,32],[107],[34,4],[65,32],[78],[13,0],[11],[11],[32,4],[65,8],[78],[4,64],[3,64],[32,6],[32,4],[106],[41,0,24],[32,7],[32,4],[106],[41,0,24],[82],[4,64],[65,0],[65,2],[15],[11],[32,4],[65,8],[107],[34,4],[65,8],[78],[13,0],[11],[11],[32,4],[65,2],[78],[4,64],[3,64],[32,0],[32,4],[106],[47,0,2],[32,2],[32,4],[106],[47,0,2],[71],[4,64],[65,0],[65,2],[15],[11],[32,4],[65,2],[107],[34,4],[65,2],[78],[13,0],[11],[11],[32,4],[65,1],[70],[4,64],[32,0],[45,0,4],[32,2],[45,0,4],[71],[4,64],[65,0],[65,2],[15],[11],[11],[65,1],[65,2],[15],[5],[65,0],[33,8],[3,64],[32,8],[32,4],[72],[4,64],[32,0],[32,8],[106],[45,0,4],[32,2],[32,8],[65,2],[108],[106],[47,0,4],[71],[4,64],[65,0],[65,2],[15],[11],[32,8],[65,1],[106],[33,8],[12,1],[11],[11],[65,1],[65,2],[15],[11],[5],[32,3],[65,195,1],[70],[4,64],[65,0],[33,8],[3,64],[32,8],[32,4],[72],[4,64],[32,0],[32,8],[65,2],[108],[106],[47,0,4],[32,2],[32,8],[106],[45,0,4],[71],[4,64],[65,0],[65,2],[15],[11],[32,8],[65,1],[106],[33,8],[12,1],[11],[11],[65,1],[65,2],[15],[5],[32,0],[65,4],[107],[33,6],[32,2],[65,4],[107],[33,7],[3,64],[32,6],[32,4],[65,2],[108],[106],[41,0,0],[32,7],[32,4],[65,2],[108],[106],[41,0,0],[82],[4,64],[65,0],[65,2],[15],[11],[32,4],[65,4],[107],[34,4],[65,4],[78],[13,0],[11],[65,0],[33,8],[3,64],[32,8],[32,4],[72],[4,64],[32,0],[32,8],[65,2],[108],[106],[47,0,4],[32,2],[32,8],[65,2],[108],[106],[47,0,4],[71],[4,64],[65,0],[65,2],[15],[11],[32,8],[65,1],[106],[33,8],[12,1],[11],[11],[65,1],[65,2],[15],[11],[11],[65,0],[65,128,1],[15]],
 params:[127,127,127,127],typedParams:1,returns:[127,127],typedReturns:1,
 locals:[127,127,127,127,127],localNames:["a","a#type","b","b#type","al","bl","ap","bp","i"],
 };

package/compiler/index.js

@@ -256,7 +256,7 @@ export default (code, flags) => {
       if (logProgress) {
         const total = performance.now();
         progressClear();
-        console.log(`\u001b[90m[${total.toFixed(0)}ms]\u001b[0m \u001b[92mcompiled ${globalThis.file} -> ${outFile}\u001b[0m`);
+        console.log(`\u001b[90m[${total.toFixed(0)}ms]\u001b[0m \u001b[32mcompiled ${globalThis.file} \u001b[90m->\u001b[0m \u001b[92m${outFile}\u001b[90m (${(fs.statSync(outFile).size / 1000).toFixed(1)}KB)\u001b[0m`);
       }
 
       process.exit();

package/compiler/wasmSpec.js

@@ -217,6 +217,10 @@ export const Opcodes = {
   i32x4_add: [ 0xfd, 0xae, 0x01 ],
   i32x4_sub: [ 0xfd, 0xb1, 0x01 ],
   i32x4_mul: [ 0xfd, 0xb5, 0x01 ],
+
+  v128_or: [ 0xfd, 80 ],
+  v128_xor: [ 0xfd, 81 ],
+  v128_any_true: [ 0xfd, 83 ]
 };
 
 export const FuncType = 0x60;

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.37.12+3c9b430f0",
+  "version": "0.37.14+ebe5bcdbc",
   "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.37.12+3c9b430f0';
+globalThis.version = '0.37.14+ebe5bcdbc';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {