porffor 0.2.0-371da1e → 0.2.0-3aaa9b4

package/compiler/builtins/escape.ts

@@ -1,4 +1,4 @@
-// @porf -funsafe-no-unlikely-proto-checks -valtype=i32
+// @porf --funsafe-no-unlikely-proto-checks --valtype=i32
 
 import type {} from './porffor';
 

package/compiler/builtins/int.ts

@@ -1,4 +1,4 @@
-// @porf -funsafe-no-unlikely-proto-checks
+// @porf --funsafe-no-unlikely-proto-checks
 
 // radix: number|any for rawType check
 // export const parseInt = (input: string|bytestring, radix: number|any): f64 => {

package/compiler/builtins/number.ts

@@ -1,4 +1,4 @@
-// // @porf -funsafe-no-unlikely-proto-checks
+// @porf --funsafe-no-unlikely-proto-checks
 
 // radix: number|any for rawType check
 export const __Number_prototype_toString = (_this: number, radix: number|any) => {

package/compiler/builtins/porffor.d.ts

@@ -7,23 +7,40 @@ type PorfforGlobal = {
   wasm: {
     (...args: any[]): any;
     i32: {
-      or(a: i32, b: i32): i32;
-
       load(pointer: i32, align: i32, offset: i32): i32;
       store(pointer: i32, value: i32, align: i32, offset: i32): i32;
       load8_u(pointer: i32, align: i32, offset: i32): i32;
       store8(pointer: i32, value: i32, align: i32, offset: i32): i32;
       load16_u(pointer: i32, align: i32, offset: i32): i32;
       store16(pointer: i32, value: i32, align: i32, offset: i32): i32;
+      const(value: i32): i32;
+    }
+
+    f64: {
+      load(pointer: i32, align: i32, offset: i32): i32;
+      store(pointer: i32, value: f64, align: i32, offset: i32): f64;
     }
   }
 
-  // randomInt(): i32;
   randomByte(): i32;
 
   type(x: any): bytestring;
   rawType(x: any): i32;
-  TYPES: Record<string, i32>;
+  TYPES: {
+    number: i32;
+    boolean: i32;
+    string: i32;
+    undefined: i32;
+    object: i32;
+    function: i32;
+    symbol: i32;
+    bigint: i32;
+
+    _array: i32;
+    _regexp: i32;
+    _bytestring: i32;
+    _date: i32;
+  }
 
   fastOr(...args: any): boolean;
   fastAnd(...args: any): boolean;

package/compiler/builtins/string.ts

@@ -1,4 +1,4 @@
-// @porf -funsafe-no-unlikely-proto-checks -valtype=i32
+// @porf --funsafe-no-unlikely-proto-checks --valtype=i32
 
 export const __String_fromCharCode = (code: i32) => {
   // todo: support >1 arg

package/compiler/builtins/tostring.ts

@@ -1,4 +1,4 @@
-// // @porf -funsafe-no-unlikely-proto-checks -valtype=i32
+// // @porf --funsafe-no-unlikely-proto-checks --valtype=i32
 
 export const __Boolean_prototype_toString = (_this: boolean) => {
   let out: bytestring = '';

package/compiler/builtins.js

@@ -216,7 +216,7 @@ export const BuiltinFuncs = function() {
   };
 
 
-  this.__console_log = {
+  this.__Porffor_print = {
     params: [ valtypeBinary, Valtype.i32 ],
     typedParams: true,
     locals: [ Valtype.i32, Valtype.i32 ],
@@ -368,10 +368,7 @@ export const BuiltinFuncs = function() {
           [ Opcodes.local_get, 0 ],
           [ Opcodes.call, importedFuncs.print ],
         ]
-      }, Blocktype.void),
-
-      ...char('\n'),
-      [ Opcodes.call, importedFuncs.printChar ]
+      }, Blocktype.void)
     ]
   };
 

package/compiler/codegen.js

@@ -201,7 +201,7 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
             }
 
             let inst = Opcodes[asm[0].replace('.', '_')];
-            if (!inst) throw new Error(`inline asm: inst ${asm[0]} not found`);
+            if (inst == null) throw new Error(`inline asm: inst ${asm[0]} not found`);
 
             if (!Array.isArray(inst)) inst = [ inst ];
             const immediates = asm.slice(1).map(x => {
@@ -210,7 +210,7 @@ const generate = (scope, decl, global = false, name = undefined, valueUnused = f
               return int;
             });
 
-            out.push([ ...inst, ...immediates ]);
+            out.push([ ...inst, ...immediates.flatMap(x => signedLEB128(x)) ]);
           }
 
           return out;
@@ -460,7 +460,7 @@ const concatStrings = (scope, left, right, global, name, assign = false, bytestr
   const rightLength = localTmp(scope, 'concat_right_length', Valtype.i32);
   const leftLength = localTmp(scope, 'concat_left_length', Valtype.i32);
 
-  if (assign) {
+  if (assign && Prefs.aotPointerOpt) {
     const pointer = scope.arrays?.get(name ?? '$undeclared');
 
     return [
@@ -1472,7 +1472,7 @@ const countLeftover = wasm => {
     if (depth === 0)
       if ([Opcodes.throw, Opcodes.drop, Opcodes.local_set, Opcodes.global_set].includes(inst[0])) count--;
         else if ([null, Opcodes.i32_eqz, Opcodes.i64_eqz, Opcodes.f64_ceil, Opcodes.f64_floor, Opcodes.f64_trunc, Opcodes.f64_nearest, Opcodes.f64_sqrt, Opcodes.local_tee, Opcodes.i32_wrap_i64, Opcodes.i64_extend_i32_s, Opcodes.i64_extend_i32_u, Opcodes.f32_demote_f64, Opcodes.f64_promote_f32, Opcodes.f64_convert_i32_s, Opcodes.f64_convert_i32_u, Opcodes.i32_clz, Opcodes.i32_ctz, Opcodes.i32_popcnt, Opcodes.f64_neg, Opcodes.end, Opcodes.i32_trunc_sat_f64_s[0], Opcodes.i32x4_extract_lane, Opcodes.i16x8_extract_lane, Opcodes.i32_load, Opcodes.i64_load, Opcodes.f64_load, Opcodes.v128_load, Opcodes.i32_load16_u, Opcodes.i32_load16_s, Opcodes.i32_load8_u, Opcodes.i32_load8_s, Opcodes.memory_grow].includes(inst[0]) && (inst[0] !== 0xfc || inst[1] < 0x0a)) {}
-        else if ([Opcodes.local_get, Opcodes.global_get, Opcodes.f64_const, Opcodes.i32_const, Opcodes.i64_const, Opcodes.v128_const].includes(inst[0])) count++;
+        else if ([Opcodes.local_get, Opcodes.global_get, Opcodes.f64_const, Opcodes.i32_const, Opcodes.i64_const, Opcodes.v128_const, Opcodes.memory_size].includes(inst[0])) count++;
         else if ([Opcodes.i32_store, Opcodes.i64_store, Opcodes.f64_store, Opcodes.i32_store16, Opcodes.i32_store8].includes(inst[0])) count -= 2;
         else if (Opcodes.memory_copy[0] === inst[0] && Opcodes.memory_copy[1] === inst[1]) count -= 3;
         else if (inst[0] === Opcodes.return) count = 0;
@@ -1646,18 +1646,25 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
     // megahack for /regex/.func()
     const funcName = decl.callee.property.name;
     if (decl.callee.object.regex && Object.hasOwn(Rhemyn, funcName)) {
-      const func = Rhemyn[funcName](decl.callee.object.regex.pattern, currentFuncIndex++);
+      const regex = decl.callee.object.regex.pattern;
+      const rhemynName = `regex_${funcName}_${regex}`;
 
-      funcIndex[func.name] = func.index;
-      funcs.push(func);
+      if (!funcIndex[rhemynName]) {
+        const func = Rhemyn[funcName](regex, currentFuncIndex++, rhemynName);
 
+        funcIndex[func.name] = func.index;
+        funcs.push(func);
+      }
+
+      const idx = funcIndex[rhemynName];
       return [
         // make string arg
         ...generate(scope, decl.arguments[0]),
+        Opcodes.i32_to_u,
+        ...getNodeType(scope, decl.arguments[0]),
 
         // call regex func
-        Opcodes.i32_to_u,
-        [ Opcodes.call, func.index ],
+        [ Opcodes.call, idx ],
         Opcodes.i32_from_u,
 
         ...number(TYPES.boolean, Valtype.i32),
@@ -1697,6 +1704,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
 
         protoBC[type] = generateCall(scope, {
           callee: {
+            type: 'Identifier',
             name: x
           },
           arguments: [ target, ...decl.arguments ],
@@ -1819,20 +1827,20 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
     idx = funcIndex[name];
 
     // infer arguments types from builtins params
-    const func = funcs.find(x => x.name === name);
-    for (let i = 0; i < decl.arguments.length; i++) {
-      const arg = decl.arguments[i];
-      if (!arg.name) continue;
-
-      const local = scope.locals[arg.name];
-      if (!local) continue;
-
-      local.type = func.params[i];
-      if (local.type === Valtype.v128) {
-        // specify vec subtype inferred from last vec type in function name
-        local.vecType = name.split('_').reverse().find(x => x.includes('x'));
-      }
-    }
+    // const func = funcs.find(x => x.name === name);
+    // for (let i = 0; i < decl.arguments.length; i++) {
+    //   const arg = decl.arguments[i];
+    //   if (!arg.name) continue;
+
+    //   const local = scope.locals[arg.name];
+    //   if (!local) continue;
+
+    //   local.type = func.params[i];
+    //   if (local.type === Valtype.v128) {
+    //     // specify vec subtype inferred from last vec type in function name
+    //     local.vecType = name.split('_').reverse().find(x => x.includes('x'));
+    //   }
+    // }
   }
 
   if (idx === undefined && internalConstrs[name]) return internalConstrs[name].generate(scope, decl, _global, _name);
@@ -1845,28 +1853,25 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
   if (idx === undefined && name.startsWith('__Porffor_wasm_')) {
     const wasmOps = {
       // pointer, align, offset
-      i32_load: { imms: 2, args: 1, returns: 1 },
+      i32_load: { imms: 2, args: [ true ], returns: 1 },
       // pointer, value, align, offset
-      i32_store: { imms: 2, args: 2, returns: 0 },
+      i32_store: { imms: 2, args: [ true, true ], returns: 0 },
       // pointer, align, offset
-      i32_load8_u: { imms: 2, args: 1, returns: 1 },
+      i32_load8_u: { imms: 2, args: [ true ], returns: 1 },
       // pointer, value, align, offset
-      i32_store8: { imms: 2, args: 2, returns: 0 },
+      i32_store8: { imms: 2, args: [ true, true ], returns: 0 },
       // pointer, align, offset
-      i32_load16_u: { imms: 2, args: 1, returns: 1 },
+      i32_load16_u: { imms: 2, args: [ true ], returns: 1 },
       // pointer, value, align, offset
-      i32_store16: { imms: 2, args: 2, returns: 0 },
+      i32_store16: { imms: 2, args: [ true, true ], returns: 0 },
 
       // pointer, align, offset
-      f64_load: { imms: 2, args: 1, returns: 1 },
+      f64_load: { imms: 2, args: [ true ], returns: 0 }, // 0 due to not i32
       // pointer, value, align, offset
-      f64_store: { imms: 2, args: 2, returns: 0 },
+      f64_store: { imms: 2, args: [ true, false ], returns: 0 },
 
       // value
-      i32_const: { imms: 1, args: 0, returns: 1 },
-
-      // a, b
-      i32_or: { imms: 0, args: 2, returns: 1 },
+      i32_const: { imms: 1, args: [], returns: 1 },
     };
 
     const opName = name.slice('__Porffor_wasm_'.length);
@@ -1875,13 +1880,13 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
       const op = wasmOps[opName];
 
       const argOut = [];
-      for (let i = 0; i < op.args; i++) argOut.push(
+      for (let i = 0; i < op.args.length; i++) argOut.push(
         ...generate(scope, decl.arguments[i]),
-        Opcodes.i32_to
+        ...(op.args[i] ? [ Opcodes.i32_to ] : [])
       );
 
       // literals only
-      const imms = decl.arguments.slice(op.args).map(x => x.value);
+      const imms = decl.arguments.slice(op.args.length).map(x => x.value);
 
       return [
         ...argOut,
@@ -2204,6 +2209,7 @@ const generateVar = (scope, decl) => {
 
   // global variable if in top scope (main) and var ..., or if wanted
   const global = topLevel || decl._bare; // decl.kind === 'var';
+  const target = global ? globals : scope.locals;
 
   for (const x of decl.declarations) {
     const name = mapName(x.id.name);
@@ -2225,17 +2231,29 @@ const generateVar = (scope, decl) => {
       continue; // always ignore
     }
 
+    // // generate init before allocating var
+    // let generated;
+    // if (x.init) generated = generate(scope, x.init, global, name);
+
     const typed = typedInput && x.id.typeAnnotation;
-    let idx = allocVar(scope, name, global, !typed);
+    let idx = allocVar(scope, name, global, !(typed && extractTypeAnnotation(x.id).type != null));
 
     if (typed) {
       addVarMetadata(scope, name, global, extractTypeAnnotation(x.id));
     }
 
     if (x.init) {
-      out = out.concat(generate(scope, x.init, global, name));
-
-      out.push([ global ? Opcodes.global_set : Opcodes.local_set, idx ]);
+      const generated = generate(scope, x.init, global, name);
+      if (scope.arrays?.get(name) != null) {
+        // hack to set local as pointer before
+        out.push(...number(scope.arrays.get(name)), [ global ? Opcodes.global_set : Opcodes.local_set, idx ]);
+        if (generated.at(-1) == Opcodes.i32_from_u) generated.pop();
+        generated.pop();
+        out = out.concat(generated);
+      } else {
+        out = out.concat(generated);
+        out.push([ global ? Opcodes.global_set : Opcodes.local_set, idx ]);
+      }
       out.push(...setType(scope, name, getNodeType(scope, x.init)));
     }
 
@@ -2262,6 +2280,8 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
     return [];
   }
 
+  const op = decl.operator.slice(0, -1) || '=';
+
   // hack: .length setter
   if (decl.left.type === 'MemberExpression' && decl.left.property.name === 'length') {
     const name = decl.left.object.name;
@@ -2270,14 +2290,20 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
     const aotPointer = Prefs.aotPointerOpt && pointer != null;
 
     const newValueTmp = localTmp(scope, '__length_setter_tmp');
+    const pointerTmp = op === '=' ? null : localTmp(scope, '__member_setter_ptr_tmp', Valtype.i32);
 
     return [
       ...(aotPointer ? number(0, Valtype.i32) : [
         ...generate(scope, decl.left.object),
         Opcodes.i32_to_u
       ]),
+      ...(!pointerTmp ? [] : [ [ Opcodes.local_tee, pointerTmp ] ]),
 
-      ...generate(scope, decl.right),
+      ...(op === '=' ? generate(scope, decl.right) : performOp(scope, op, [
+        [ Opcodes.local_get, pointerTmp ],
+        [ Opcodes.i32_load, Math.log2(ValtypeSize.i32) - 1, 0 ],
+        Opcodes.i32_from_u
+      ], generate(scope, decl.right), number(TYPES.number, Valtype.i32), getNodeType(scope, decl.right))),
       [ Opcodes.local_tee, newValueTmp ],
 
       Opcodes.i32_to_u,
@@ -2287,8 +2313,6 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
     ];
   }
 
-  const op = decl.operator.slice(0, -1) || '=';
-
   // arr[i]
   if (decl.left.type === 'MemberExpression' && decl.left.computed) {
     const name = decl.left.object.name;
@@ -3092,12 +3116,14 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
     // todo: can we just have 1 undeclared array? probably not? but this is not really memory efficient
     const uniqueName = name === '$undeclared' ? name + Math.random().toString().slice(2) : name;
 
-    if (Prefs.scopedPageNames) scope.arrays.set(name, allocPage(scope, `${scope.name} | ${getAllocType(itemType)}: ${uniqueName}`, itemType) * pageSize);
+    if (Prefs.scopedPageNames) scope.arrays.set(name, allocPage(scope, `${getAllocType(itemType)}: ${scope.name}/${uniqueName}`, itemType) * pageSize);
       else scope.arrays.set(name, allocPage(scope, `${getAllocType(itemType)}: ${uniqueName}`, itemType) * pageSize);
   }
 
   const pointer = scope.arrays.get(name);
 
+  const local = global ? globals[name] : scope.locals[name];
+
   const useRawElements = !!decl.rawElements;
   const elements = useRawElements ? decl.rawElements : decl.elements;
 
@@ -3130,11 +3156,22 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
     return [ out, pointer ];
   }
 
+  const pointerTmp = local != null ? localTmp(scope, '#makearray_pointer_tmp', Valtype.i32) : null;
+  if (pointerTmp != null) {
+    out.push(
+      [ global ? Opcodes.global_get : Opcodes.local_get, local.idx ],
+      Opcodes.i32_to_u,
+      [ Opcodes.local_set, pointerTmp ]
+    );
+  }
+
+  const pointerWasm = pointerTmp != null ? [ [ Opcodes.local_get, pointerTmp ] ] : number(pointer, Valtype.i32);
+
   // store length as 0th array
   out.push(
-    ...number(0, Valtype.i32),
+    ...pointerWasm,
     ...number(length, Valtype.i32),
-    [ Opcodes.i32_store, Math.log2(ValtypeSize.i32) - 1, ...unsignedLEB128(pointer) ]
+    [ Opcodes.i32_store, Math.log2(ValtypeSize.i32) - 1, 0 ]
   );
 
   const storeOp = StoreOps[itemType];
@@ -3143,14 +3180,14 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
     if (elements[i] == null) continue;
 
     out.push(
-      ...number(0, Valtype.i32),
+      ...pointerWasm,
       ...(useRawElements ? number(elements[i], Valtype[valtype]) : generate(scope, elements[i])),
-      [ storeOp, (Math.log2(ValtypeSize[itemType]) || 1) - 1, ...unsignedLEB128(pointer + ValtypeSize.i32 + i * ValtypeSize[itemType]) ]
+      [ storeOp, (Math.log2(ValtypeSize[itemType]) || 1) - 1, ...unsignedLEB128(ValtypeSize.i32 + i * ValtypeSize[itemType]) ]
     );
   }
 
   // local value as pointer
-  out.push(...number(pointer));
+  out.push(...pointerWasm, Opcodes.i32_from_u);
 
   return [ out, pointer ];
 };
@@ -3505,6 +3542,8 @@ const internalConstrs = {
         );
       }
 
+      out.push(Opcodes.i32_from_u);
+
       return out;
     },
     type: TYPES.boolean,
@@ -3523,6 +3562,8 @@ const internalConstrs = {
         );
       }
 
+      out.push(Opcodes.i32_from_u);
+
       return out;
     },
     type: TYPES.boolean,
@@ -3577,6 +3618,39 @@ const internalConstrs = {
     type: TYPES.number,
     notConstr: true,
     length: 2
+  },
+
+  __console_log: {
+    generate: (scope, decl) => {
+      const out = [];
+
+      for (let i = 0; i < decl.arguments.length; i++) {
+        out.push(
+          ...generateCall(scope, {
+            callee: {
+              type: 'Identifier',
+              name: '__Porffor_print'
+            },
+            arguments: [ decl.arguments[i] ]
+          }),
+
+          // print space
+          ...number(32),
+          [ Opcodes.call, importedFuncs.printChar ]
+        );
+      }
+
+      // print newline
+      out.push(
+        ...number(10),
+        [ Opcodes.call, importedFuncs.printChar ]
+      );
+
+      return out;
+    },
+    type: TYPES.undefined,
+    notConstr: true,
+    length: 0
   }
 };
 
@@ -3611,7 +3685,7 @@ export default program => {
 
   globalThis.valtype = 'f64';
 
-  const valtypeOpt = process.argv.find(x => x.startsWith('-valtype='));
+  const valtypeOpt = process.argv.find(x => x.startsWith('--valtype='));
   if (valtypeOpt) valtype = valtypeOpt.split('=')[1];
 
   globalThis.valtypeBinary = Valtype[valtype];
@@ -3619,7 +3693,7 @@ export default program => {
   const valtypeInd = ['i32', 'i64', 'f64'].indexOf(valtype);
 
   globalThis.pageSize = PageSize;
-  const pageSizeOpt = process.argv.find(x => x.startsWith('-page-size='));
+  const pageSizeOpt = process.argv.find(x => x.startsWith('--page-size='));
   if (pageSizeOpt) pageSize = parseInt(pageSizeOpt.split('=')[1]) * 1024;
 
   // set generic opcodes for current valtype

package/compiler/decompile.js

@@ -110,7 +110,6 @@ export default (wasm, name = '', ind = 0, locals = {}, params = [], returns = []
 
     out += '\n';
     lastInst = inst;
-    i++;
   }
 
   return highlightAsm(out);