porffor 0.18.27 → 0.18.28

package/compiler/builtins/array.ts

@@ -36,6 +36,57 @@ export const __Array_from = (arg: any, mapFn: any): any[] => {
   return out;
 };
 
+export const __Array_prototype_push = (_this: any[], ...items: any[]) => {
+  let len: i32 = _this.length;
+  const itemsLen: i32 = items.length;
+
+  for (let i: i32 = 0; i < itemsLen; i++) {
+    _this[i + len] = items[i];
+  }
+
+  return _this.length = len + itemsLen;
+};
+
+export const __Array_prototype_unshift = (_this: any[], ...items: any[]) => {
+  let len: i32 = _this.length;
+  const itemsLen: i32 = items.length;
+
+  // use memory.copy to move existing elements right
+  Porffor.wasm`;; ptr = ptr(_this) + 4
+local #splice_ptr i32
+local.get ${_this}
+i32.to_u
+i32.const 4
+i32.add
+local.set #splice_ptr
+
+;; dst = ptr + itemsLen * 9
+local.get #splice_ptr
+local.get ${itemsLen}
+i32.to_u
+i32.const 9
+i32.mul
+i32.add
+
+;; src = ptr
+local.get #splice_ptr
+
+;; size = len * 9
+local.get ${len}
+i32.to_u
+i32.const 9
+i32.mul
+
+memory.copy 0 0`;
+
+  // write to now empty elements
+  for (let i: i32 = 0; i < itemsLen; i++) {
+    _this[i] = items[i];
+  }
+
+  return _this.length = len + itemsLen;
+};
+
 export const __Array_prototype_slice = (_this: any[], start: number, end: number) => {
   const len: i32 = _this.length;
   if (Porffor.rawType(end) == Porffor.TYPES.undefined) end = len;

package/compiler/generated_builtins.js

@@ -165,6 +165,20 @@ export const BuiltinFuncs = function() {
     locals: [124,127,124,124,127,124,127,124,124,127,127,127,127,124,127,124,127,127,124,127,124,127,124,127,127,124], localNames: ["arg","arg#type","mapFn","mapFn#type","out","#last_type","len","type","type#type","hasMapFn","hasMapFn#type","i","#logicinner_tmp","#typeswitch_tmp","forof_base_pointer","forof_length","forof_counter","x","x#type","#member_setter_val_tmp","#member_setter_ptr_tmp","#indirect_arg0_type","#indirect_arg0_val","#indirect_arg1_type","#indirect_arg1_val","#indirect_arg2_type","#indirect_arg2_val","#indirect_func","#indirect_flags","__length_setter_tmp"],
     table: 1,
   };
+  this.__Array_prototype_push = {
+    wasm: (scope, {}) => [[32,0],[252,3],[40,1,0],[184],[33,4],[32,2],[252,3],[40,1,0],[184],[33,5],[68,0,0,0,0,0,0,0,0],[33,6],[3,64],[32,6],[32,5],[99],[4,64],[32,0],[252,3],[32,6],[32,4],[160],[252,3],[65,9],[108],[106],[34,8],[32,6],[252,3],[65,9],[108],[32,2],[252,3],[106],[34,9],[43,0,4],[32,9],[45,0,12],[33,10],[34,7],[57,0,4],[32,8],[32,10],[58,0,12],[32,6],[68,0,0,0,0,0,0,240,63],[160],[33,6],[12,1],[11],[11],[32,0],[252,3],[32,4],[32,5],[160],[34,11],[252,3],[54,1,0],[32,11],[65,0],[15]],
+    params: [124,127,124,127], typedParams: 1,
+    returns: [124,127], typedReturns: 1,
+    locals: [124,124,124,124,127,127,127,124], localNames: ["_this","_this#type","items","items#type","len","itemsLen","i","#member_setter_val_tmp","#member_setter_ptr_tmp","#loadArray_offset","#last_type","__length_setter_tmp"],
+    hasRestArgument: 1,
+  };
+  this.__Array_prototype_unshift = {
+    wasm: (scope, {}) => [[32,0],[252,3],[40,1,0],[184],[33,4],[32,2],[252,3],[40,1,0],[184],[33,5],[32,0],[252,3],[65,4],[106],[34,6],[32,5],[252,3],[65,9],[108],[106],[32,6],[32,4],[252,3],[65,9],[108],[252,10,0,0],[68,0,0,0,0,0,0,0,0],[33,7],[3,64],[32,7],[32,5],[99],[4,64],[32,0],[252,3],[32,7],[252,3],[65,9],[108],[106],[34,9],[32,7],[252,3],[65,9],[108],[32,2],[252,3],[106],[34,10],[43,0,4],[32,10],[45,0,12],[33,11],[34,8],[57,0,4],[32,9],[32,11],[58,0,12],[32,7],[68,0,0,0,0,0,0,240,63],[160],[33,7],[12,1],[11],[11],[32,0],[252,3],[32,4],[32,5],[160],[34,12],[252,3],[54,1,0],[32,12],[65,0],[15]],
+    params: [124,127,124,127], typedParams: 1,
+    returns: [124,127], typedReturns: 1,
+    locals: [124,124,127,124,124,127,127,127,124], localNames: ["_this","_this#type","items","items#type","len","itemsLen","#splice_ptr","i","#member_setter_val_tmp","#member_setter_ptr_tmp","#loadArray_offset","#last_type","__length_setter_tmp"],
+    hasRestArgument: 1,
+  };
   this.__Array_prototype_slice = {
     wasm: (scope, {builtin}) => [[32,0],[252,3],[40,1,0],[184],[33,6],[32,4],[65,0],[16, builtin('__Porffor_rawType')],[68,0,0,0,0,0,0,8,64],[97],[4,64],[32,6],[33,4],[11],[32,2],[68,0,0,0,0,0,0,0,0],[16, builtin('f64_|')],[33,2],[32,4],[68,0,0,0,0,0,0,0,0],[16, builtin('f64_|')],[33,4],[32,2],[68,0,0,0,0,0,0,0,0],[99],[4,64],[32,6],[32,2],[160],[34,2],[68,0,0,0,0,0,0,0,0],[99],[4,64],[68,0,0,0,0,0,0,0,0],[33,2],[11],[11],[32,2],[32,6],[100],[4,64],[32,6],[33,2],[11],[32,4],[68,0,0,0,0,0,0,0,0],[99],[4,64],[32,6],[32,4],[160],[34,4],[68,0,0,0,0,0,0,0,0],[99],[4,64],[68,0,0,0,0,0,0,0,0],[33,4],[11],[11],[32,4],[32,6],[100],[4,64],[32,6],[33,4],[11],[16, builtin('__Porffor_allocate')],[33,8],[33,7],[32,2],[32,4],[100],[4,64],[32,7],[65,208,0],[15],[11],[32,7],[33,9],[32,0],[34,10],[32,4],[68,0,0,0,0,0,0,34,64],[162],[160],[33,11],[32,10],[32,2],[68,0,0,0,0,0,0,34,64],[162],[160],[33,10],[3,64],[32,10],[32,11],[99],[4,64],[32,9],[252,2],[32,10],[252,2],[43,0,4],[57,0,4],[32,9],[252,2],[32,10],[252,2],[45,0,12],[58,0,12],[32,10],[68,0,0,0,0,0,0,34,64],[160],[33,10],[32,9],[68,0,0,0,0,0,0,34,64],[160],[33,9],[12,1],[11],[11],[32,7],[252,3],[32,4],[32,2],[161],[34,12],[252,3],[54,1,0],[32,7],[65,208,0],[15]],
     params: [124,127,124,127,124,127], typedParams: 1,
@@ -1407,10 +1421,10 @@ export const BuiltinFuncs = function() {
     locals: [], localNames: ["_this","_this#type"],
   };
   this.__Set_prototype_values = {
-    wasm: (scope, {builtin}) => [[32,0],[252,2],[40,0,0],[183],[33,2],[16, builtin('__Porffor_allocate')],[33,4],[33,3],[68,0,0,0,0,0,0,0,0],[33,5],[3,64],[32,5],[32,2],[99],[4,64],[32,0],[65,19],[32,5],[65,0],[16, builtin('__Porffor_set_read')],[33,4],[33,6],[32,4],[33,7],[32,3],[252,3],[34,9],[40,1,0],[34,8],[65,9],[108],[32,9],[106],[34,10],[32,6],[57,0,4],[32,10],[32,7],[58,0,12],[32,9],[32,8],[65,1],[106],[54,1,0],[32,5],[68,0,0,0,0,0,0,240,63],[160],[33,5],[12,1],[11],[11],[32,3],[65,208,0],[15]],
+    wasm: (scope, {builtin,internalThrow}) => [[32,0],[252,2],[40,0,0],[183],[33,2],[16, builtin('__Porffor_allocate')],[33,4],[33,3],[68,0,0,0,0,0,0,0,0],[33,5],[3,64],[32,5],[32,2],[99],[4,64],[2,64],[32,0],[65,19],[32,5],[65,0],[16, builtin('__Porffor_set_read')],[33,4],[33,6],[32,4],[33,7],[32,3],[33,8],[65,208,0],[34,9],[33,10],[2,124],[32,10],[65,208,0],[70],[4,64,"TYPESWITCH|Array"],[32,8],[32,9],[65,4],[65,1],[54,1,0],[65,4],[32,6],[57,0,4],[65,4],[32,7],[58,0,12],[68,0,0,0,0,0,0,16,64],[65,208,0],[16, builtin('__Array_prototype_push')],[33,4],[12,1],[11],...internalThrow(scope, 'TypeError', `'push' proto func tried to be called on a type without an impl`),[11,"TYPESWITCH_end"],[26],[11],[32,5],[68,0,0,0,0,0,0,240,63],[160],[33,5],[12,1],[11],[11],[32,3],[65,208,0],[15]],
     params: [124,127], typedParams: 1,
     returns: [124,127], typedReturns: 1,
-    locals: [124,124,127,124,124,127,127,127,127], localNames: ["_this","_this#type","size","out","#last_type","i","val","val#type","__proto_length_cache","__proto_pointer_cache","__push_tmp"],
+    locals: [124,124,127,124,124,127,124,127,127], localNames: ["_this","_this#type","size","out","#last_type","i","val","val#type","#proto_target","#proto_target#type","#typeswitch_tmp"],
   };
   this.__Set_prototype_keys = {
     wasm: (scope, {builtin}) => [[32,0],[65,19],[16, builtin('__Set_prototype_values')],[34,2],[15]],

package/compiler/prototype.js

@@ -60,46 +60,6 @@ export const PrototypeFuncs = function() {
       [ Opcodes.i32_load8_u, 0, ValtypeSize.i32 + ValtypeSize[valtype] ]
     ],
 
-    // todo: only for 1 argument
-    push: (pointer, length, wNewMember, wType, iTmp, _2, _3, unusedValue) => [
-      // get memory offset of array at last index (length)
-      ...length.getCachedI32(),
-      ...number(ValtypeSize[valtype] + 1, Valtype.i32),
-      [ Opcodes.i32_mul ],
-      ...pointer,
-      [ Opcodes.i32_add ],
-      [ Opcodes.local_set, iTmp ],
-
-      // store value
-      [ Opcodes.local_get, iTmp ],
-      ...wNewMember,
-      [ Opcodes.store, 0, ValtypeSize.i32 ],
-
-      // store type
-      [ Opcodes.local_get, iTmp ],
-      ...wType,
-      [ Opcodes.i32_store8, 0, ValtypeSize.i32 + ValtypeSize[valtype] ],
-
-      // bump array length by 1 and return it
-      ...length.setI32([
-        ...length.getCachedI32(),
-        ...number(1, Valtype.i32),
-        [ Opcodes.i32_add ],
-
-        ...(unusedValue() ? [] : [
-          ...length.setCachedI32(),
-          ...length.getCachedI32(),
-        ])
-      ]),
-
-      ...(unusedValue() ? [] : [
-        ...length.getCachedI32(),
-        Opcodes.i32_from_u
-      ])
-
-      // ...length.get()
-    ],
-
     pop: (pointer, length, _1, _2, iTmp, _3, _4, unusedValue) => [
       // if length == 0, noop
       ...length.getCachedI32(),
@@ -212,9 +172,6 @@ export const PrototypeFuncs = function() {
   };
 
   this[TYPES.array].at.local = Valtype.i32;
-  this[TYPES.array].push.returnType = TYPES.number;
-  this[TYPES.array].push.noArgRetLength = true;
-  this[TYPES.array].push.local = Valtype.i32;
   this[TYPES.array].pop.local = Valtype.i32;
 
   this[TYPES.string] = {

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.18.27+71e285b9b",
+  "version": "0.18.28+66d3e519a",
   "author": "CanadaHonk",
   "license": "MIT",
   "scripts": {},

package/runner/index.js

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