porffor 0.2.0-fbab1de → 0.2.0-fde989a

package/compiler/builtins.js

@@ -170,25 +170,6 @@ export const BuiltinFuncs = function() {
     ]
   };
 
-  // todo: return false for NaN
-  this.Boolean = {
-    params: [ valtypeBinary ],
-    locals: [],
-    returns: [ valtypeBinary ],
-    returnType: 'boolean',
-    wasm: [
-      [ Opcodes.local_get, 0 ],
-      ...(valtype === 'f64' ? [
-        ...number(0),
-        [ Opcodes.f64_ne ]
-      ] : [
-        ...Opcodes.eqz,
-        [ Opcodes.i32_eqz ]
-      ]),
-      Opcodes.i32_from
-    ]
-  };
-
   // just return given (default 0) for (new) Object() as we somewhat supports object just not constructor
   this.Object = {
     params: [ valtypeBinary ],
@@ -699,6 +680,49 @@ export const BuiltinFuncs = function() {
   };
 
 
+  this.__Porffor_type = {
+    params: [ valtypeBinary, Valtype.i32 ],
+    typedParams: true,
+    locals: [ Valtype.i32, Valtype.i32 ],
+    returns: [ valtypeBinary ],
+    returnType: process.argv.includes('-bytestring') ? '_bytestring' : 'string',
+    wasm: (scope, { TYPE_NAMES, typeSwitch, makeString }) => {
+      const bc = {};
+      for (const x in TYPE_NAMES) {
+        bc[x] = makeString(scope, TYPE_NAMES[x], false, '#Porffor_type_result');
+      }
+
+      return typeSwitch(scope, [ [ Opcodes.local_get, 1 ] ], bc);
+    }
+  };
+
+  const localIsOneOf = (getter, arr, valtype = valtypeBinary) => {
+    const out = [];
+
+    for (let i = 0; i < arr.length; i++) {
+      out.push(...getter, ...number(arr[i], valtype), valtype === Valtype.f64 ? [ Opcodes.f64_eq ] : [ Opcodes.i32_eq ]);
+      if (i !== 0) out.push([ Opcodes.i32_or ]);
+    }
+
+    return out;
+  };
+
+  this.__Porffor_pointer = {
+    params: [ valtypeBinary, Valtype.i32 ],
+    typedParams: true,
+    locals: [ Valtype.i32, Valtype.i32 ],
+    returns: [ valtypeBinary ],
+    wasm: (scope, { TYPES }) => [
+      ...localIsOneOf([ [ Opcodes.local_get, 1 ] ], [ TYPES.string, TYPES._array, TYPES._bytestring ], Valtype.i32),
+      [ Opcodes.if, valtypeBinary ],
+      [ Opcodes.local_get, 0 ],
+      [ Opcodes.else ],
+      ...number(NaN),
+      [ Opcodes.end ]
+    ]
+  };
+
+
   this.__SIMD_i32x4_load = {
     params: [ Valtype.i32 ],
     locals: [],

package/compiler/codeGen.js

@@ -160,7 +160,7 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
 
     case 'TaggedTemplateExpression': {
       const funcs = {
-        asm: str => {
+        __Porffor_asm: str => {
           let out = [];
 
           for (const line of str.split('\n')) {
@@ -196,19 +196,19 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
           return out;
         },
 
-        __internal_print_type: str => {
-          const type = getType(scope, str) - TYPES.number;
+        __Porffor_bs: str => [
+          ...makeString(scope, str, undefined, undefined, true),
 
-          return [
-            ...number(type),
-            [ Opcodes.call, importedFuncs.print ],
+          ...number(TYPES._bytestring, Valtype.i32),
+          setLastType(scope)
+        ],
+        __Porffor_s: str => [
+          ...makeString(scope, str, undefined, undefined, false),
 
-            // newline
-            ...number(10),
-            [ Opcodes.call, importedFuncs.printChar ]
-          ];
-        }
-      }
+          ...number(TYPES.string, Valtype.i32),
+          setLastType(scope)
+        ],
+      };
 
       const name = decl.tag.name;
       // hack for inline asm
@@ -274,25 +274,25 @@ const generateIdent = (scope, decl) => {
     const name = mapName(rawName);
     let local = scope.locals[rawName];
 
-    if (builtinVars[name]) {
+    if (Object.hasOwn(builtinVars, name)) {
       if (builtinVars[name].floatOnly && valtype[0] === 'i') throw new Error(`Cannot use ${unhackName(name)} with integer valtype`);
       return builtinVars[name];
     }
 
-    if (builtinFuncs[name] || internalConstrs[name]) {
+    if (Object.hasOwn(builtinFuncs, name) || Object.hasOwn(internalConstrs, name)) {
       // todo: return an actual something
       return number(1);
     }
 
-    if (local === undefined) {
+    if (local?.idx === undefined) {
       // no local var with name
-      if (importedFuncs.hasOwnProperty(name)) return number(importedFuncs[name]);
-      if (funcIndex[name] !== undefined) return number(funcIndex[name]);
+      if (Object.hasOwn(importedFuncs, name)) return number(importedFuncs[name]);
+      if (Object.hasOwn(funcIndex, name)) return number(funcIndex[name]);
 
-      if (globals[name] !== undefined) return [ [ Opcodes.global_get, globals[name].idx ] ];
+      if (Object.hasOwn(globals, name)) return [ [ Opcodes.global_get, globals[name].idx ] ];
     }
 
-    if (local === undefined && rawName.startsWith('__')) {
+    if (local?.idx === undefined && rawName.startsWith('__')) {
       // return undefined if unknown key in already known var
       let parent = rawName.slice(2).split('_').slice(0, -1).join('_');
       if (parent.includes('_')) parent = '__' + parent;
@@ -301,7 +301,7 @@ const generateIdent = (scope, decl) => {
       if (!parentLookup[1]) return number(UNDEFINED);
     }
 
-    if (local === undefined) return internalThrow(scope, 'ReferenceError', `${unhackName(name)} is not defined`, true);
+    if (local?.idx === undefined) return internalThrow(scope, 'ReferenceError', `${unhackName(name)} is not defined`, true);
 
     return [ [ Opcodes.local_get, local.idx ] ];
   };
@@ -925,7 +925,7 @@ const performOp = (scope, op, left, right, leftType, rightType, _global = false,
       [ Opcodes.i32_or ],
       [ Opcodes.if, Blocktype.void ],
       ...number(0, Valtype.i32),
-      [ Opcodes.br, 1 ],
+      [ Opcodes.br, 2 ],
       [ Opcodes.end ],
 
       ...compareStrings(scope, [ [ Opcodes.local_get, tmpLeft ] ], [ [ Opcodes.local_get, tmpRight ] ]),
@@ -981,7 +981,7 @@ const asmFunc = (name, { wasm, params, locals: localTypes, globals: globalTypes
       localInd: allLocals.length,
     };
 
-    wasm = wasm(scope, { TYPES, typeSwitch, makeArray });
+    wasm = wasm(scope, { TYPES, TYPE_NAMES, typeSwitch, makeArray, makeString });
   }
 
   let baseGlobalIdx, i = 0;
@@ -1286,8 +1286,8 @@ const getNodeType = (scope, node) => {
 const generateLiteral = (scope, decl, global, name) => {
   if (decl.value === null) return number(NULL);
 
+  // hack: just return 1 for regex literals
   if (decl.regex) {
-    scope.regex[name] = decl.regex;
     return number(1);
   }
 
@@ -1932,6 +1932,8 @@ const generateVar = (scope, decl) => {
   for (const x of decl.declarations) {
     const name = mapName(x.id.name);
 
+    if (!name) return todo('destructuring is not supported yet');
+
     if (x.init && isFuncType(x.init.type)) {
       // hack for let a = function () { ... }
       x.init.id = { name };
@@ -2070,6 +2072,8 @@ const generateAssign = (scope, decl) => {
     ];
   }
 
+  if (!name) return todo('destructuring is not supported yet');
+
   const [ local, isGlobal ] = lookupName(scope, name);
 
   if (local === undefined) {
@@ -2383,7 +2387,13 @@ const generateForOf = (scope, decl) => {
   // setup local for left
   generate(scope, decl.left);
 
-  const leftName = decl.left.declarations[0].id.name;
+  let leftName = decl.left.declarations?.[0]?.id?.name;
+  if (!leftName && decl.left.name) {
+    leftName = decl.left.name;
+
+    generateVar(scope, { kind: 'var', _bare: true, declarations: [ { id: { name: leftName } } ] })
+  }
+
   const [ local, isGlobal ] = lookupName(scope, leftName);
 
   depth.push('block');
@@ -2626,15 +2636,14 @@ const StoreOps = {
 
 let data = [];
 
-const compileBytes = (val, itemType, signed = true) => {
+const compileBytes = (val, itemType) => {
   // todo: this is a mess and needs confirming / ????
   switch (itemType) {
     case 'i8': return [ val % 256 ];
-    case 'i16': return [ val % 256, Math.floor(val / 256) ];
-
-    case 'i32':
-    case 'i64':
-      return enforceFourBytes(signedLEB128(val));
+    case 'i16': return [ val % 256, (val / 256 | 0) % 256 ];
+    case 'i16': return [ val % 256, (val / 256 | 0) % 256 ];
+    case 'i32': return [...new Uint8Array(new Int32Array([ val ]).buffer)];
+    // todo: i64
 
     case 'f64': return ieee754_binary64(val);
   }
@@ -2724,7 +2733,7 @@ const byteStringable = str => {
   return true;
 };
 
-const makeString = (scope, str, global = false, name = '$undeclared') => {
+const makeString = (scope, str, global = false, name = '$undeclared', forceBytestring = undefined) => {
   const rawElements = new Array(str.length);
   let byteStringable = process.argv.includes('-bytestring');
   for (let i = 0; i < str.length; i++) {
@@ -2734,6 +2743,8 @@ const makeString = (scope, str, global = false, name = '$undeclared') => {
     if (byteStringable && c > 0xFF) byteStringable = false;
   }
 
+  if (byteStringable && forceBytestring === false) byteStringable = false;
+
   return makeArray(scope, {
     rawElements
   }, global, name, false, byteStringable ? 'i8' : 'i16')[0];
@@ -2859,7 +2870,7 @@ export const generateMember = (scope, decl, _global, _name) => {
       setLastType(scope)
     ],
 
-    default: [ [ Opcodes.unreachable ] ]
+    default: internalThrow(scope, 'TypeError', 'Member expression is not supported for non-string non-array yet')
   });
 };
 
@@ -2981,6 +2992,16 @@ const generateCode = (scope, decl) => {
 };
 
 const internalConstrs = {
+  Boolean: {
+    generate: (scope, decl) => {
+      if (decl.arguments.length === 0) return number(0);
+
+      // should generate/run all args
+      return truthy(scope, generate(scope, decl.arguments[0]), getNodeType(scope, decl.arguments[0]), false, false);
+    },
+    type: TYPES.boolean
+  },
+
   Array: {
     generate: (scope, decl, global, name) => {
       // new Array(i0, i1, ...)

package/compiler/index.js

@@ -68,11 +68,17 @@ export default (code, flags) => {
     console.log([...pages.keys()].map(x => `\x1B[36m - ${x}\x1B[0m`).join('\n') + '\n');
   }
 
-  const out = { wasm: sections, funcs, globals, tags, exceptions, pages };
+  const out = { wasm: sections, funcs, globals, tags, exceptions, pages, data };
 
   const target = getArg('target') ?? getArg('t') ?? 'wasm';
   const outFile = getArg('o');
 
+  if (target === 'wasm' && outFile) {
+    writeFileSync(outFile, Buffer.from(sections));
+
+    if (process.version) process.exit();
+  }
+
   if (target === 'c') {
     const c = toc(out);
     out.c = c;
@@ -87,11 +93,16 @@ export default (code, flags) => {
   }
 
   if (target === 'native') {
-    const compiler = getArg('compiler') ?? 'clang';
+    let compiler = getArg('compiler') ?? 'clang';
     const cO = getArg('cO') ?? 'Ofast';
 
+    if (compiler === 'zig') compiler = [ 'zig', 'cc' ];
+      else compiler = [ compiler ];
+
     const tmpfile = 'tmp.c';
-    const args = [ compiler, tmpfile, '-o', outFile ?? (process.platform === 'win32' ? 'out.exe' : 'out'), '-' + cO, '-march=native' ];
+    // const args = [ compiler, tmpfile, '-o', outFile ?? (process.platform === 'win32' ? 'out.exe' : 'out'), '-' + cO, '-march=native', '-s', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables', '-ffunction-sections', '-fdata-sections', '-Wl', '-fno-ident', '-fno-exceptions', '-ffast-math' ];
+    // const args = [ ...compiler, tmpfile, '-o', outFile ?? (process.platform === 'win32' ? 'out.exe' : 'out'), '-' + cO, '-march=native', '-s', '-ffast-math', '-fno-exceptions', '-target', 'x86_64-linux' ];
+    const args = [ ...compiler, tmpfile, '-o', outFile ?? (process.platform === 'win32' ? 'out.exe' : 'out'), '-' + cO, '-march=native', '-s', '-ffast-math', '-fno-exceptions' ];
 
     const c = toc(out);
     writeFileSync(tmpfile, c);

package/filesize.cmd

@@ -0,0 +1,2 @@
+@echo off
+echo %~z1

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-fbab1de",
+  "version": "0.2.0-fde989a",
   "author": "CanadaHonk",
   "license": "MIT",
   "dependencies": {

package/porf

@@ -0,0 +1,2 @@
+#!/bin/sh
+node runner/index.js "$@"

package/runner/index.js

@@ -15,9 +15,22 @@ if (process.argv.includes('-compile-hints')) {
   // --experimental-wasm-return-call (on by default)
 }
 
-const file = process.argv.slice(2).find(x => x[0] !== '-');
+let file = process.argv.slice(2).find(x => x[0] !== '-');
+if (['run', 'wasm', 'native', 'c'].includes(file)) {
+  if (['wasm', 'native', 'c'].includes(file)) {
+    process.argv.push(`-target=${file}`);
+  }
+
+  file = process.argv.slice(process.argv.indexOf(file) + 1).find(x => x[0] !== '-');
+
+  const nonOptOutFile = process.argv.slice(process.argv.indexOf(file) + 1).find(x => x[0] !== '-');
+  if (nonOptOutFile) {
+    process.argv.push(`-o=${nonOptOutFile}`);
+  }
+}
+
 if (!file) {
-  if (process.argv.includes('-v')) {
+  if (process.argv.includes('-v') || process.argv.includes('--version')) {
     // just print version
     console.log((await import('./version.js')).default);
     process.exit(0);