Merge 84e87293d7 into 95e152d6cb

py65/monitor.py

@@ -507,19 +507,22 @@ class Monitor(cmd.Cmd):
 
         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()