porffor 0.30.13 → 0.30.14

package/compiler/2c.js

@@ -231,20 +231,6 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
     prependMain.set('argv', `_argc = argc; _argv = argv;`);
   }
 
-  prepend.set('func decls', funcs.filter(x => x.name !== 'main').map(f => {
-    const returns = f.returns.length > 0;
-    const typedReturns = f.returnType == null;
-
-    const invLocals = inv(f.locals, x => x.idx);
-    for (const x in invLocals) {
-      invLocals[x] = sanitize(invLocals[x]);
-    }
-
-    const shouldInline = false;
-
-    return `${!typedReturns ? (returns ? CValtype[f.returns[0]] : 'void') : 'struct ReturnValue'} ${shouldInline ? 'inline ' : ''}${sanitize(f.name)}(${f.params.map((x, i) => `${CValtype[x]} ${invLocals[i]}`).join(', ')});`;
-  }).join('\n'));
-
   if (out) out += '\n';
 
   const line = (str, semi = true) => out += `${str}${semi ? ';' : ''}\n`;
@@ -438,7 +424,7 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
 
         case Opcodes.f64_const: {
           const val = i[1];
-          vals.push(val);
+          vals.push(val.toString());
           break;
         }
 
@@ -822,7 +808,7 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
             break;
           }
 
-          // log.warning('2c', `unimplemented op: ${invOpcodes[i[0]]} \x1b[90m(${f.name})`);
+          if (Prefs.d) log.warning('2c', `unimplemented op: ${invOpcodes[i[0]]} \x1b[90m(${f.name})`);
       }
 
       lastCond = false;
@@ -844,6 +830,20 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
 
   cify(funcs.find(x => x.name === 'main'));
 
+  prepend.set('func decls', funcs.filter(x => x.name !== 'main' && cified.has(x.name)).map(f => {
+    const returns = f.returns.length > 0;
+    const typedReturns = f.returnType == null;
+
+    const invLocals = inv(f.locals, x => x.idx);
+    for (const x in invLocals) {
+      invLocals[x] = sanitize(invLocals[x]);
+    }
+
+    const shouldInline = false;
+
+    return `${!typedReturns ? (returns ? CValtype[f.returns[0]] : 'void') : 'struct ReturnValue'} ${shouldInline ? 'inline ' : ''}${sanitize(f.name)}(${f.params.map((x, i) => `${CValtype[x]} ${invLocals[i]}`).join(', ')});`;
+  }).join('\n'));
+
   const makeIncludes = includes => [...includes.keys()].map(x => `#include <${x}>\n`).join('');
   out = platformSpecific(makeIncludes(winIncludes), makeIncludes(unixIncludes), false) + '\n' + makeIncludes(includes) + '\n' + alwaysPreface + [...prepend.values()].join('\n') + '\n\n' + out;
 

package/compiler/cyclone.js

@@ -53,7 +53,7 @@ export default wasm => {
     const replaceOp = newOp => {
       op.splice(0, op.length, ...newOp);
     };
-    const replaceVal = (val, valtype) => replaceOp(number(val, valtype));
+    const replaceVal = (val, valtype) => replaceOp(number(val, valtype)[0]);
 
     const empty = () => {
       stack = [];
@@ -511,7 +511,7 @@ export default wasm => {
 
           // convert f64.const -> i32.const
           const n = wasm[i - 1][1];
-          wasm.splice(i - 1, 1, number(n, Valtype.i32));
+          wasm.splice(i - 1, 1, number(n, Valtype.i32)[0]);
 
           // convert math op from f64 to i32
           wasm[i][0] = f64ToI32Op[wasm[i][0]];
@@ -551,7 +551,7 @@ export default wasm => {
 
           // convert f64.const -> i32.const
           const n = wasm[i - 2][1];
-          wasm.splice(i - 2, 1, number(n, Valtype.i32));
+          wasm.splice(i - 2, 1, number(n, Valtype.i32)[0]);
 
           // convert math op from f64 to i32
           wasm[i - 1][0] = f64ToI32Op[wasm[i - 1][0]];

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.30.13+047f11fe9",
+  "version": "0.30.14+eb0c07e0b",
   "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.30.13+047f11fe9';
+globalThis.version = '0.30.14+eb0c07e0b';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {