Serialization cleanup

dirkwhoffmann · Jan 20, 2024 · 40cf957 · 40cf957
1 parent 62bbf8f
commit 40cf957
Show file tree

Hide file tree

Showing 51 changed files with 231 additions and 199 deletions.
diff --git a/Emulator/Base/CoreComponent.h b/Emulator/Base/CoreComponent.h
@@ -213,35 +213,35 @@ class CoreComponent : public CoreObject, NoCopy, NoAssign {
 #define RESET_SNAPSHOT_ITEMS(hard) \
 if (hard) { \
 util::SerHardResetter resetter; \
-applyToResetItems(resetter); \
+serialize(resetter); \
 } else { \
 util::SerSoftResetter resetter; \
-applyToResetItems(resetter); \
+serialize(resetter); \
 }
 
 #define COMPUTE_SNAPSHOT_SIZE \
 util::SerCounter counter; \
 applyToPersistentItems(counter); \
-applyToResetItems(counter); \
+serialize(counter); \
 return counter.count;
 
 #define COMPUTE_SNAPSHOT_CHECKSUM \
 util::SerChecker checker; \
 applyToPersistentItems(checker); \
-applyToResetItems(checker); \
+serialize(checker); \
 return checker.hash;
 
 #define LOAD_SNAPSHOT_ITEMS \
 util::SerReader reader(buffer); \
 applyToPersistentItems(reader); \
-applyToResetItems(reader); \
+serialize(reader); \
 debug(SNP_DEBUG, "Recreated from %zu bytes\n", reader.ptr - buffer); \
 return (isize)(reader.ptr - buffer);
 
 #define SAVE_SNAPSHOT_ITEMS \
 util::SerWriter writer(buffer); \
 applyToPersistentItems(writer); \
-applyToResetItems(writer); \
+serialize(writer); \
 debug(SNP_DEBUG, "Serialized to %zu bytes\n", writer.ptr - buffer); \
 return (isize)(writer.ptr - buffer);
 

diff --git a/Emulator/Cartridges/Cartridge.cpp b/Emulator/Cartridges/Cartridge.cpp
@@ -244,7 +244,7 @@ Cartridge::_size()
 {
     util::SerCounter counter;
     applyToPersistentItems(counter);
-    applyToResetItems(counter);
+    serialize(counter);
 
     isize result = counter.count;
 
@@ -265,7 +265,7 @@ Cartridge::_checksum()
 {
     util::SerChecker checker;
     applyToPersistentItems(checker);
-    applyToResetItems(checker);
+    serialize(checker);
 
     return util::fnvIt64(checker.hash, __checksum());
 }
@@ -277,7 +277,7 @@ Cartridge::_load(const u8 *buffer)
 
     util::SerReader reader(buffer);
     applyToPersistentItems(reader);
-    applyToResetItems(reader);
+    serialize(reader);
 
     // Load ROM
     for (isize i = 0; i < numPackets; i++) {
@@ -307,7 +307,7 @@ Cartridge::_save(u8 *buffer)
 {
     util::SerWriter writer(buffer);
     applyToPersistentItems(writer);
-    applyToResetItems(writer);
+    serialize(writer);
 
     // Save ROM
     for (isize i = 0; i < numPackets; i++) {

diff --git a/Emulator/Cartridges/Cartridge.h b/Emulator/Cartridges/Cartridge.h
@@ -184,7 +184,7 @@ class Cartridge : public SubComponent {
     }
 
     template <class T>
-    void applyToResetItems(T& worker, bool hard = true)
+    void serialize(T& worker)
     {
         worker
 

diff --git a/Emulator/Cartridges/CartridgeRom.cpp b/Emulator/Cartridges/CartridgeRom.cpp
@@ -41,7 +41,7 @@ CartridgeRom::_size()
 {
     util::SerCounter counter;
     applyToPersistentItems(counter);
-    applyToResetItems(counter);
+    serialize(counter);
 
     return size + counter.count;
 }
@@ -51,7 +51,7 @@ CartridgeRom::_load(const u8 *buffer)
 {
     util::SerReader reader(buffer);
     applyToPersistentItems(reader);
-    applyToResetItems(reader);
+    serialize(reader);
 
     // Delete the old packet and create a new one with the proper size
     if (rom) delete[] rom;
@@ -69,7 +69,7 @@ CartridgeRom::_save(u8 *buffer)
 {
     util::SerWriter writer(buffer);
     applyToPersistentItems(writer);
-    applyToResetItems(writer);
+    serialize(writer);
 
     // Write packet data
     for (int i = 0; i < size; i++) util::write8(writer.ptr, rom[i]);

diff --git a/Emulator/Cartridges/CartridgeRom.h b/Emulator/Cartridges/CartridgeRom.h
@@ -67,7 +67,7 @@ class CartridgeRom : public SubComponent {
     }
 
     template <class T>
-    void applyToResetItems(T& worker, bool hard = true)
+    void serialize(T& worker)
     {
     }
 

diff --git a/Emulator/Cartridges/CustomCartridges/EasyFlash.h b/Emulator/Cartridges/CustomCartridges/EasyFlash.h
@@ -71,7 +71,7 @@ class EasyFlash : public Cartridge {
     }
 
     template <class T>
-    void applyToResetItems(T& worker, bool hard = true)
+    void serialize(T& worker)
     {
         worker
 

diff --git a/Emulator/Cartridges/CustomCartridges/Epyx.h b/Emulator/Cartridges/CustomCartridges/Epyx.h
@@ -62,14 +62,13 @@ class Epyx : public Cartridge {
     }
 
     template <class T>
-    void applyToResetItems(T& worker, bool hard = true)
+    void serialize(T& worker)
     {
-        if (hard) {
-
-            worker
-
-            << cycle;
-        }
+        if (util::isSoftResetter(worker)) return;
+
+        worker
+
+        << cycle;
     }
 
     isize __size() override { COMPUTE_SNAPSHOT_SIZE }

diff --git a/Emulator/Cartridges/CustomCartridges/Expert.h b/Emulator/Cartridges/CustomCartridges/Expert.h
@@ -54,7 +54,7 @@ class Expert : public Cartridge {
     }
 
     template <class T>
-    void applyToResetItems(T& worker, bool hard = true)
+    void serialize(T& worker)
     {
     }
 

diff --git a/Emulator/Cartridges/CustomCartridges/FinalIII.h b/Emulator/Cartridges/CustomCartridges/FinalIII.h
@@ -63,7 +63,7 @@ class FinalIII : public Cartridge {
     }
 
     template <class T>
-    void applyToResetItems(T& worker, bool hard = true)
+    void serialize(T& worker)
     {
         worker << qD;
     }

diff --git a/Emulator/Cartridges/CustomCartridges/GeoRam.h b/Emulator/Cartridges/CustomCartridges/GeoRam.h
@@ -63,7 +63,7 @@ class GeoRAM : public Cartridge {
     }
 
     template <class T>
-    void applyToResetItems(T& worker, bool hard = true)
+    void serialize(T& worker)
     {
     }
 

diff --git a/Emulator/Cartridges/CustomCartridges/Isepic.h b/Emulator/Cartridges/CustomCartridges/Isepic.h
@@ -59,7 +59,7 @@ class Isepic : public Cartridge {
     }
 
     template <class T>
-    void applyToResetItems(T& worker, bool hard = true)
+    void serialize(T& worker)
     {
         worker
 

diff --git a/Emulator/Cartridges/CustomCartridges/PageFox.h b/Emulator/Cartridges/CustomCartridges/PageFox.h
@@ -57,7 +57,7 @@ class PageFox : public Cartridge {
     }
 
     template <class T>
-    void applyToResetItems(T& worker, bool hard = true)
+    void serialize(T& worker)
     {
     }
 

diff --git a/Emulator/Cartridges/CustomCartridges/Reu.h b/Emulator/Cartridges/CustomCartridges/Reu.h
@@ -102,7 +102,7 @@ class Reu : public Cartridge {
     }
 
     template <class T>
-    void applyToResetItems(T& worker, bool hard = true)
+    void serialize(T& worker)
     {
     }
 

diff --git a/Emulator/Cartridges/CustomCartridges/StarDos.h b/Emulator/Cartridges/CustomCartridges/StarDos.h
@@ -53,7 +53,7 @@ class StarDos : public Cartridge {
     }
 
     template <class T>
-    void applyToResetItems(T& worker, bool hard = true)
+    void serialize(T& worker)
     {
         worker
 

diff --git a/Emulator/Cartridges/CustomCartridges/SuperGames.h b/Emulator/Cartridges/CustomCartridges/SuperGames.h
@@ -44,7 +44,7 @@ class SuperGames : public Cartridge {
     }
 
     template <class T>
-    void applyToResetItems(T& worker, bool hard = true)
+    void serialize(T& worker)
     {
         worker
 

diff --git a/Emulator/Cartridges/FlashRom.h b/Emulator/Cartridges/FlashRom.h
@@ -93,7 +93,7 @@ class FlashRom : public SubComponent {
     }
 
     template <class T>
-    void applyToResetItems(T& worker, bool hard = true)
+    void serialize(T& worker)
     {
     }
 

diff --git a/Emulator/Components/C64.h b/Emulator/Components/C64.h
@@ -348,21 +348,20 @@ class C64 : public Thread {
     }
 
     template <class T>
-    void applyToResetItems(T& worker, bool hard = true)
+    void serialize(T& worker)
     {
-        if (hard) {
-
-            worker
-
-            << trigger
-            << id
-            << data
-            << nextTrigger
-            << frame
-            << scanline
-            << rasterCycle
-            << ultimax;
-        }
+        if (util::isSoftResetter(worker)) return;
+
+        worker
+
+        << trigger
+        << id
+        << data
+        << nextTrigger
+        << frame
+        << scanline
+        << rasterCycle
+        << ultimax;
     }
 
 public:

diff --git a/Emulator/Components/CIA/CIA.h b/Emulator/Components/CIA/CIA.h
@@ -321,7 +321,7 @@ class CIA : public SubComponent {
     }
 
     template <class T>
-    void applyToResetItems(T& worker, bool hard = true)
+    void serialize(T& worker)
     {
         worker
 

diff --git a/Emulator/Components/CIA/TOD.h b/Emulator/Components/CIA/TOD.h
@@ -103,7 +103,7 @@ class TOD : public SubComponent {
     }
 
     template <class T>
-    void applyToResetItems(T& worker, bool hard = true)
+    void serialize(T& worker)
     {
         worker
 

diff --git a/Emulator/Components/CPU/CPU.h b/Emulator/Components/CPU/CPU.h
@@ -94,13 +94,8 @@ class CPU : public Peddle {
     }
 
     template <class T>
-    void applyToResetItems(T& worker, bool hard = true)
+    void serialize(T& worker)
     {
-        if (hard) {
-
-            worker << clock;
-        }
-
         worker
 
         << flags
@@ -135,6 +130,12 @@ class CPU : public Peddle {
         << dischargeCycleBit3
         << dischargeCycleBit6
         << dischargeCycleBit7;
+
+        if (util::isSoftResetter(worker)) return;
+
+        worker
+
+        << clock;
     }
 
     isize _size() override { COMPUTE_SNAPSHOT_SIZE }

diff --git a/Emulator/Components/LogicBoard/ControlPort.h b/Emulator/Components/LogicBoard/ControlPort.h
@@ -71,7 +71,7 @@ class ControlPort : public SubComponent {
     }
 
     template <class T>
-    void applyToResetItems(T& worker, bool hard = true)
+    void serialize(T& worker)
     {
     }
 

diff --git a/Emulator/Components/LogicBoard/ExpansionPort.cpp b/Emulator/Components/LogicBoard/ExpansionPort.cpp
@@ -31,7 +31,7 @@ ExpansionPort::_size()
 {
     util::SerCounter counter;
     applyToPersistentItems(counter);
-    applyToResetItems(counter);
+    serialize(counter);
 
     if (cartridge) counter.count += cartridge->size();
     return counter.count;
@@ -43,7 +43,7 @@ ExpansionPort::_checksum()
     util::SerChecker checker;
 
     applyToPersistentItems(checker);
-    applyToResetItems(checker);
+    serialize(checker);
 
     if (cartridge) {
         checker.hash = util::fnvIt64(checker.hash, cartridge->checksum());
@@ -57,7 +57,7 @@ ExpansionPort::_load(const u8 *buffer)
 {
     util::SerReader reader(buffer);
     applyToPersistentItems(reader);
-    applyToResetItems(reader);
+    serialize(reader);
 
     // Load cartridge (if any)
     if (crtType != CRT_NONE) {
@@ -74,7 +74,7 @@ ExpansionPort::_save(u8 *buffer)
 {
     util::SerWriter writer(buffer);
     applyToPersistentItems(writer);
-    applyToResetItems(writer);
+    serialize(writer);
 
     // Save cartridge (if any)
     if (crtType != CRT_NONE) {

diff --git a/Emulator/Components/LogicBoard/ExpansionPort.h b/Emulator/Components/LogicBoard/ExpansionPort.h
@@ -80,7 +80,7 @@ class ExpansionPort : public SubComponent {
     }
 
     template <class T>
-    void applyToResetItems(T& worker, bool hard = true)
+    void serialize(T& worker)
     {
     }
 

diff --git a/Emulator/Components/LogicBoard/IEC.h b/Emulator/Components/LogicBoard/IEC.h
@@ -91,7 +91,7 @@ class IEC : public SubComponent {
     }
 
     template <class T>
-    void applyToResetItems(T& worker, bool hard = true)
+    void serialize(T& worker)
     {
         worker
 

diff --git a/Emulator/Components/LogicBoard/PowerSupply.h b/Emulator/Components/LogicBoard/PowerSupply.h
@@ -53,7 +53,7 @@ class PowerSupply : public SubComponent {
     }
 
     template <class T>
-    void applyToResetItems(T& worker, bool hard = true)
+    void serialize(T& worker)
     {
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -184,7 +184,7 @@ class Cartridge : public SubComponent { @@
         }
         template <class T>
-        void applyToResetItems(T& worker, bool hard = true)
+        void serialize(T& worker)
         {
             worker
@@ Expand Down @@