porffor 0.2.0-c6c8c81 → 0.2.0-c7b7423

package/compiler/2c.js

@@ -35,7 +35,10 @@ const todo = msg => {
   throw new TodoError(`todo: ${msg}`);
 };
 
-const removeBrackets = str => str.startsWith('(') && str.endsWith(')') ? str.slice(1, -1) : str;
+const removeBrackets = str => {
+  if (str.startsWith('(long)(unsigned long)')) return '(long)(unsigned long)(' + removeBrackets(str.slice(22, -1)) + ')';
+  return str.startsWith('(') && str.endsWith(')') ? str.slice(1, -1) : str;
+};
 
 export default ({ funcs, globals, tags, exceptions, pages }) => {
   const invOperatorOpcode = Object.values(operatorOpcode).reduce((acc, x) => {

package/compiler/decompile.js

@@ -116,13 +116,12 @@ export default (wasm, name = '', ind = 0, locals = {}, params = [], returns = []
   return highlightAsm(out);
 };
 
-export const highlightAsm = asm =>
-  asm
-    .replace(/(local|global|memory)\.[^\s]*/g, _ => `\x1B[31m${_}\x1B[0m`)
-    .replace(/(i(8|16|32|64)x[0-9]+|v128)(\.[^\s]*)?/g, _ => `\x1B[34m${_}\x1B[0m`)
-    .replace(/[^m](i32|i64|f32|f64|drop)(\.[^\s]*)?/g, _ => `${_[0]}\x1B[36m${_.slice(1)}\x1B[0m`)
-    .replace(/(return_call|call|br_if|br|return|throw|rethrow)/g, _ => `\x1B[35m${_}\x1B[0m`)
-    .replace(/(block|loop|if|end|else|try|catch_all|catch|delegate)/g, _ => `\x1B[95m${_}\x1B[0m`)
-    .replace(/unreachable/g, _ => `\x1B[91m${_}\x1B[0m`)
-    .replace(/ \-?[0-9\.]+/g, _ => ` \x1B[33m${_.slice(1)}\x1B[0m`)
-    .replace(/ ;;.*$/gm, _ => `\x1B[90m${_.replaceAll(/\x1B\[[0-9]+m/g, '')}\x1B[0m`);
+export const highlightAsm = asm => asm
+  .replace(/(local|global|memory)\.[^\s]*/g, _ => `\x1B[31m${_}\x1B[0m`)
+  .replace(/(i(8|16|32|64)x[0-9]+|v128)(\.[^\s]*)?/g, _ => `\x1B[34m${_}\x1B[0m`)
+  .replace(/[^m](i32|i64|f32|f64|drop)(\.[^\s]*)?/g, _ => `${_[0]}\x1B[36m${_.slice(1)}\x1B[0m`)
+  .replace(/(return_call|call|br_if|br|return|rethrow|throw)/g, _ => `\x1B[35m${_}\x1B[0m`)
+  .replace(/(block|loop|if|end|else|try|catch_all|catch|delegate)/g, _ => `\x1B[95m${_}\x1B[0m`)
+  .replace(/unreachable/g, _ => `\x1B[91m${_}\x1B[0m`)
+  .replace(/ \-?[0-9\.]+/g, _ => ` \x1B[33m${_.slice(1)}\x1B[0m`)
+  .replace(/ ;;.*$/gm, _ => `\x1B[90m${_.replaceAll(/\x1B\[[0-9]+m/g, '')}\x1B[0m`);

package/compiler/index.js

@@ -28,8 +28,8 @@ const logFuncs = (funcs, globals, exceptions) => {
 
 const getArg = name => process.argv.find(x => x.startsWith(`-${name}=`))?.slice(name.length + 2);
 
-const writeFileSync = (typeof process !== 'undefined' ? (await import('node:fs')).writeFileSync : undefined);
-const execSync = (typeof process !== 'undefined' ? (await import('node:child_process')).execSync : undefined);
+const writeFileSync = (typeof process?.version !== 'undefined' ? (await import('node:fs')).writeFileSync : undefined);
+const execSync = (typeof process?.version !== 'undefined' ? (await import('node:child_process')).execSync : undefined);
 
 export default (code, flags) => {
   globalThis.optLog = process.argv.includes('-opt-log');
@@ -75,6 +75,7 @@ export default (code, flags) => {
 
   if (target === 'c') {
     const c = toc(out);
+    out.c = c;
 
     if (outFile) {
       writeFileSync(outFile, c);
@@ -82,7 +83,7 @@ export default (code, flags) => {
       console.log(c);
     }
 
-    process.exit();
+    if (process.version) process.exit();
   }
 
   if (target === 'native') {
@@ -98,7 +99,7 @@ export default (code, flags) => {
     // obvious command escape is obvious
     execSync(args.join(' '), { stdio: 'inherit' });
 
-    process.exit();
+    if (process.version) process.exit();
   }
 
   return out;

package/compiler/parse.js

@@ -8,10 +8,16 @@ if (typeof process === 'undefined' && typeof Deno !== 'undefined') {
 
 // import { parse } from 'acorn';
 
-// todo: review which to use by default
-const parser = process.argv.find(x => x.startsWith('-parser='))?.split('=')?.[1] ?? 'acorn';
-const { parse } = (await import((globalThis.document ? 'https://esm.sh/' : '') + parser));
+let parser, parse;
+
+const loadParser = async () => {
+  parser = process.argv.find(x => x.startsWith('-parser='))?.split('=')?.[1] ?? 'acorn';
+  0, { parse } = (await import((globalThis.document ? 'https://esm.sh/' : '') + parser));
+};
+globalThis._porf_loadParser = loadParser;
+await loadParser();
 
+// todo: review which to use by default
 // supported parsers:
 // - acorn
 // - meriyah
@@ -24,8 +30,26 @@ const types = process.argv.includes('-types');
 if (types && !['@babel/parser', 'hermes-parser'].includes(parser)) log.warning('parser', `passed -types with a parser (${parser}) which does not support`);
 
 export default (input, flags) => {
-  return parse(input, {
+  const ast = parse(input, {
+    // acorn
     ecmaVersion: 'latest',
-    sourceType: flags.includes('module') ? 'module' : 'script'
+
+    // meriyah
+    next: true,
+    module: flags.includes('module'),
+    webcompat: true,
+
+    // babel
+    plugins: types ? ['estree', 'typescript'] : ['estree'],
+
+    // multiple
+    sourceType: flags.includes('module') ? 'module' : 'script',
+    ranges: false,
+    tokens: false,
+    comments: false,
   });
+
+  if (ast.type === 'File') return ast.program;
+
+  return ast;
 };

package/compiler/wrap.js

@@ -25,7 +25,7 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
   const times = [];
 
   const t1 = performance.now();
-  const { wasm, funcs, globals, tags, exceptions, pages } = compile(source, flags);
+  const { wasm, funcs, globals, tags, exceptions, pages, c } = compile(source, flags);
 
   if (source.includes('export function')) flags.push('module');
 
@@ -126,8 +126,8 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
   }
 
   if (flags.includes('decomp')) {
-    return { exports, wasm, times, decomps: funcs.map(x => decompile(x.wasm, x.name, x.index, x.locals, x.params, x.returns, funcs, globals, exceptions)) };
+    return { exports, wasm, times, decomps: funcs.map(x => decompile(x.wasm, x.name, x.index, x.locals, x.params, x.returns, funcs, globals, exceptions)), c };
   }
 
-  return { exports, wasm, times, pages };
+  return { exports, wasm, times, pages, c };
 };

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.2.0-c6c8c81",
+  "version": "0.2.0-c7b7423",
   "author": "CanadaHonk",
   "license": "MIT",
   "dependencies": {

package/tmp.c

@@ -0,0 +1,69 @@
+
+#include <stdio.h>
+
+struct ReturnValue {
+  double value;
+  long type;
+};
+
+double sum = 0;
+long sumdtype = 0;
+double counter = 0;
+long counterdtype = 0;
+
+double inline f64_f(double x, double y) {
+  return (x - ((int)(x / y) * y));
+}
+
+struct ReturnValue isPrime(double number, long numberdtype) {
+  double i = 0;
+  long idtype = 0;
+  double __tmpop_left = 0;
+  double __tmpop_right = 0;
+  long compare_left_pointer = 0;
+  long compare_left_length = 0;
+  long compare_right_pointer = 0;
+  long compare_right_length = 0;
+  long compare_index = 0;
+  long compare_index_end = 0;
+
+  if (number < 2e+0) {
+    return (struct ReturnValue){ 1, 0e+0 };
+  }
+  i = 2e+0;
+  idtype = 0;
+  while (i < number) {
+    if (f64_f(number, i) == 0e+0) {
+      return (struct ReturnValue){ 1, 0e+0 };
+    }
+    i = i + 1e+0;
+  }
+  return (struct ReturnValue){ 1, 1e+0 };
+}
+
+double inline __console_log(double x) {
+  printf("%f\n", x);
+  printf("%c", (int)(1e+1));
+}
+
+int main() {
+  long dlast_type = 0;
+  double elogicinner_tmp = 0;
+  long dtypeswitch_tmp = 0;
+
+  sum = 0e+0;
+  sumdtype = 0;
+  counter = 0e+0;
+  counterdtype = 0;
+  while (counter <= 1e+5) {
+    const struct ReturnValue _ = isPrime(counter, counterdtype);
+    dlast_type = _.type;
+    if ((unsigned long)(elogicinner_tmp = _.value) == 1e+0) {
+      sum = sum + counter;
+      sumdtype = 0;
+    }
+    counter = counter + 1e+0;
+  }
+  __console_log(sum);
+}
+