porffor 0.14.0-032e4ad08 → 0.14.0-0ad2c8a7c

package/CONTRIBUTING.md

@@ -98,7 +98,7 @@ Loads the character code at the pointer `pointer` **for a String**.[^1]
 Porffor.wasm.i32.store(pointer, length, 0, 0)
 ```
 
-Stores the length `length` at pointer `pointer`, setting the length of an object. This is mostly unneeded today as you can just do `obj.length = length`. [^2]
+Stores the length `length` at pointer `pointer`, setting the length of an object. This is mostly unneeded today as you can just do `obj.length = length`. (The `0, 4` args are necessary for the Wasm instruction, but you don't need to worry about them (`0` alignment, `0` byte offset).
 
 <br>
 
@@ -205,6 +205,7 @@ Store the character code into the `out` pointer variable, and increment it.
 - Do not set a return type for prototype methods, it can cause errors/unexpected results.
 - You cannot use other functions in the file not exported, or variables not inside the current function.
 - `if (...)` uses a fast truthy implementation which is not spec-compliant as most conditions should be strictly checked. To use spec-compliant behavior, use `if (Boolean(...))`.
+- For object (string/array/etc) literals, you must use a variable eg `const out: bytestring = 'foobar'; console.log(out);` instead of `console.log('foobar')` due to precompile's allocator constraints.
 
 <br>
 
@@ -257,6 +258,4 @@ It will also log new passes/fails. Be careful as sometimes the overall passes ca
 
 <br>
 
-[^1]: The `0, 4` args are necessary for the Wasm instruction, but you don't need to worry about them (`0` alignment, `4` byte offset for length).
-
-[^2]: The `0, 4` args are necessary for the Wasm instruction, but you don't need to worry about them (`0` alignment, `0` byte offset).
+[^1]: The `0, 4` args are necessary for the Wasm instruction, but you don't need to worry about them (`0` alignment, `4` byte offset for length).

package/README.md

@@ -14,7 +14,7 @@ Porffor is primarily built from scratch, the only thing that is not is the parse
 Expect nothing to work! Only very limited JS is currently supported. See files in `bench` for examples.
 
 ### Install
-**`npm install -g porffor`**. It's that easy (hopefully) :)
+**`npm install -g porffor@latest`**. It's that easy (hopefully) :)
 
 ### Trying a REPL
 **`porf`**. Just run it with no script file argument.

package/compiler/2c.js

@@ -207,6 +207,8 @@ export default ({ funcs, globals, tags, data, exceptions, pages }) => {
     depth = 1;
     brDepth = 0;
 
+    let retTmpId = 0;
+
     const invLocals = inv(f.locals, x => x.idx);
 
     for (const x in invLocals) {
@@ -537,7 +539,7 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
             if (func.internal) {
               vals.push(`${sanitize(func.name)}(${args.join(', ')})`);
             } else {
-              line(`const struct ReturnValue _ = ${sanitize(func.name)}(${args.join(', ')})`);
+              line(`const struct ReturnValue _${retTmpId++} = ${sanitize(func.name)}(${args.join(', ')})`);
               vals.push(`_.value`);
               vals.push(`_.type`);
             }

package/compiler/builtins/console.ts

@@ -0,0 +1,4 @@
+export const __console_clear = (): void => {
+  const clear: bytestring = '\x1b[1;1H\x1b[J';
+  Porffor.print(clear);
+};

package/compiler/builtins.js

@@ -1095,16 +1095,5 @@ export const BuiltinFuncs = function() {
     ]
   };
 
-
-  this.__fs_readFileSync = {
-    params: [ valtypeBinary, valtypeBinary ],
-    locals: [],
-    returns: [ valtypeBinary ],
-    returnType: TYPES.bytestring,
-    wasm: [
-      [ Opcodes.call, importedFuncs.__Porffor_readFile ],
-    ]
-  };
-
   GeneratedBuiltins.BuiltinFuncs.call(this);
 };

package/compiler/codegen.js

@@ -3473,19 +3473,8 @@ const withType = (scope, wasm, type) => [
 
 const generateMember = (scope, decl, _global, _name) => {
   const name = decl.object.name;
-
-  // hack: process.argv[n]
-  if (name === '__process_argv') {
-    const setPointer = scope.arrays?.get(_name);
-
-    return [
-      ...number(decl.property.value - 1),
-      ...(setPointer ? number(setPointer) : makeArray(scope, { elements: [] }, undefined, undefined, true, 'i8')[0]),
-      [ Opcodes.call, importedFuncs.__Porffor_readArgv ]
-    ];
-  }
-
   const pointer = scope.arrays?.get(name);
+
   const aotPointer = Prefs.aotPointerOpt && pointer;
 
   // hack: .name

package/compiler/decompile.js

@@ -89,6 +89,10 @@ export default (wasm, name = '', ind = 0, locals = {}, params = [], returns = []
     if (inst[0] === Opcodes.call || inst[0] === Opcodes.return_call) {
       const callFunc = funcs.find(x => x.index === inst[1]);
       if (callFunc) out += ` ;; $${callFunc.name} ${makeSignature(callFunc.params, callFunc.returns)}`;
+      if (globalThis.importFuncs && inst[1] < importFuncs.length) {
+        const importFunc = importFuncs[inst[1]];
+        out += ` ;; import ${importFunc.name} ${makeSignature(new Array(importFunc.params).fill(valtypeBinary), new Array(importFunc.returns).fill(valtypeBinary),)}`;
+      }
     }
 
     if (inst[0] === Opcodes.local_get || inst[0] === Opcodes.local_set || inst[0] === Opcodes.local_tee) {

package/compiler/generated_builtins.js

@@ -407,6 +407,16 @@ export const BuiltinFuncs = function() {
     locals: [],
     localNames: ["_this","_this#type"],
   };
+  this.__console_clear = {
+    wasm: (scope, {allocPage,builtin,}) => [...number(allocPage(scope, 'bytestring: __console_clear/clear', 'i8') * pageSize, 124),[34,0],[65,18],[16, builtin('__Porffor_print')],[68,0,0,0,0,0,0,0,0],[65,3],[15]],
+    params: [],
+    typedParams: true,
+    returns: [124,127],
+    typedReturns: true,
+    locals: [124],
+    localNames: ["clear"],
+    data: [{"offset":0,"bytes":[9,0,0,0,27,91,49,59,49,72,27,91,74]}],
+  };
   this.__crypto_randomUUID = {
     wasm: (scope, {allocPage,builtin,}) => [...number(allocPage(scope, 'bytestring: __crypto_randomUUID/bytes', 'i8') * pageSize, 127),[34,0],[34,1],[34,2],[65,16],[106],[33,3],[3,64],[32,2],[32,3],[72],[4,64],[32,2],[32,2],[65,1],[106],[33,2],[16, builtin('__Porffor_randomByte')],[58,0,4],[12,1],[11],[11],[32,1],[32,1],[45,0,10],[65,15],[113],[65,192,0],[114],[58,0,10],[32,1],[32,1],[45,0,12],[65,63],[113],[65,128,1],[114],[58,0,12],...number(allocPage(scope, 'bytestring: __crypto_randomUUID/output', 'i8') * pageSize, 127),[34,4],[33,5],[32,1],[33,6],[32,5],[65,8],[106],[33,7],[3,64],[32,5],[32,7],[72],[4,64],[32,6],[32,6],[65,1],[106],[33,6],[45,0,4],[34,8],[65,15],[113],[65,48],[106],[34,9],[65,57],[74],[4,64],[32,9],[65,39],[106],[33,9],[11],[32,8],[65,4],[117],[65,48],[106],[34,10],[65,57],[74],[4,64],[32,10],[65,39],[106],[33,10],[11],[32,5],[32,5],[65,1],[106],[33,5],[32,10],[58,0,4],[32,5],[32,5],[65,1],[106],[33,5],[32,9],[58,0,4],[12,1],[11],[11],[32,5],[65,1],[106],[34,5],[65,4],[106],[33,7],[3,64],[32,5],[32,7],[72],[4,64],[32,6],[32,6],[65,1],[106],[33,6],[45,0,4],[34,8],[65,15],[113],[65,48],[106],[34,9],[65,57],[74],[4,64],[32,9],[65,39],[106],[33,9],[11],[32,8],[65,4],[117],[65,48],[106],[34,10],[65,57],[74],[4,64],[32,10],[65,39],[106],[33,10],[11],[32,5],[32,5],[65,1],[106],[33,5],[32,10],[58,0,4],[32,5],[32,5],[65,1],[106],[33,5],[32,9],[58,0,4],[12,1],[11],[11],[32,5],[65,1],[106],[34,5],[65,4],[106],[33,7],[3,64],[32,5],[32,7],[72],[4,64],[32,6],[32,6],[65,1],[106],[33,6],[45,0,4],[34,8],[65,15],[113],[65,48],[106],[34,9],[65,57],[74],[4,64],[32,9],[65,39],[106],[33,9],[11],[32,8],[65,4],[117],[65,48],[106],[34,10],[65,57],[74],[4,64],[32,10],[65,39],[106],[33,10],[11],[32,5],[32,5],[65,1],[106],[33,5],[32,10],[58,0,4],[32,5],[32,5],[65,1],[106],[33,5],[32,9],[58,0,4],[12,1],[11],[11],[32,5],[65,1],[106],[34,5],[65,4],[106],[33,7],[3,64],[32,5],[32,7],[72],[4,64],[32,6],[32,6],[65,1],[106],[33,6],[45,0,4],[34,8],[65,15],[113],[65,48],[106],[34,9],[65,57],[74],[4,64],[32,9],[65,39],[106],[33,9],[11],[32,8],[65,4],[117],[65,48],[106],[34,10],[65,57],[74],[4,64],[32,10],[65,39],[106],[33,10],[11],[32,5],[32,5],[65,1],[106],[33,5],[32,10],[58,0,4],[32,5],[32,5],[65,1],[106],[33,5],[32,9],[58,0,4],[12,1],[11],[11],[32,5],[65,1],[106],[34,5],[65,12],[106],[33,7],[3,64],[32,5],[32,7],[72],[4,64],[32,6],[32,6],[65,1],[106],[33,6],[45,0,4],[34,8],[65,15],[113],[65,48],[106],[34,9],[65,57],[74],[4,64],[32,9],[65,39],[106],[33,9],[11],[32,8],[65,4],[117],[65,48],[106],[34,10],[65,57],[74],[4,64],[32,10],[65,39],[106],[33,10],[11],[32,5],[32,5],[65,1],[106],[33,5],[32,10],[58,0,4],[32,5],[32,5],[65,1],[106],[33,5],[32,9],[58,0,4],[12,1],[11],[11],[32,5],[65,1],[106],[33,5],[32,4],[15]],
     params: [],

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.14.0-032e4ad08",
+  "version": "0.14.0-0ad2c8a7c",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {

package/porffor_tmp.c

@@ -1,202 +0,0 @@
-#include <stdint.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-typedef uint8_t i8;
-typedef uint16_t i16;
-typedef int32_t i32;
-typedef uint32_t u32;
-typedef int64_t i64;
-typedef uint64_t u64;
-typedef float f32;
-typedef double f64;
-
-f64 NAN = 0e+0/0e+0;
-
-struct ReturnValue {
-  f64 value;
-  i32 type;
-};
-
-char _memory[131072];
-
-int _argc; char** _argv;
-i32 i32_load(i32 align, i32 offset, i32 pointer) {
-  i32 out;
-  memcpy(&out, _memory + offset + pointer, sizeof(out));
-  return out;
-}
-
-i32 i32_load8_u(i32 align, i32 offset, i32 pointer) {
-  i8 out;
-  memcpy(&out, _memory + offset + pointer, sizeof(out));
-  return out;
-}
-
-void i32_store(i32 align, i32 offset, i32 pointer, i32 value) {
-  memcpy(_memory + offset + pointer, &value, sizeof(value));
-}
-
-void __Porffor_readArgv(u32 index, u32 outPtr) {
-  if (index >= _argc) {
-    printf("expected %d arguments\n", index);
-    exit(1);
-  }
-
-  char* arg = _argv[index];
-
-  u32 read = 0;
-  char* out = _memory + outPtr + 4;
-  char ch;
-  while ((ch = *(arg++)) != 0) {
-    out[read++] = ch;
-  }
-
-  memcpy(_memory + outPtr, &read, sizeof(read));
-}
-void __Porffor_readFile(u32 pathPtr, u32 outPtr) {
-  char* path = _memory + pathPtr + 4;
-  FILE* fp = fopen(path, "r");
-  if (fp == NULL) {
-    printf("failed to open file: %s\n", path);
-    exit(1);
-  }
-
-  u32 read = 0;
-  char* out = _memory + outPtr + 4;
-  char ch;
-  while ((ch = fgetc(fp)) != EOF) {
-    out[read++] = ch;
-  }
-
-  fclose(fp);
-
-  memcpy(_memory + outPtr, &read, sizeof(read));
-}
-
-f64 out = 0;
-i32 outdtype = 0;
-
-void __Porffor_print(f64 x, i32 y) {
-  i32 a = 0;
-  i32 b = 0;
-  i32 dtypeswitch_tmp = 0;
-
-  dtypeswitch_tmp = y;
-  // block 
-    // if 
-      if (dtypeswitch_tmp == 0) {
-        printf("%g\n", x);
-        goto j0;
-      }
-    // end
-    j1:;
-    // if 
-      if (dtypeswitch_tmp == 1) {
-        // if 
-          if (((u32)x) != 0) {
-            printf("%c", (int)(1.16e+2));
-            printf("%c", (int)(1.14e+2));
-            printf("%c", (int)(1.17e+2));
-            printf("%c", (int)(1.01e+2));
-          } else {
-            printf("%c", (int)(1.02e+2));
-            printf("%c", (int)(9.7e+1));
-            printf("%c", (int)(1.08e+2));
-            printf("%c", (int)(1.15e+2));
-            printf("%c", (int)(1.01e+2));
-          }
-        // end
-        j3:;
-        goto j0;
-      }
-    // end
-    j2:;
-    // if 
-      if (dtypeswitch_tmp == 3) {
-        printf("%c", (int)(1.17e+2));
-        printf("%c", (int)(1.1e+2));
-        printf("%c", (int)(1e+2));
-        printf("%c", (int)(1.01e+2));
-        printf("%c", (int)(1.02e+2));
-        printf("%c", (int)(1.05e+2));
-        printf("%c", (int)(1.1e+2));
-        printf("%c", (int)(1.01e+2));
-        printf("%c", (int)(1e+2));
-        goto j0;
-      }
-    // end
-    j4:;
-    // if 
-      if (dtypeswitch_tmp == 4) {
-        // if 
-          if (((u32)x) != 0) {
-            printf("%c", (int)(1.23e+2));
-            printf("%c", (int)(1.25e+2));
-          } else {
-            printf("%c", (int)(1.1e+2));
-            printf("%c", (int)(1.17e+2));
-            printf("%c", (int)(1.08e+2));
-            printf("%c", (int)(1.08e+2));
-          }
-        // end
-        j6:;
-        goto j0;
-      }
-    // end
-    j5:;
-    // if 
-      if (dtypeswitch_tmp == 5) {
-        printf("%c", (int)(1.02e+2));
-        printf("%c", (int)(1.17e+2));
-        printf("%c", (int)(1.1e+2));
-        printf("%c", (int)(9.9e+1));
-        printf("%c", (int)(1.16e+2));
-        printf("%c", (int)(1.05e+2));
-        printf("%c", (int)(1.11e+2));
-        printf("%c", (int)(1.1e+2));
-        printf("%c", (int)(3.2e+1));
-        printf("%c", (int)(4e+1));
-        printf("%c", (int)(4.1e+1));
-        printf("%c", (int)(3.2e+1));
-        printf("%c", (int)(1.23e+2));
-        printf("%c", (int)(1.25e+2));
-        goto j0;
-      }
-    // end
-    j7:;
-    // if 
-      if (dtypeswitch_tmp == 18) {
-        a = (u32)x;
-        b = i32_load(1, 0, a) + a;
-        // loop 
-        j9:;
-          printf("%c", (int)((f64)(i32_load8_u(0, 4, a))));
-          a = a + 1;
-          if (a != b) {
-            goto j9;
-          }
-        // end
-        goto j0;
-      }
-    // end
-    j8:;
-    printf("%g\n", x);
-  // end
-  j0:;
-}
-
-int main(int argc, char* argv[]) {
-_argc = argc; _argv = argv;
-
-  out = 1e+0;
-  outdtype = 18;
-  i32_store(1, 0, 65536, 0);
-  __Porffor_readArgv((u32)(0e+0), (u32)(6.5536e+4));
-  __Porffor_readFile((u32)(undefined), (u32)(out));
-  __Porffor_print(out, outdtype);
-  printf("%c", (int)(1e+1));
-
-  return 0;
-}