CRITICAL: Removed faulty if-condition in scheduleNextREGEvent() (#857)

dirkwhoffmann · Jan 3, 2025 · 1dcd676 · 1dcd676
1 parent 43e94a4
commit 1dcd676
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/Emulator/Components/Agnus/AgnusEvents.cpp b/Emulator/Components/Agnus/AgnusEvents.cpp
@@ -156,7 +156,8 @@ Agnus::scheduleNextREGEvent()
     Cycle next = changeRecorder.trigger();
 
     // Schedule a register change event for that cycle
-    if (next < trigger[SLOT_REG]) scheduleAbs<SLOT_REG>(next, REG_CHANGE);
+    // if (next < trigger[SLOT_REG]) scheduleAbs<SLOT_REG>(next, REG_CHANGE);
+    scheduleAbs<SLOT_REG>(next, REG_CHANGE);
 }
 
 void
@@ -297,12 +298,16 @@ Agnus::serviceREGEvent(Cycle until)
 
     if (syncEvent) {
 
-        // Call the logic analyzer of requested
+        // Let the logic analyzer probe all observed signals
         if (syncEvent & EVFL::PROBE) { logicAnalyzer.recordSignals(pos.h); }
+
+        // Keep the event scheduled to reenter the function in the next cycle
+
+    } else {
+
+        // Schedule next event
+        scheduleNextREGEvent();
     }
-
-    // Schedule next event
-    scheduleNextREGEvent();
 }
 
 #define LO_NONE(x)      { serviceBPLEventLores<x>(); }

diff --git a/Emulator/Misc/LogicAnalyzer/LogicAnalyzer.cpp b/Emulator/Misc/LogicAnalyzer/LogicAnalyzer.cpp
@@ -163,8 +163,6 @@ LogicAnalyzer::recordSignals(isize hpos)
 
     auto hprev = agnus.pos.hPrev();
 
-    trace(true, "LogicAnalyzer::recordSignals\n");
-
     assert(hpos >= 0 && hpos < HPOS_CNT);
 
     // Only proceed if this is the main instance