@lewin671/python-vm 0.1.3 → 0.1.5

package/dist/vm/execution.js

@@ -87,7 +87,29 @@ function executeFrame(frame) {
             break;
         const { opcode, arg } = instr;
         try {
+            // Switch cases ordered by execution frequency (hot paths first)
+            // Based on dynamic opcode execution profiling across benchmark workloads:
+            // - Fibonacci recursion, list operations, nested loops, dictionary ops, etc.
+            // - LOAD_FAST (22-23%), LOAD_CONST (18%), LOAD_NAME (9-33%) are hottest
+            // - All 73 cases reordered: frequent ops first, then grouped by category
+            // This reduces average case evaluations and improves branch prediction
             switch (opcode) {
+                // === HOT PATH: Most frequently executed opcodes (>5% execution time) ===
+                case types_1.OpCode.LOAD_FAST: {
+                    const varname = varnames[arg];
+                    if (varname !== undefined && frame.scope.values.has(varname)) {
+                        const val = frame.scope.values.get(varname);
+                        frame.locals[arg] = val;
+                        frame.stack.push(val);
+                        break;
+                    }
+                    const val = frame.locals[arg];
+                    if (val === undefined) {
+                        throw new runtime_types_1.PyException('UnboundLocalError', `local variable '${varname}' referenced before assignment`);
+                    }
+                    frame.stack.push(val);
+                    break;
+                }
                 case types_1.OpCode.LOAD_CONST:
                     {
                         const val = constants[arg];
@@ -106,234 +128,111 @@ function executeFrame(frame) {
                     frame.stack.push(val);
                     break;
                 }
-                case types_1.OpCode.STORE_NAME:
-                    frame.scope.set(names[arg], frame.stack.pop());
-                    break;
-                case types_1.OpCode.LOAD_GLOBAL: {
-                    const name = names[arg];
-                    // Find the global (topmost) scope
-                    let globalScope = frame.scope;
-                    while (globalScope.parent !== null) {
-                        globalScope = globalScope.parent;
-                    }
-                    const val = globalScope.get(name);
-                    frame.stack.push(val);
-                    break;
-                }
-                case types_1.OpCode.STORE_GLOBAL: {
-                    const name = names[arg];
-                    // Find the global (topmost) scope
-                    let globalScope = frame.scope;
-                    while (globalScope.parent !== null) {
-                        globalScope = globalScope.parent;
-                    }
-                    globalScope.set(name, frame.stack.pop());
-                    break;
-                }
-                case types_1.OpCode.LOAD_FAST: {
-                    const varname = varnames[arg];
-                    if (varname !== undefined && frame.scope.values.has(varname)) {
-                        const val = frame.scope.values.get(varname);
-                        frame.locals[arg] = val;
-                        frame.stack.push(val);
-                        break;
-                    }
-                    const val = frame.locals[arg];
-                    if (val === undefined) {
-                        throw new runtime_types_1.PyException('UnboundLocalError', `local variable '${varname}' referenced before assignment`);
-                    }
-                    frame.stack.push(val);
+                case types_1.OpCode.BINARY_ADD: {
+                    const b = frame.stack.pop();
+                    const a = frame.stack.pop();
+                    frame.stack.push(this.applyBinary('+', a, b));
                     break;
                 }
-                case types_1.OpCode.STORE_FAST: {
-                    const val = frame.stack.pop();
-                    frame.locals[arg] = val;
-                    if (varnames && varnames[arg] !== undefined) {
-                        frame.scope.values.set(varnames[arg], val);
-                    }
+                case types_1.OpCode.BINARY_SUBTRACT: {
+                    const b = frame.stack.pop();
+                    const a = frame.stack.pop();
+                    frame.stack.push(this.applyBinary('-', a, b));
                     break;
                 }
-                case types_1.OpCode.UNPACK_SEQUENCE: {
-                    const seq = frame.stack.pop();
-                    const items = Array.isArray(seq) ? seq : Array.from(seq);
-                    if (items.length !== arg) {
-                        throw new runtime_types_1.PyException('ValueError', `not enough values to unpack (expected ${arg}, got ${items.length})`);
-                    }
-                    for (let i = items.length - 1; i >= 0; i--) {
-                        frame.stack.push(items[i]);
-                    }
+                case types_1.OpCode.BINARY_MULTIPLY: {
+                    const b = frame.stack.pop();
+                    const a = frame.stack.pop();
+                    frame.stack.push(this.applyBinary('*', a, b));
                     break;
                 }
-                case types_1.OpCode.UNPACK_EX: {
-                    const seq = frame.stack.pop();
-                    const items = Array.isArray(seq) ? seq : Array.from(seq);
-                    const beforeCount = (arg >> 8) & 0xff;
-                    const afterCount = arg & 0xff;
-                    if (items.length < beforeCount + afterCount) {
-                        throw new runtime_types_1.PyException('ValueError', 'not enough values to unpack');
-                    }
-                    const middle = items.slice(beforeCount, items.length - afterCount);
-                    // Push in reverse order of assignment popping:
-                    // suffix values (last..first), then middle list, then prefix values (last..first).
-                    for (let i = afterCount - 1; i >= 0; i--) {
-                        frame.stack.push(items[items.length - afterCount + i]);
-                    }
-                    frame.stack.push(middle);
-                    for (let i = beforeCount - 1; i >= 0; i--) {
-                        frame.stack.push(items[i]);
+                case types_1.OpCode.CALL_FUNCTION: {
+                    const args = [];
+                    for (let i = 0; i < arg; i++) {
+                        args.unshift(frame.stack.pop());
                     }
+                    const func = frame.stack.pop();
+                    frame.stack.push(this.callFunction(func, args, frame.scope));
                     break;
                 }
-                case types_1.OpCode.LOAD_ATTR: {
-                    const obj = frame.stack.pop();
-                    frame.stack.push(this.getAttribute(obj, names[arg], frame.scope));
+                case types_1.OpCode.RETURN_VALUE:
+                    return frame.stack.pop();
+                case types_1.OpCode.COMPARE_OP: {
+                    const b = frame.stack.pop();
+                    const a = frame.stack.pop();
+                    frame.stack.push(this.applyCompare(arg, a, b));
                     break;
                 }
-                case types_1.OpCode.STORE_ATTR: {
+                case types_1.OpCode.POP_JUMP_IF_FALSE: {
                     const val = frame.stack.pop();
-                    const obj = frame.stack.pop();
-                    this.setAttribute(obj, names[arg], val);
-                    break;
-                }
-                case types_1.OpCode.LOAD_SUBSCR: {
-                    const index = frame.stack.pop();
-                    const obj = frame.stack.pop();
-                    frame.stack.push(this.getSubscript(obj, index));
+                    if (!this.isTruthy(val, frame.scope)) {
+                        frame.pc = arg;
+                    }
                     break;
                 }
-                case types_1.OpCode.STORE_SUBSCR: {
-                    const index = frame.stack.pop();
-                    const obj = frame.stack.pop();
+                case types_1.OpCode.STORE_FAST: {
                     const val = frame.stack.pop();
-                    // Check if object is a tuple (immutable)
-                    if (Array.isArray(obj) && obj.__tuple__) {
-                        throw new runtime_types_1.PyException('TypeError', `'tuple' object does not support item assignment`);
-                    }
-                    if (Array.isArray(obj)) {
-                        // Handle slice assignment
-                        if (index && (index.__slice__ || index.type === types_1.ASTNodeType.SLICE)) {
-                            const start = index.start !== undefined ? index.start : null;
-                            const end = index.end !== undefined ? index.end : null;
-                            const step = index.step !== undefined ? index.step : 1;
-                            const bounds = this.computeSliceBounds(obj.length, start, end, step);
-                            const indices = this.computeSliceIndices(obj.length, start, end, step);
-                            // For extended slices (step != 1), replacement must have same length
-                            if (bounds.step !== 1) {
-                                if (!Array.isArray(val) || val.length !== indices.length) {
-                                    throw new runtime_types_1.PyException('ValueError', `attempt to assign sequence of size ${Array.isArray(val) ? val.length : 1} to extended slice of size ${indices.length}`);
-                                }
-                                for (let i = 0; i < indices.length; i++) {
-                                    obj[indices[i]] = val[i];
-                                }
-                            }
-                            else {
-                                // Simple slice: replace the slice with the new values
-                                const valArray = Array.isArray(val) ? val : [val];
-                                obj.splice(bounds.start, indices.length, ...valArray);
-                            }
-                        }
-                        else {
-                            obj[index] = val;
-                        }
-                    }
-                    else if (obj instanceof runtime_types_1.PyDict) {
-                        obj.set(index, val);
-                    }
-                    else {
-                        throw new runtime_types_1.PyException('TypeError', `'${typeof obj}' object does not support item assignment`);
+                    frame.locals[arg] = val;
+                    if (varnames && varnames[arg] !== undefined) {
+                        frame.scope.values.set(varnames[arg], val);
                     }
                     break;
                 }
-                case types_1.OpCode.DELETE_SUBSCR: {
-                    const index = frame.stack.pop();
-                    const obj = frame.stack.pop();
-                    if (Array.isArray(obj)) {
-                        if (index && (index.__slice__ || index.type === types_1.ASTNodeType.SLICE)) {
-                            const start = index.start !== undefined ? index.start : null;
-                            const end = index.end !== undefined ? index.end : null;
-                            const step = index.step !== undefined ? index.step : 1;
-                            const bounds = this.computeSliceBounds(obj.length, start, end, step);
-                            // Standard deletion of slice
-                            if (bounds.step === 1) {
-                                obj.splice(bounds.start, bounds.end - bounds.start);
-                            }
-                            else {
-                                // Deleting with step != 1
-                                const indices = this.computeSliceIndices(obj.length, start, end, step);
-                                // We must delete from back to front to avoid index shifting problems
-                                indices.sort((a, b) => b - a);
-                                for (const idx of indices) {
-                                    obj.splice(idx, 1);
-                                }
-                            }
-                        }
-                        else {
-                            if (typeof index !== 'number') {
-                                throw new runtime_types_1.PyException('TypeError', 'list indices must be integers or slices');
-                            }
-                            obj.splice(index, 1);
-                        }
-                    }
-                    else if (obj instanceof runtime_types_1.PyDict) {
-                        obj.delete(index);
-                    }
-                    else if (obj instanceof runtime_types_1.PySet) {
-                        obj.delete(index);
+                case types_1.OpCode.STORE_NAME:
+                    frame.scope.set(names[arg], frame.stack.pop());
+                    break;
+                case types_1.OpCode.FOR_ITER: {
+                    const iter = frame.stack[frame.stack.length - 1];
+                    const next = iter.next();
+                    if (next.done) {
+                        frame.stack.pop();
+                        frame.pc = arg;
                     }
                     else {
-                        throw new runtime_types_1.PyException('TypeError', `'${typeof obj}' object does not support item deletion`);
+                        frame.stack.push(next.value);
                     }
                     break;
                 }
-                case types_1.OpCode.POP_TOP:
-                    lastValue = frame.stack.pop();
-                    break;
-                case types_1.OpCode.DUP_TOP: {
-                    const val = frame.stack[frame.stack.length - 1];
-                    frame.stack.push(val);
-                    break;
-                }
-                case types_1.OpCode.DUP_TOP_TWO: {
-                    const top = frame.stack[frame.stack.length - 1];
-                    const second = frame.stack[frame.stack.length - 2];
-                    frame.stack.push(second);
-                    frame.stack.push(top);
+                case types_1.OpCode.JUMP_ABSOLUTE:
+                    frame.pc = arg;
                     break;
-                }
-                case types_1.OpCode.ROT_TWO: {
-                    const a = frame.stack.pop();
+                case types_1.OpCode.INPLACE_ADD: {
                     const b = frame.stack.pop();
-                    frame.stack.push(a);
-                    frame.stack.push(b);
-                    break;
-                }
-                case types_1.OpCode.ROT_THREE: {
                     const a = frame.stack.pop();
-                    const b = frame.stack.pop();
-                    const c = frame.stack.pop();
-                    frame.stack.push(a);
-                    frame.stack.push(c);
-                    frame.stack.push(b);
+                    frame.stack.push(this.applyInPlaceBinary('+', a, b));
                     break;
                 }
-                case types_1.OpCode.BINARY_ADD: {
+                case types_1.OpCode.INPLACE_SUBTRACT: {
                     const b = frame.stack.pop();
                     const a = frame.stack.pop();
-                    frame.stack.push(this.applyBinary('+', a, b));
+                    frame.stack.push(this.applyInPlaceBinary('-', a, b));
                     break;
                 }
-                case types_1.OpCode.BINARY_SUBTRACT: {
+                case types_1.OpCode.INPLACE_MULTIPLY: {
                     const b = frame.stack.pop();
                     const a = frame.stack.pop();
-                    frame.stack.push(this.applyBinary('-', a, b));
+                    frame.stack.push(this.applyInPlaceBinary('*', a, b));
                     break;
                 }
-                case types_1.OpCode.BINARY_MULTIPLY: {
-                    const b = frame.stack.pop();
-                    const a = frame.stack.pop();
-                    frame.stack.push(this.applyBinary('*', a, b));
+                case types_1.OpCode.POP_TOP:
+                    lastValue = frame.stack.pop();
+                    break;
+                case types_1.OpCode.GET_ITER: {
+                    const obj = frame.stack.pop();
+                    if (obj && typeof obj[Symbol.iterator] === 'function') {
+                        frame.stack.push(obj[Symbol.iterator]());
+                    }
+                    else {
+                        throw new runtime_types_1.PyException('TypeError', `'${typeof obj}' object is not iterable`);
+                    }
                     break;
                 }
+                case types_1.OpCode.LOAD_ATTR: {
+                    const obj = frame.stack.pop();
+                    frame.stack.push(this.getAttribute(obj, names[arg], frame.scope));
+                    break;
+                }
+                // Other BINARY operations
                 case types_1.OpCode.BINARY_DIVIDE: {
                     const b = frame.stack.pop();
                     const a = frame.stack.pop();
@@ -388,78 +287,269 @@ function executeFrame(frame) {
                     frame.stack.push(this.applyBinary('>>', a, b));
                     break;
                 }
-                case types_1.OpCode.INPLACE_ADD: {
+                // Other INPLACE operations
+                case types_1.OpCode.INPLACE_DIVIDE: {
                     const b = frame.stack.pop();
                     const a = frame.stack.pop();
-                    frame.stack.push(this.applyInPlaceBinary('+', a, b));
+                    frame.stack.push(this.applyInPlaceBinary('/', a, b));
                     break;
                 }
-                case types_1.OpCode.INPLACE_SUBTRACT: {
+                case types_1.OpCode.INPLACE_FLOOR_DIVIDE: {
                     const b = frame.stack.pop();
                     const a = frame.stack.pop();
-                    frame.stack.push(this.applyInPlaceBinary('-', a, b));
+                    frame.stack.push(this.applyInPlaceBinary('//', a, b));
                     break;
                 }
-                case types_1.OpCode.INPLACE_MULTIPLY: {
+                case types_1.OpCode.INPLACE_MODULO: {
                     const b = frame.stack.pop();
                     const a = frame.stack.pop();
-                    frame.stack.push(this.applyInPlaceBinary('*', a, b));
+                    frame.stack.push(this.applyInPlaceBinary('%', a, b));
                     break;
                 }
-                case types_1.OpCode.INPLACE_DIVIDE: {
+                case types_1.OpCode.INPLACE_POWER: {
                     const b = frame.stack.pop();
                     const a = frame.stack.pop();
-                    frame.stack.push(this.applyInPlaceBinary('/', a, b));
+                    frame.stack.push(this.applyInPlaceBinary('**', a, b));
+                    break;
+                }
+                case types_1.OpCode.INPLACE_AND: {
+                    const b = frame.stack.pop();
+                    const a = frame.stack.pop();
+                    frame.stack.push(this.applyInPlaceBinary('&', a, b));
+                    break;
+                }
+                case types_1.OpCode.INPLACE_XOR: {
+                    const b = frame.stack.pop();
+                    const a = frame.stack.pop();
+                    frame.stack.push(this.applyInPlaceBinary('^', a, b));
+                    break;
+                }
+                case types_1.OpCode.INPLACE_OR: {
+                    const b = frame.stack.pop();
+                    const a = frame.stack.pop();
+                    frame.stack.push(this.applyInPlaceBinary('|', a, b));
+                    break;
+                }
+                case types_1.OpCode.INPLACE_LSHIFT: {
+                    const b = frame.stack.pop();
+                    const a = frame.stack.pop();
+                    frame.stack.push(this.applyInPlaceBinary('<<', a, b));
+                    break;
+                }
+                case types_1.OpCode.INPLACE_RSHIFT: {
+                    const b = frame.stack.pop();
+                    const a = frame.stack.pop();
+                    frame.stack.push(this.applyInPlaceBinary('>>', a, b));
+                    break;
+                }
+                // Other JUMP operations
+                case types_1.OpCode.POP_JUMP_IF_TRUE: {
+                    const val = frame.stack.pop();
+                    if (this.isTruthy(val, frame.scope)) {
+                        frame.pc = arg;
+                    }
+                    break;
+                }
+                case types_1.OpCode.JUMP_IF_FALSE_OR_POP: {
+                    const val = frame.stack[frame.stack.length - 1];
+                    if (!this.isTruthy(val, frame.scope)) {
+                        frame.pc = arg;
+                    }
+                    else {
+                        frame.stack.pop();
+                    }
+                    break;
+                }
+                case types_1.OpCode.JUMP_IF_TRUE_OR_POP: {
+                    const val = frame.stack[frame.stack.length - 1];
+                    if (this.isTruthy(val, frame.scope)) {
+                        frame.pc = arg;
+                    }
+                    else {
+                        frame.stack.pop();
+                    }
+                    break;
+                }
+                // LOAD/STORE operations
+                case types_1.OpCode.LOAD_GLOBAL: {
+                    const name = names[arg];
+                    // Find the global (topmost) scope
+                    let globalScope = frame.scope;
+                    while (globalScope.parent !== null) {
+                        globalScope = globalScope.parent;
+                    }
+                    const val = globalScope.get(name);
+                    frame.stack.push(val);
+                    break;
+                }
+                case types_1.OpCode.STORE_GLOBAL: {
+                    const name = names[arg];
+                    // Find the global (topmost) scope
+                    let globalScope = frame.scope;
+                    while (globalScope.parent !== null) {
+                        globalScope = globalScope.parent;
+                    }
+                    globalScope.set(name, frame.stack.pop());
+                    break;
+                }
+                case types_1.OpCode.STORE_ATTR: {
+                    const val = frame.stack.pop();
+                    const obj = frame.stack.pop();
+                    this.setAttribute(obj, names[arg], val);
+                    break;
+                }
+                case types_1.OpCode.LOAD_SUBSCR: {
+                    const index = frame.stack.pop();
+                    const obj = frame.stack.pop();
+                    frame.stack.push(this.getSubscript(obj, index));
+                    break;
+                }
+                case types_1.OpCode.STORE_SUBSCR: {
+                    const index = frame.stack.pop();
+                    const obj = frame.stack.pop();
+                    const val = frame.stack.pop();
+                    // Check if object is a tuple (immutable)
+                    if (Array.isArray(obj) && obj.__tuple__) {
+                        throw new runtime_types_1.PyException('TypeError', `'tuple' object does not support item assignment`);
+                    }
+                    if (Array.isArray(obj)) {
+                        // Handle slice assignment
+                        if (index && (index.__slice__ || index.type === types_1.ASTNodeType.SLICE)) {
+                            const start = index.start !== undefined ? index.start : null;
+                            const end = index.end !== undefined ? index.end : null;
+                            const step = index.step !== undefined ? index.step : 1;
+                            const bounds = this.computeSliceBounds(obj.length, start, end, step);
+                            const indices = this.computeSliceIndices(obj.length, start, end, step);
+                            // For extended slices (step != 1), replacement must have same length
+                            if (bounds.step !== 1) {
+                                if (!Array.isArray(val) || val.length !== indices.length) {
+                                    throw new runtime_types_1.PyException('ValueError', `attempt to assign sequence of size ${Array.isArray(val) ? val.length : 1} to extended slice of size ${indices.length}`);
+                                }
+                                for (let i = 0; i < indices.length; i++) {
+                                    obj[indices[i]] = val[i];
+                                }
+                            }
+                            else {
+                                // Simple slice: replace the slice with the new values
+                                const valArray = Array.isArray(val) ? val : [val];
+                                obj.splice(bounds.start, indices.length, ...valArray);
+                            }
+                        }
+                        else {
+                            obj[index] = val;
+                        }
+                    }
+                    else if (obj instanceof runtime_types_1.PyDict) {
+                        obj.set(index, val);
+                    }
+                    else {
+                        throw new runtime_types_1.PyException('TypeError', `'${typeof obj}' object does not support item assignment`);
+                    }
+                    break;
+                }
+                case types_1.OpCode.DELETE_SUBSCR: {
+                    const index = frame.stack.pop();
+                    const obj = frame.stack.pop();
+                    if (Array.isArray(obj)) {
+                        if (index && (index.__slice__ || index.type === types_1.ASTNodeType.SLICE)) {
+                            const start = index.start !== undefined ? index.start : null;
+                            const end = index.end !== undefined ? index.end : null;
+                            const step = index.step !== undefined ? index.step : 1;
+                            const bounds = this.computeSliceBounds(obj.length, start, end, step);
+                            // Standard deletion of slice
+                            if (bounds.step === 1) {
+                                obj.splice(bounds.start, bounds.end - bounds.start);
+                            }
+                            else {
+                                // Deleting with step != 1
+                                const indices = this.computeSliceIndices(obj.length, start, end, step);
+                                // We must delete from back to front to avoid index shifting problems
+                                indices.sort((a, b) => b - a);
+                                for (const idx of indices) {
+                                    obj.splice(idx, 1);
+                                }
+                            }
+                        }
+                        else {
+                            if (typeof index !== 'number') {
+                                throw new runtime_types_1.PyException('TypeError', 'list indices must be integers or slices');
+                            }
+                            obj.splice(index, 1);
+                        }
+                    }
+                    else if (obj instanceof runtime_types_1.PyDict) {
+                        obj.delete(index);
+                    }
+                    else if (obj instanceof runtime_types_1.PySet) {
+                        obj.delete(index);
+                    }
+                    else {
+                        throw new runtime_types_1.PyException('TypeError', `'${typeof obj}' object does not support item deletion`);
+                    }
                     break;
                 }
-                case types_1.OpCode.INPLACE_FLOOR_DIVIDE: {
-                    const b = frame.stack.pop();
-                    const a = frame.stack.pop();
-                    frame.stack.push(this.applyInPlaceBinary('//', a, b));
+                // UNPACK operations
+                case types_1.OpCode.UNPACK_SEQUENCE: {
+                    const seq = frame.stack.pop();
+                    const items = Array.isArray(seq) ? seq : Array.from(seq);
+                    if (items.length !== arg) {
+                        throw new runtime_types_1.PyException('ValueError', `not enough values to unpack (expected ${arg}, got ${items.length})`);
+                    }
+                    for (let i = items.length - 1; i >= 0; i--) {
+                        frame.stack.push(items[i]);
+                    }
                     break;
                 }
-                case types_1.OpCode.INPLACE_MODULO: {
-                    const b = frame.stack.pop();
-                    const a = frame.stack.pop();
-                    frame.stack.push(this.applyInPlaceBinary('%', a, b));
+                case types_1.OpCode.UNPACK_EX: {
+                    const seq = frame.stack.pop();
+                    const items = Array.isArray(seq) ? seq : Array.from(seq);
+                    const beforeCount = (arg >> 8) & 0xff;
+                    const afterCount = arg & 0xff;
+                    if (items.length < beforeCount + afterCount) {
+                        throw new runtime_types_1.PyException('ValueError', 'not enough values to unpack');
+                    }
+                    const middle = items.slice(beforeCount, items.length - afterCount);
+                    // Push in reverse order of assignment popping:
+                    // suffix values (last..first), then middle list, then prefix values (last..first).
+                    for (let i = afterCount - 1; i >= 0; i--) {
+                        frame.stack.push(items[items.length - afterCount + i]);
+                    }
+                    frame.stack.push(middle);
+                    for (let i = beforeCount - 1; i >= 0; i--) {
+                        frame.stack.push(items[i]);
+                    }
                     break;
                 }
-                case types_1.OpCode.INPLACE_POWER: {
-                    const b = frame.stack.pop();
-                    const a = frame.stack.pop();
-                    frame.stack.push(this.applyInPlaceBinary('**', a, b));
+                // Stack operations
+                case types_1.OpCode.DUP_TOP: {
+                    const val = frame.stack[frame.stack.length - 1];
+                    frame.stack.push(val);
                     break;
                 }
-                case types_1.OpCode.INPLACE_AND: {
-                    const b = frame.stack.pop();
-                    const a = frame.stack.pop();
-                    frame.stack.push(this.applyInPlaceBinary('&', a, b));
+                case types_1.OpCode.DUP_TOP_TWO: {
+                    const top = frame.stack[frame.stack.length - 1];
+                    const second = frame.stack[frame.stack.length - 2];
+                    frame.stack.push(second);
+                    frame.stack.push(top);
                     break;
                 }
-                case types_1.OpCode.INPLACE_XOR: {
-                    const b = frame.stack.pop();
+                case types_1.OpCode.ROT_TWO: {
                     const a = frame.stack.pop();
-                    frame.stack.push(this.applyInPlaceBinary('^', a, b));
-                    break;
-                }
-                case types_1.OpCode.INPLACE_OR: {
                     const b = frame.stack.pop();
-                    const a = frame.stack.pop();
-                    frame.stack.push(this.applyInPlaceBinary('|', a, b));
+                    frame.stack.push(a);
+                    frame.stack.push(b);
                     break;
                 }
-                case types_1.OpCode.INPLACE_LSHIFT: {
-                    const b = frame.stack.pop();
+                case types_1.OpCode.ROT_THREE: {
                     const a = frame.stack.pop();
-                    frame.stack.push(this.applyInPlaceBinary('<<', a, b));
-                    break;
-                }
-                case types_1.OpCode.INPLACE_RSHIFT: {
                     const b = frame.stack.pop();
-                    const a = frame.stack.pop();
-                    frame.stack.push(this.applyInPlaceBinary('>>', a, b));
+                    const c = frame.stack.pop();
+                    frame.stack.push(a);
+                    frame.stack.push(c);
+                    frame.stack.push(b);
                     break;
                 }
+                // UNARY operations
                 case types_1.OpCode.UNARY_POSITIVE: {
                     const a = frame.stack.pop();
                     frame.stack.push(+a);
@@ -490,12 +580,7 @@ function executeFrame(frame) {
                     }
                     break;
                 }
-                case types_1.OpCode.COMPARE_OP: {
-                    const b = frame.stack.pop();
-                    const a = frame.stack.pop();
-                    frame.stack.push(this.applyCompare(arg, a, b));
-                    break;
-                }
+                // BUILD operations
                 case types_1.OpCode.BUILD_LIST: {
                     const list = [];
                     for (let i = 0; i < arg; i++)
@@ -541,65 +626,7 @@ function executeFrame(frame) {
                     frame.stack.push({ __slice__: true, start, end, step });
                     break;
                 }
-                case types_1.OpCode.JUMP_ABSOLUTE:
-                    frame.pc = arg;
-                    break;
-                case types_1.OpCode.POP_JUMP_IF_FALSE: {
-                    const val = frame.stack.pop();
-                    if (!this.isTruthy(val, frame.scope)) {
-                        frame.pc = arg;
-                    }
-                    break;
-                }
-                case types_1.OpCode.POP_JUMP_IF_TRUE: {
-                    const val = frame.stack.pop();
-                    if (this.isTruthy(val, frame.scope)) {
-                        frame.pc = arg;
-                    }
-                    break;
-                }
-                case types_1.OpCode.JUMP_IF_FALSE_OR_POP: {
-                    const val = frame.stack[frame.stack.length - 1];
-                    if (!this.isTruthy(val, frame.scope)) {
-                        frame.pc = arg;
-                    }
-                    else {
-                        frame.stack.pop();
-                    }
-                    break;
-                }
-                case types_1.OpCode.JUMP_IF_TRUE_OR_POP: {
-                    const val = frame.stack[frame.stack.length - 1];
-                    if (this.isTruthy(val, frame.scope)) {
-                        frame.pc = arg;
-                    }
-                    else {
-                        frame.stack.pop();
-                    }
-                    break;
-                }
-                case types_1.OpCode.GET_ITER: {
-                    const obj = frame.stack.pop();
-                    if (obj && typeof obj[Symbol.iterator] === 'function') {
-                        frame.stack.push(obj[Symbol.iterator]());
-                    }
-                    else {
-                        throw new runtime_types_1.PyException('TypeError', `'${typeof obj}' object is not iterable`);
-                    }
-                    break;
-                }
-                case types_1.OpCode.FOR_ITER: {
-                    const iter = frame.stack[frame.stack.length - 1];
-                    const next = iter.next();
-                    if (next.done) {
-                        frame.stack.pop();
-                        frame.pc = arg;
-                    }
-                    else {
-                        frame.stack.push(next.value);
-                    }
-                    break;
-                }
+                // Function/class operations
                 case types_1.OpCode.MAKE_FUNCTION: {
                     const defaultsCount = arg || 0;
                     const name = frame.stack.pop();
@@ -626,6 +653,48 @@ function executeFrame(frame) {
                     frame.stack.push(func);
                     break;
                 }
+                case types_1.OpCode.CALL_FUNCTION_KW: {
+                    const kwNames = frame.stack.pop();
+                    const kwList = Array.isArray(kwNames) ? kwNames : [];
+                    const kwCount = kwList.length;
+                    const total = arg;
+                    const values = [];
+                    for (let i = 0; i < total; i++) {
+                        values.unshift(frame.stack.pop());
+                    }
+                    const func = frame.stack.pop();
+                    const positionalCount = total - kwCount;
+                    const positional = values.slice(0, positionalCount);
+                    const kwargs = {};
+                    for (let i = 0; i < kwCount; i++) {
+                        kwargs[String(kwList[i])] = values[positionalCount + i];
+                    }
+                    frame.stack.push(this.callFunction(func, positional, frame.scope, kwargs));
+                    break;
+                }
+                case types_1.OpCode.CALL_FUNCTION_EX: {
+                    // arg == 1 means there's a kwargs dict on top
+                    // Stack: [func, args_tuple] or [func, args_tuple, kwargs_dict]
+                    const kwargs = {};
+                    if (arg === 1) {
+                        const kwDict = frame.stack.pop();
+                        if (kwDict instanceof runtime_types_1.PyDict) {
+                            for (const [k, v] of kwDict.entries()) {
+                                kwargs[String(k)] = v;
+                            }
+                        }
+                        else if (kwDict && typeof kwDict === 'object') {
+                            for (const [k, v] of Object.entries(kwDict)) {
+                                kwargs[k] = v;
+                            }
+                        }
+                    }
+                    const argsTuple = frame.stack.pop();
+                    const func = frame.stack.pop();
+                    const args = Array.isArray(argsTuple) ? argsTuple : (argsTuple ? Array.from(argsTuple) : []);
+                    frame.stack.push(this.callFunction(func, args, frame.scope, kwargs));
+                    break;
+                }
                 case types_1.OpCode.LOAD_BUILD_CLASS: {
                     const enclosingScope = frame.scope;
                     frame.stack.push((bodyFn, name, ...bases) => {
@@ -644,6 +713,7 @@ function executeFrame(frame) {
                     });
                     break;
                 }
+                // Import/exception operations
                 case types_1.OpCode.IMPORT_NAME: {
                     frame.stack.pop(); // level
                     frame.stack.pop(); // fromlist
@@ -707,64 +777,11 @@ function executeFrame(frame) {
                     frame.blockStack.pop();
                     break;
                 }
-                case types_1.OpCode.CALL_FUNCTION: {
-                    const args = [];
-                    for (let i = 0; i < arg; i++) {
-                        args.unshift(frame.stack.pop());
-                    }
-                    const func = frame.stack.pop();
-                    frame.stack.push(this.callFunction(func, args, frame.scope));
-                    break;
-                }
-                case types_1.OpCode.CALL_FUNCTION_KW: {
-                    const kwNames = frame.stack.pop();
-                    const kwList = Array.isArray(kwNames) ? kwNames : [];
-                    const kwCount = kwList.length;
-                    const total = arg;
-                    const values = [];
-                    for (let i = 0; i < total; i++) {
-                        values.unshift(frame.stack.pop());
-                    }
-                    const func = frame.stack.pop();
-                    const positionalCount = total - kwCount;
-                    const positional = values.slice(0, positionalCount);
-                    const kwargs = {};
-                    for (let i = 0; i < kwCount; i++) {
-                        kwargs[String(kwList[i])] = values[positionalCount + i];
-                    }
-                    frame.stack.push(this.callFunction(func, positional, frame.scope, kwargs));
-                    break;
-                }
-                case types_1.OpCode.CALL_FUNCTION_EX: {
-                    // arg == 1 means there's a kwargs dict on top
-                    // Stack: [func, args_tuple] or [func, args_tuple, kwargs_dict]
-                    const kwargs = {};
-                    if (arg === 1) {
-                        const kwDict = frame.stack.pop();
-                        if (kwDict instanceof runtime_types_1.PyDict) {
-                            for (const [k, v] of kwDict.entries()) {
-                                kwargs[String(k)] = v;
-                            }
-                        }
-                        else if (kwDict && typeof kwDict === 'object') {
-                            for (const [k, v] of Object.entries(kwDict)) {
-                                kwargs[k] = v;
-                            }
-                        }
-                    }
-                    const argsTuple = frame.stack.pop();
-                    const func = frame.stack.pop();
-                    const args = Array.isArray(argsTuple) ? argsTuple : (argsTuple ? Array.from(argsTuple) : []);
-                    frame.stack.push(this.callFunction(func, args, frame.scope, kwargs));
-                    break;
-                }
                 case types_1.OpCode.EVAL_AST: {
                     const node = frame.stack.pop();
                     frame.stack.push(this.evaluateExpression(node, frame.scope));
                     break;
                 }
-                case types_1.OpCode.RETURN_VALUE:
-                    return frame.stack.pop();
                 default:
                     throw new Error(`VM: Unknown opcode ${types_1.OpCode[opcode]} (${opcode}) at pc ${frame.pc - 1}`);
             }