porffor 0.60.0 → 0.60.1

package/compiler/2c.js

@@ -221,6 +221,7 @@ export default ({ funcs, globals, data, pages }) => {
     includes.set('stdlib.h', true);
     prepend.set('_memory', `char* _memory; u32 _memoryPages = ${Math.ceil((pages.size * pageSize) / PageSize)};\n`);
     prependMain.set('_initMemory', `_memory = malloc(_memoryPages * ${PageSize});\n`);
+    prependMain.set('_initMemory', `_memory = calloc(1, _memoryPages * ${PageSize});\n`);
     if (Prefs['2cMemcpy']) includes.set('string.h', true);
   }
 
@@ -278,6 +279,9 @@ export default ({ funcs, globals, data, pages }) => {
   let ffiFuncs = {};
   const cified = new Set();
   const cify = f => {
+    if (cified.has(f.name)) return '';
+    cified.add(f.name);
+
     let out = '';
 
     let depth = 1;
@@ -457,6 +461,16 @@ export default ({ funcs, globals, data, pages }) => {
           case 0x03:
             vals.push(`(u32)(${vals.pop()})`);
             break;
+
+          // memory_copy
+          case 0x0a: {
+            const size = vals.pop();
+            const src = vals.pop();
+            const dst = vals.pop();
+            line(`memcpy(_memory + ${dst}, _memory + ${src}, ${size})`);
+            includes.set('string.h', true);
+            break;
+          }
         }
 
         lastCond = false;
@@ -609,26 +623,21 @@ export default ({ funcs, globals, data, pages }) => {
                 includes.set('stdio.h', true);
                 break;
 
-              case 'time':
-                line(`double _time_out`);
-                platformSpecific(
-`LARGE_INTEGER _time_freq, _time_t;
-QueryPerformanceFrequency(&_time_freq);
-QueryPerformanceCounter(&_time_t);
-_time_out = ((double)_time_t.QuadPart / _time_freq.QuadPart) * 1000.;`,
-`struct timespec _time;
-clock_gettime(CLOCK_MONOTONIC, &_time);
-_time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
-                vals.push(`_time_out`);
-
-                unixIncludes.set('time.h', true);
-                winIncludes.set('windows.h', true);
+              case 'time': {
+                const id = tmpId++;
+                line(`time_t _time_t${id}`);
+                line(`time(&_time_t${id})`);
+                line(`f64 _time_out${id} = (f64)_time_t${id} * 1000.0`);
+                vals.push(`_time_out${id}`);
+
+                includes.set('time.h', true);
                 break;
+              }
 
-              case 'timeOrigin':
-                // todo: actually implement
-                vals.push('0');
+              case 'timeOrigin': {
+                vals.push('0.0');
                 break;
+              }
 
               case '__Porffor_readArgv': {
                 prepend.set('__Porffor_readArgv',
@@ -698,11 +707,8 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
             break;
           }
 
-          if (!cified.has(func.name) && func.name !== f.name) {
-            cified.add(func.name);
-            if (!ffiFuncs[func.name]) {
-              cify(func);
-            }
+          if (!cified.has(func.name) && !ffiFuncs[func.name]) {
+            cify(func);
           }
 
           let args = [];
@@ -804,10 +810,10 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
           const val = vals.pop();
           line(`printf("Uncaught ")`);
 
-          const id = tmpId++;
-          line(`const struct ReturnValue _t${id} = __ecma262_ToString(${val}, ${type})`);
-          line(`__Porffor_printString(_t${id}.value, _t${id}.type)`);
-          line(`printf("\\n")`);
+          // const id = tmpId++;
+          // line(`const struct ReturnValue _t${id} = __ecma262_ToString(${val}, ${type})`);
+          // line(`__Porffor_printString(_t${id}.value, _t${id}.type)`);
+          // line(`printf("\\n")`);
           line(`exit(1)`);
 
           includes.set('stdio.h', true);
@@ -857,18 +863,31 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
           includes.set('math.h', true);
           break;
         case Opcodes.f64_trunc:
-          vals.push(`(i32)(${removeBrackets(vals.pop())})`); // this is ~10x faster than math.h's trunc() with clang??
+          vals.push(`trunc(${vals.pop()})`);
+          includes.set('math.h', true);
           break;
         case Opcodes.f64_nearest:
           vals.push(`round(${vals.pop()})`);
           includes.set('math.h', true);
           break;
 
+        case Opcodes.i32_rotl: {
+          const shift = vals.pop();
+          const x = vals.pop();
+          const id = tmpId++;
+          line(`const i32 _x${id} = ${x}`);
+          line(`const i32 _shift${id} = ${shift}`);
+          line(`const i32 _out${id} = (_x${id} << _shift${id}) | (_x${id} >> (32 - _shift${id}))`);
+          vals.push(`_out${id}`);
+          break;
+        }
+
         case Opcodes.memory_grow: {
           const id = localTmpId++;
           line(`const u32 _oldPages${id} = _memoryPages`);
           line(`_memoryPages += ${vals.pop()}`);
           line(`_memory = realloc(_memory, _memoryPages * ${PageSize})`);
+          line(`memset(_memory + (_memoryPages - 1) * ${PageSize}, 0, ${PageSize})`);
           vals.push(`_oldPages${id}`);
           break;
         }
@@ -912,7 +931,9 @@ _time_out = _time.tv_nsec / 1000000. + _time.tv_sec * 1000.;`);
     globalThis.out = globalThis.out + out;
   };
 
-  cify(funcs.find(x => x.name === '#main'));
+  for (const x of funcs) {
+    if (x.export || x.name === '#main') cify(x);
+  }
 
   const rawParams = f => {
     if (ffiFuncs[f.name]) return ffiFuncs[f.name].parameters;

package/compiler/builtins/math.ts

@@ -427,15 +427,23 @@ export const __Math_asin = (x: number): number => {
 export const __Math_acos = (x: number): number => Math.asin(x) - Math.PI / 2;
 
 export const __Math_atan = (x: number): number => {
-  if (x == Infinity) return Math.PI / 2
+  if (x == Infinity) return Math.PI / 2;
   if (x == -Infinity) return -Math.PI / 2;
+  if (x == 0) return x;
 
-  // Taylor series
+  // atan(x) = π/2 - atan(1/x) for |x| > 1
+  if (Math.abs(x) > 1) {
+    const sign = x > 0 ? 1 : -1;
+    return sign * (Math.PI / 2 - __Math_atan(1 / Math.abs(x)));
+  }
+
+  // taylor series for |x| <= 1
   let sum: number = x;
   let term: number = x;
   let n: number = 1;
+  const maxIterations: number = 1000;
 
-  while (Math.abs(term) > 1e-15) {
+  while (Math.abs(term) > 1e-15 && n < maxIterations) {
     term *= -x * x * (2 * n - 1) / ((2 * n) * (2 * n + 1));
     sum += term;
     n++;
@@ -448,7 +456,7 @@ export const __Math_atan2 = (y: number, x: number): number => {
   if (x == 0) {
     if (y > 0) return Math.PI / 2;
     if (y < 0) return -Math.PI / 2;
-
+    if (y == 0) return y;
     return NaN;
   }
 

package/compiler/builtins_precompiled.js

@@ -2165,12 +2165,12 @@ params:[124,127],typedParams:1,returns:[124],returnType:1,jsLength:1,
 locals:[],localNames:["x","x#type"]
 }
 this.__Math_atan = {
-wasm:(_,{builtin})=>eval("[[32,0],[68,\"Infinity\"],[97],[4,64],[68,3.141592653589793],[68,2],[163],[15],[26],[11],[32,0],[68,\"Infinity\"],[154],[97],[4,64],[68,3.141592653589793],[154],[68,2],[163],[15],[26],[11],[32,0],[33,2],[32,0],[33,3],[68,1],[33,4],[3,64],[32,3],[16,builtin('__Math_abs')],[68,1e-15],[100],[4,64],[32,3],[32,0],[154],[32,0],[162],[68,2],[32,4],[162],[68,1],[161],[162],[68,2],[32,4],[162],[68,2],[32,4],[162],[68,1],[160],[162],[163],[162],[33,3],[32,2],[32,3],[160],[33,2],[32,4],[68,1],[160],[33,4],[12,1],[11],[11],[32,2],[15]]"),
+wasm:(_,{builtin})=>eval("[[32,0],[68,\"Infinity\"],[97],[4,64],[68,3.141592653589793],[68,2],[163],[15],[26],[11],[32,0],[68,\"Infinity\"],[154],[97],[4,64],[68,3.141592653589793],[154],[68,2],[163],[15],[26],[11],[32,0],[68,0],[97],[4,64],[32,0],[15],[26],[11],[32,0],[16,builtin('__Math_abs')],[68,1],[100],[4,64],[32,0],[68,0],[100],[4,124],[68,1],[65,1],[33,4],[5],[68,-1],[65,1],[33,4],[11],[33,2],[32,4],[33,3],[32,2],[68,3.141592653589793],[68,2],[163],[68,1],[32,0],[16,builtin('__Math_abs')],[163],[65,1],[16,builtin('__Math_atan')],[161],[162],[15],[26],[11],[32,0],[33,5],[32,0],[33,6],[68,1],[33,7],[68,1000],[33,8],[3,64],[32,6],[16,builtin('__Math_abs')],[68,1e-15],[100],[34,9],[4,127],[32,7],[32,8],[99],[65,2],[33,4],[5],[32,9],[65,2],[33,4],[11],[4,64],[32,6],[32,0],[154],[32,0],[162],[68,2],[32,7],[162],[68,1],[161],[162],[68,2],[32,7],[162],[68,2],[32,7],[162],[68,1],[160],[162],[163],[162],[33,6],[32,5],[32,6],[160],[33,5],[32,7],[68,1],[160],[33,7],[12,1],[11],[11],[32,5],[15]]"),
 params:[124,127],typedParams:1,returns:[124],returnType:1,jsLength:1,
-locals:[124,124,124],localNames:["x","x#type","sum","term","n"]
+locals:[124,127,127,124,124,124,124,127],localNames:["x","x#type","sign","sign#type","#last_type","sum","term","n","maxIterations","logictmpi"]
 }
 this.__Math_atan2 = {
-wasm:(_,{builtin})=>eval("[[32,2],[68,0],[97],[4,64],[32,0],[68,0],[100],[4,64],[68,3.141592653589793],[68,2],[163],[15],[26],[11],[32,0],[68,0],[99],[4,64],[68,3.141592653589793],[154],[68,2],[163],[15],[26],[11],[68,\"NaN\"],[15],[26],[11],[32,0],[32,2],[163],[33,4],[65,1],[33,5],[32,2],[68,0],[100],[4,64],[32,4],[65,1],[16,builtin('__Math_atan')],[15],[26],[11],[32,0],[68,0],[102],[4,64],[32,4],[65,1],[16,builtin('__Math_atan')],[68,3.141592653589793],[160],[15],[26],[11],[32,4],[65,1],[16,builtin('__Math_atan')],[68,3.141592653589793],[161],[15]]"),
+wasm:(_,{builtin})=>eval("[[32,2],[68,0],[97],[4,64],[32,0],[68,0],[100],[4,64],[68,3.141592653589793],[68,2],[163],[15],[26],[11],[32,0],[68,0],[99],[4,64],[68,3.141592653589793],[154],[68,2],[163],[15],[26],[11],[32,0],[68,0],[97],[4,64],[32,0],[15],[26],[11],[68,\"NaN\"],[15],[26],[11],[32,0],[32,2],[163],[33,4],[65,1],[33,5],[32,2],[68,0],[100],[4,64],[32,4],[65,1],[16,builtin('__Math_atan')],[15],[26],[11],[32,0],[68,0],[102],[4,64],[32,4],[65,1],[16,builtin('__Math_atan')],[68,3.141592653589793],[160],[15],[26],[11],[32,4],[65,1],[16,builtin('__Math_atan')],[68,3.141592653589793],[161],[15]]"),
 params:[124,127,124,127],typedParams:1,returns:[124],returnType:1,jsLength:2,
 locals:[124,127],localNames:["y","y#type","x","x#type","ratio","ratio#type"]
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "porffor",
   "description": "An ahead-of-time JavaScript compiler",
-  "version": "0.60.0",
+  "version": "0.60.1",
   "author": "Oliver Medhurst <honk@goose.icu>",
   "license": "MIT",
   "scripts": {},

package/runtime/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import fs from 'node:fs';
-globalThis.version = '0.60.0';
+globalThis.version = '0.60.1';
 
 // deno compat
 if (typeof process === 'undefined' && typeof Deno !== 'undefined') {