Fixed soft reset (#813)

dirkwhoffmann · Oct 21, 2024 · 4061fc5 · 4061fc5
1 parent c25b27d
commit 4061fc5
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 4 deletions.
diff --git a/Emulator/Components/C64.cpp b/Emulator/Components/C64.cpp
@@ -305,16 +305,16 @@ C64::initialize()
 void
 C64::operator << (SerResetter &worker)
 {
-    // Remember the current inspection event
-    auto insEvent = eventid[SLOT_INS];
-    auto insEventData = data[SLOT_INS];
+    if (isSoftResetter(worker)) return;
 
     // Reset all items
     serialize(worker);
 
     // Initialize all event slots
     for (isize i = 0; i < SLOT_COUNT; i++) {
 
+        if (i == SLOT_INS) continue;
+
         trigger[i] = NEVER;
         eventid[i] = (EventID)0;
         data[i] = 0;
@@ -324,7 +324,6 @@ C64::operator << (SerResetter &worker)
     scheduleAbs<SLOT_CIA1>(cpu.clock, CIA_EXECUTE);
     scheduleAbs<SLOT_CIA2>(cpu.clock, CIA_EXECUTE);
     scheduleRel<SLOT_SRV>(C64::sec(0.5), SRV_LAUNCH_DAEMON);
-    if (insEvent) scheduleRel <SLOT_INS> (0, insEvent, insEventData);
     scheduleNextSNPEvent();
 
     flags = 0;

diff --git a/Emulator/Components/C64.h b/Emulator/Components/C64.h
@@ -351,6 +351,8 @@ class C64 final : public CoreComponent, public Inspectable<C64Info> {
     template <class T>
     void serialize(T& worker)
     {
+        if (isSoftResetter(worker)) return;
+
         worker
 
         << trigger

diff --git a/Emulator/Components/CIA/CIA.cpp b/Emulator/Components/CIA/CIA.cpp
@@ -38,6 +38,9 @@ CIA::_didReset(bool hard)
 
     updatePA();
     updatePB();
+
+    c64.scheduleAbs<SLOT_CIA1>(cpu.clock, CIA_EXECUTE);
+    c64.scheduleAbs<SLOT_CIA2>(cpu.clock, CIA_EXECUTE);
 }
 
 void

diff --git a/Emulator/Components/CPU/CPUBase.cpp b/Emulator/Components/CPU/CPUBase.cpp
@@ -155,6 +155,8 @@ CPU::cacheInfo(CPUInfo &result) const
 void
 CPU::_didReset(bool hard)
 {
+    if (!hard) return;
+
     Peddle::reset();
 
     // Enable or disable CPU debugging

diff --git a/Emulator/Components/SID/SID.h b/Emulator/Components/SID/SID.h
@@ -109,6 +109,8 @@ class SID final : public SubComponent, public Inspectable<SIDInfo>
     template <class T>
     void serialize(T& worker)
     {
+        if (isSoftResetter(worker)) return;
+
         worker
 
         << sidreg

diff --git a/Emulator/Components/VICII/VICII.h b/Emulator/Components/VICII/VICII.h
@@ -853,6 +853,8 @@ class VICII final : public SubComponent, public Inspectable<VICIIInfo, VICIIStat
     template <class T>
     void serialize(T& worker)
     {
+        if (isSoftResetter(worker)) return;
+
         worker
 
         << reg.current

diff --git a/Emulator/Peripherals/Drive/PIA.h b/Emulator/Peripherals/Drive/PIA.h
@@ -97,6 +97,8 @@ class PIA6821 : public SubComponent {
     template <class T>
     void serialize(T& worker)
     {
+        if (isSoftResetter(worker)) return;
+
         worker
 
         << pa