@tsvm/bytecode 0.1.1 → 0.1.2

package/dist/index.js

@@ -4,12 +4,9 @@ function generateRemappedOpcodes(seed) {
   const forward = /* @__PURE__ */ new Map();
   const reverse = /* @__PURE__ */ new Map();
   const rng = new SeededRandom(seed);
-  const opcodes = [];
-  for (const key in OpCode) {
-    if (!Number.isNaN(Number(key))) {
-      opcodes.push(Number(key));
-    }
-  }
+  const opcodes = Object.values(OpCode).filter(
+    (v) => typeof v === "number"
+  );
   const availableSlots = [];
   for (let i = 0; i < 256; i++) {
     availableSlots.push(i);
@@ -53,7 +50,7 @@ function encodeBytecode(instructions, mapping, config, rng) {
       if (Array.isArray(forward)) {
         if (!rng) throw new Error("SeededRandom required when opcodeMap is provided");
         mappedOp = forward[Math.floor(rng.next() * forward.length)];
-      } else if (forward !== void 0) {
+      } else if (typeof forward === "number") {
         mappedOp = forward;
       }
     }
@@ -499,11 +496,11 @@ function compileToBytecode(irModule, config) {
           changed = true;
         }
         const inst = flatInsts[i];
-        let mappedOp = inst.mappedOp !== void 0 ? inst.mappedOp : inst.opcode;
-        const forward = mapping.forward.get(inst.opcode);
+        let mappedOp = inst.mappedOp ?? inst.opcode;
         if (inst.mappedOp === void 0) {
+          const forward = mapping.forward.get(inst.opcode);
           if (Array.isArray(forward)) mappedOp = forward[0];
-          else if (forward !== void 0) mappedOp = forward;
+          else if (typeof forward === "number") mappedOp = forward;
         }
         let size = 1;
         if (config.junkInsertion) {
@@ -605,6 +602,9 @@ function compileToBytecode(irModule, config) {
 
 // src/decoder.ts
 import { ImmediateEncodingScheme as ImmediateEncodingScheme2, ConstantEncodingScheme as ConstantEncodingScheme2, OperandKind as OperandKind3, OpCode as OpCode4, ConstantKind } from "@tsvm/shared";
+function assertOpCode(value) {
+  return value;
+}
 function numToOperandKind(kind) {
   switch (kind) {
     case 0:
@@ -747,7 +747,7 @@ function decodeBytecode(bytes, mapping, config) {
       mappedOp = raw[offset.pos++];
     }
     const canonicalOp = mapping.reverse.get(mappedOp);
-    const opcode = canonicalOp ?? mappedOp;
+    const opcode = canonicalOp ?? assertOpCode(mappedOp);
     const numJunk = config.junkInsertion ? (opcode * 7 + config.seed) % 4 : 0;
     offset.pos += numJunk;
     const layout = opcodeLayout[opcode] ?? OPCODE_DEFAULT_LAYOUT;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsvm/bytecode",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "files": [
     "dist",
     "LICENSE"
@@ -19,7 +19,7 @@
     }
   },
   "dependencies": {
-    "@tsvm/shared": "0.1.0"
+    "@tsvm/shared": "0.1.1"
   },
   "devDependencies": {
     "tsup": "^8.4.0",