porffor 0.19.13 → 0.19.15

package/compiler/codegen.js

@@ -488,7 +488,7 @@ const concatStrings = (scope, left, right, leftType, rightType, allBytestrings =
       [ Opcodes.if, Blocktype.void ],
       [ Opcodes.local_get, leftPointer ],
       [ Opcodes.local_get, leftLength ],
-      [ Opcodes.call, funcIndex.__Porffor_bytestringToString ],
+      [ Opcodes.call, ...unsignedLEB128(funcIndex.__Porffor_bytestringToString) ],
       [ Opcodes.local_set, leftPointer ],
       [ Opcodes.end ],
 
@@ -498,7 +498,7 @@ const concatStrings = (scope, left, right, leftType, rightType, allBytestrings =
       [ Opcodes.if, Blocktype.void ],
       [ Opcodes.local_get, rightPointer ],
       [ Opcodes.local_get, rightLength ],
-      [ Opcodes.call, funcIndex.__Porffor_bytestringToString ],
+      [ Opcodes.call, ...unsignedLEB128(funcIndex.__Porffor_bytestringToString) ],
       [ Opcodes.local_set, rightPointer ],
       [ Opcodes.end ]
     ]),
@@ -604,7 +604,7 @@ const compareStrings = (scope, left, right, leftType, rightType, allBytestrings
       [ Opcodes.if, Blocktype.void ],
       [ Opcodes.local_get, leftPointer ],
       [ Opcodes.local_get, leftLength ],
-      [ Opcodes.call, funcIndex.__Porffor_bytestringToString ],
+      [ Opcodes.call, ...unsignedLEB128(funcIndex.__Porffor_bytestringToString) ],
       [ Opcodes.local_set, leftPointer ],
       [ Opcodes.end ],
 
@@ -615,7 +615,7 @@ const compareStrings = (scope, left, right, leftType, rightType, allBytestrings
       [ Opcodes.local_get, rightPointer ],
       [ Opcodes.local_get, rightPointer ],
       [ Opcodes.i32_load, 0, 0 ],
-      [ Opcodes.call, funcIndex.__Porffor_bytestringToString ],
+      [ Opcodes.call, ...unsignedLEB128(funcIndex.__Porffor_bytestringToString) ],
       [ Opcodes.local_set, rightPointer ],
       [ Opcodes.end ]
     ]),
@@ -951,7 +951,7 @@ const performOp = (scope, op, left, right, leftType, rightType, _global = false,
     return finalize([
       ...left,
       ...right,
-      [ Opcodes.call, idx ]
+      [ Opcodes.call, ...unsignedLEB128(idx) ]
     ]);
   }
 
@@ -1128,32 +1128,37 @@ const asmFuncToAsm = (scope, func) => {
       }
 
       if (idx == null) throw new Error(`builtin('${n}') failed to find a func (inside ${scope.name})`);
-      return idx;
+      return unsignedLEB128(idx);
     },
     glbl: (opcode, name, type) => {
-      if (!globals[name]) {
+      const globalName = '#porf#' + name; // avoid potential name clashing with user js
+      if (!globals[globalName]) {
         const idx = globals['#ind']++;
-        globals[name] = { idx, type };
+        globals[globalName] = { idx, type };
 
         const tmpIdx = globals['#ind']++;
-        globals[name + '#glbl_inited'] = { idx: tmpIdx, type: Valtype.i32 };
+        globals[globalName + '#glbl_inited'] = { idx: tmpIdx, type: Valtype.i32 };
+      }
+
+      const out = [
+        [ opcode, globals[globalName].idx ]
+      ];
 
-        if (scope.globalInits[name]) return [
-          [ Opcodes.global_get, tmpIdx ],
+      scope.initedGlobals ??= new Set();
+      if (!scope.initedGlobals.has(name)) {
+        scope.initedGlobals.add(name);
+        if (scope.globalInits[name]) out.unshift(
+          [ Opcodes.global_get, globals[globalName + '#glbl_inited'].idx ],
           [ Opcodes.i32_eqz ],
           [ Opcodes.if, Blocktype.void ],
           ...asmFuncToAsm(scope, scope.globalInits[name]),
           ...number(1, Valtype.i32),
-          [ Opcodes.global_set, tmpIdx ],
-          [ Opcodes.end ],
-
-          [ opcode, globals[name].idx ]
-        ];
+          [ Opcodes.global_set, globals[globalName + '#glbl_inited'].idx ],
+          [ Opcodes.end ]
+        );
       }
 
-      return [
-        [ opcode, globals[name].idx ]
-      ];
+      return out;
     },
     loc: (name, type) => {
       if (!scope.locals[name]) {
@@ -1494,6 +1499,10 @@ const getNodeType = (scope, node) => {
       return TYPES.number;
     }
 
+    if (node.type === 'UpdateExpression') {
+      return TYPES.number;
+    }
+
     if (node.type === 'MemberExpression') {
       const name = node.property.name;
 
@@ -1607,8 +1616,7 @@ const countLeftover = wasm => {
 };
 
 const disposeLeftover = wasm => {
-  let leftover = countLeftover(wasm);
-
+  const leftover = countLeftover(wasm);
   for (let i = 0; i < leftover; i++) wasm.push([ Opcodes.drop ]);
 };
 
@@ -1775,7 +1783,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
         ...getNodeType(scope, decl.arguments[0]),
 
         // call regex func
-        [ Opcodes.call, idx ],
+        [ Opcodes.call, ...unsignedLEB128(idx) ],
         Opcodes.i32_from_u,
 
         ...setLastType(scope, Rhemyn.types[funcName])
@@ -1818,7 +1826,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
         ...getNodeType(scope, target),
 
         // call regex func
-        [ Opcodes.call, idx ],
+        [ Opcodes.call, ...unsignedLEB128(idx) ],
         Opcodes.i32_from,
 
         ...setLastType(scope, Rhemyn.types[protoName])
@@ -2246,12 +2254,13 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
     if (args.length < paramCount) {
       args = args.concat(new Array(paramCount - 1 - args.length).fill(DEFAULT_VALUE));
     }
+
     const restArgs = args.slice(paramCount - 1);
     args = args.slice(0, paramCount - 1);
     args.push({
       type: 'ArrayExpression',
       elements: restArgs
-    })
+    });
   }
 
   if (func && args.length > paramCount) {
@@ -2287,7 +2296,7 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
     if (typedParams) out = out.concat(getNodeType(scope, arg));
   }
 
-  out.push([ Opcodes.call, idx ]);
+  out.push([ Opcodes.call, ...unsignedLEB128(idx) ]);
 
   if (!typedReturns) {
     // let type;
@@ -2561,6 +2570,36 @@ const extractTypeAnnotation = decl => {
   return { type, typeName, elementType };
 };
 
+const setLocalWithType = (scope, name, isGlobal, decl, tee = false, overrideType = undefined) => {
+  const local = isGlobal ? globals[name] : scope.locals[name];
+  const out = Array.isArray(decl) ? decl : generate(scope, decl, isGlobal, name);
+
+  // optimize away last type usage
+  // todo: detect last type then i32 conversion op
+  const lastOp = out.at(-1);
+  if (lastOp[0] === Opcodes.local_set && lastOp[1] === scope.locals['#last_type']?.idx) {
+    out.pop();
+
+    const setOut = setType(scope, name, []);
+    out.push(
+      // drop if setType is empty
+      ...(setOut.length === 0 ? [ [ Opcodes.drop ] ] : setOut),
+
+      [ isGlobal ? Opcodes.global_set : Opcodes.local_set, local.idx ],
+      ...(tee ? [ [ isGlobal ? Opcodes.global_get : Opcodes.local_get, local.idx ] ] : [])
+    );
+  } else {
+    out.push(
+      [ isGlobal ? Opcodes.global_set : Opcodes.local_set, local.idx ],
+      ...(tee ? [ [ isGlobal ? Opcodes.global_get : Opcodes.local_get, local.idx ] ] : []),
+
+      ...setType(scope, name, overrideType ?? getNodeType(scope, decl))
+    );
+  }
+
+  return out;
+};
+
 const generateVar = (scope, decl) => {
   let out = [];
 
@@ -2713,17 +2752,19 @@ const generateVar = (scope, decl) => {
     if (x.init) {
       const alreadyArray = scope.arrays?.get(name) != null;
 
-      const newOut = generate(scope, x.init, global, name);
+      let newOut = generate(scope, x.init, global, name);
       if (!alreadyArray && scope.arrays?.get(name) != null) {
         // hack to set local as pointer before
         newOut.unshift(...number(scope.arrays.get(name)), [ global ? Opcodes.global_set : Opcodes.local_set, idx ]);
         if (newOut.at(-1) == Opcodes.i32_from_u) newOut.pop();
-        newOut.push([ Opcodes.drop ]);
+        newOut.push(
+          [ Opcodes.drop ],
+          ...setType(scope, name, getNodeType(scope, x.init))
+        );
       } else {
-        newOut.push([ global ? Opcodes.global_set : Opcodes.local_set, idx ]);
+        newOut = setLocalWithType(scope, name, global, newOut, false, getNodeType(scope, x.init));
       }
 
-      newOut.push(...setType(scope, name, getNodeType(scope, x.init)));
       out = out.concat(newOut);
 
       if (globalThis.precompile && global) {
@@ -2848,13 +2889,13 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
             [ Opcodes.local_get, localTmp(scope, '#objset_property') ],
             ...getNodeType(scope, property),
 
-            [ Opcodes.call, funcIndex.__Map_prototype_get ],
+            [ Opcodes.call, ...unsignedLEB128(funcIndex.__Map_prototype_get) ],
             ...setLastType(scope)
           ], generate(scope, decl.right), getLastType(scope), getNodeType(scope, decl.right), false, name, true)),
           [ Opcodes.local_tee, newValueTmp ],
           ...getNodeType(scope, decl),
 
-          [ Opcodes.call, funcIndex.__Map_prototype_set ],
+          [ Opcodes.call, ...unsignedLEB128(funcIndex.__Map_prototype_set) ],
           [ Opcodes.drop ],
 
           ...setLastType(scope, getNodeType(scope, decl)),
@@ -3041,13 +3082,7 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
   }
 
   if (op === '=') {
-    return [
-      ...generate(scope, decl.right, isGlobal, name),
-      [ isGlobal ? Opcodes.global_set : Opcodes.local_set, local.idx ],
-      [ isGlobal ? Opcodes.global_get : Opcodes.local_get, local.idx ],
-
-      ...setType(scope, name, getNodeType(scope, decl.right))
-    ];
+    return setLocalWithType(scope, name, isGlobal, decl.right, true);
   }
 
   if (op === '||' || op === '&&' || op === '??') {
@@ -3060,7 +3095,7 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
       ...performOp(scope, op, [
         [ isGlobal ? Opcodes.global_get : Opcodes.local_get, local.idx ]
       ], [
-        ...generate(scope, decl.right),
+        ...generate(scope, decl.right, isGlobal, name),
         [ isGlobal ? Opcodes.global_set : Opcodes.local_set, local.idx ],
         [ isGlobal ? Opcodes.global_get : Opcodes.local_get, local.idx ]
       ], getType(scope, name), getNodeType(scope, decl.right), isGlobal, name, true),
@@ -3070,13 +3105,12 @@ const generateAssign = (scope, decl, _global, _name, valueUnused = false) => {
     ];
   }
 
-  return [
-    ...performOp(scope, op, [ [ isGlobal ? Opcodes.global_get : Opcodes.local_get, local.idx ] ], generate(scope, decl.right), getType(scope, name), getNodeType(scope, decl.right), isGlobal, name, true),
-    [ isGlobal ? Opcodes.global_set : Opcodes.local_set, local.idx ],
-    [ isGlobal ? Opcodes.global_get : Opcodes.local_get, local.idx ],
-
-    ...setType(scope, name, getNodeType(scope, decl))
-  ];
+  return setLocalWithType(
+    scope, name, isGlobal,
+    performOp(scope, op, [ [ isGlobal ? Opcodes.global_get : Opcodes.local_get, local.idx ] ], generate(scope, decl.right), getType(scope, name), getNodeType(scope, decl.right), isGlobal, name, true),
+    true,
+    getNodeType(scope, decl)
+  );
 };
 
 const ifIdentifierErrors = (scope, decl) => {
@@ -4132,16 +4166,19 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
     const firstAssign = !scope.arrays.has(uniqueName);
     if (firstAssign) scope.arrays.set(uniqueName, rawPtr);
 
-    if (Prefs.data && firstAssign && useRawElements) {
+    const local = global ? globals[name] : scope.locals[name];
+    if (
+      Prefs.data && firstAssign && useRawElements &&
+      (!globalThis.precompile || !global)
+    ) {
       makeData(scope, elements, rawPtr, itemType, initEmpty);
 
       // local value as pointer
       return [ number(rawPtr, intOut ? Valtype.i32 : valtypeBinary), pointer ];
     }
 
-    const local = global ? globals[name] : scope.locals[name];
-    const pointerTmp = local != null ? localTmp(scope, '#makearray_pointer_tmp', Valtype.i32) : null;
-    if (pointerTmp != null) {
+    if (local != null) {
+      const pointerTmp = localTmp(scope, '#makearray_pointer_tmp', Valtype.i32);
       out.push(
         [ global ? Opcodes.global_get : Opcodes.local_get, local.idx ],
         Opcodes.i32_to_u,
@@ -4310,7 +4347,7 @@ const generateObject = (scope, decl, global = false, name = '$undeclared') => {
       ...generate(scope, value),
       ...getNodeType(scope, value),
 
-      [ Opcodes.call, funcIndex.__Map_prototype_set ],
+      [ Opcodes.call, ...unsignedLEB128(funcIndex.__Map_prototype_set) ],
 
       [ Opcodes.drop ],
       [ Opcodes.drop ]
@@ -4544,7 +4581,7 @@ const generateMember = (scope, decl, _global, _name) => {
       ...propertyWasm,
       ...getNodeType(scope, property),
 
-      [ Opcodes.call, funcIndex.__Map_prototype_get ],
+      [ Opcodes.call, ...unsignedLEB128(funcIndex.__Map_prototype_get) ],
       ...setLastType(scope)
     ],
 
@@ -4830,10 +4867,9 @@ const internalConstrs = {
       }, global, name);
 
       // new Array(n)
-
       const [ out, pointer ] = makeArray(scope, {
         rawElements: new Array(0)
-      }, global, name, true, undefined, true);
+      }, global, name, true, undefined, true, true);
 
       const arg = decl.arguments[0] ?? DEFAULT_VALUE;
 

package/compiler/decompile.js

@@ -89,10 +89,11 @@ 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]);
+      const idx = read_unsignedLEB128(inst.slice(1));
+      const callFunc = funcs.find(x => x.index === idx);
       if (callFunc) out += ` ;; $${callFunc.name} ${makeSignature(callFunc.params, callFunc.returns)}`;
-      if (globalThis.importFuncs && inst[1] < importFuncs.length) {
-        const importFunc = importFuncs[inst[1]];
+      if (globalThis.importFuncs && idx < importFuncs.length) {
+        const importFunc = importFuncs[idx];
         out += ` ;; import ${importFunc.name} ${makeSignature(typeof importFunc.params === 'object' ? importFunc.params : new Array(importFunc.params).fill(valtypeBinary), new Array(importFunc.returns).fill(valtypeBinary),)}`;
       }
     }