From ae0faaabfc4372e96e2d5dbfeded59e67c4b2a1d Mon Sep 17 00:00:00 2001
From: Christian Speckner <christian.speckner@mayflower.de>
Date: Tue, 22 May 2018 00:18:07 +0200
Subject: [PATCH] Fix cycle counting in CPU.

---
 src/emucore/M6502.cxx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/emucore/M6502.cxx b/src/emucore/M6502.cxx
index 6005fcaad..04f740f36 100644
--- a/src/emucore/M6502.cxx
+++ b/src/emucore/M6502.cxx
@@ -240,12 +240,13 @@ inline bool M6502::_execute(uInt32 cycles)
   M6532& riot = mySystem->m6532();
 #endif
 
-  uInt32 currentCycles = 0;
+  uInt64 previousCycles = mySystem->cycles();
+  uInt64 currentCycles = 0;
 
   // Loop until execution is stopped or a fatal error occurs
   for(;;)
   {
-    for(; !myExecutionStatus && (currentCycles < cycles * SYSTEM_CYCLES_PER_CPU); currentCycles += SYSTEM_CYCLES_PER_CPU)
+    while (!myExecutionStatus && currentCycles < cycles * SYSTEM_CYCLES_PER_CPU)
     {
   #ifdef DEBUGGER_SUPPORT
       if(myJustHitReadTrapFlag || myJustHitWriteTrapFlag)
@@ -297,6 +298,8 @@ inline bool M6502::_execute(uInt32 cycles)
           myExecutionStatus |= FatalErrorBit;
       }
 
+      currentCycles = (mySystem->cycles() - previousCycles);
+
   #ifdef DEBUGGER_SUPPORT
       if(myStepStateByInstruction)
       {