stop condition now checked on first instruction

mnaberez · Jul 30, 2023 · 84e8729 · 84e8729
1 parent b710c74
commit 84e8729
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/py65/monitor.py b/py65/monitor.py
@@ -504,19 +504,22 @@ def _run(self, stopcodes):
 
  if not breakpoints:
  while True:
- mpu.step()
  if mem[mpu.pc] in stopcodes:
+ mpu.step()
  break
+ mpu.step()
  else:
  while True:
- mpu.step()
  pc = mpu.pc
  if mem[pc] in stopcodes:
+ mpu.step()
  break
  if pc in breakpoints:
  msg = "Breakpoint %d reached."
  self._output(msg % self._breakpoints.index(pc))
+ mpu.step()
  break
+ mpu.step()
 
  # Switch back to the previous input mode.
  console.restore_mode()