From 33b56fec712c069b29347dc700a6f1721e3768d0 Mon Sep 17 00:00:00 2001
From: ElectronixTM <etdiary1@gmail.com>
Date: Sat, 29 Mar 2025 21:33:16 +0300
Subject: [PATCH] =?UTF-8?q?fix:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=BE=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B0=D0=B4=D1=80?=
 =?UTF-8?q?=D0=B5=D1=81=D0=B0=D1=86=D0=B8=D0=B8=20=D0=B2=20step?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/vm.py | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/vm.py b/src/vm.py
index 48238a0..c2d2c1c 100644
--- a/src/vm.py
+++ b/src/vm.py
@@ -108,16 +108,17 @@ class VM:
         """
         Make one step (only step into)
         """
-        # По какой-то причине адрессация работает
-        # так, будто мы на 1 слово впереди опкода
-        if not VMFlags.AFTER_BRANCH:
-            self.pc = c_uint32(self.cc.value + 1)
-        # сбрасываем флаг AFTER_BRANCH
-        self._vm_flags &= ~(VMFlags.AFTER_BRANCH)
-        opcode = self.mem[self.pc.value]
+        opcode = self.mem[self.pc.value * 4]
         opdesc = self._fetch_opcode_desc(opcode)
         args = self._parse_arguments(opdesc)
+        # По какой-то причине адрессация работает
+        # так, будто мы на 1 слово впереди опкода
+        self.pc = c_uint32(self.pc.value + 1)
+        # сбрасываем флаг AFTER_BRANCH
+        self._vm_flags &= ~(VMFlags.AFTER_BRANCH)
         self._run_callback(opdesc, args)
+        if VMFlags.EXPANDED_INSTR in self._vm_flags:
+            self.pc = c_uint32(self.pc.value + 1)
 
     def continue_(self) -> None:
         """