Serialization cleanup (everything is handles in serialize() )

dirkwhoffmann · Jan 20, 2024 · 4711590 · 4711590
1 parent def60b2
commit 4711590
Show file tree

Hide file tree

Showing 50 changed files with 15 additions and 286 deletions.
diff --git a/Emulator/Base/CoreComponent.h b/Emulator/Base/CoreComponent.h
@@ -221,26 +221,22 @@ serialize(resetter); \
 
 #define COMPUTE_SNAPSHOT_SIZE \
 util::SerCounter counter; \
-applyToPersistentItems(counter); \
 serialize(counter); \
 return counter.count;
 
 #define COMPUTE_SNAPSHOT_CHECKSUM \
 util::SerChecker checker; \
-applyToPersistentItems(checker); \
 serialize(checker); \
 return checker.hash;
 
 #define LOAD_SNAPSHOT_ITEMS \
 util::SerReader reader(buffer); \
-applyToPersistentItems(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); \
 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
@@ -243,7 +243,6 @@ isize
 Cartridge::_size()
 {
     util::SerCounter counter;
-    applyToPersistentItems(counter);
     serialize(counter);
 
     isize result = counter.count;
@@ -264,7 +263,6 @@ u64
 Cartridge::_checksum()
 {
     util::SerChecker checker;
-    applyToPersistentItems(checker);
     serialize(checker);
 
     return util::fnvIt64(checker.hash, __checksum());
@@ -276,7 +274,6 @@ Cartridge::_load(const u8 *buffer)
     dealloc();
 
     util::SerReader reader(buffer);
-    applyToPersistentItems(reader);
     serialize(reader);
 
     // Load ROM
@@ -306,7 +303,6 @@ isize
 Cartridge::_save(u8 *buffer)
 {
     util::SerWriter writer(buffer);
-    applyToPersistentItems(writer);
     serialize(writer);
 
     // Save ROM

diff --git a/Emulator/Cartridges/Cartridge.h b/Emulator/Cartridges/Cartridge.h
@@ -168,13 +168,7 @@ class Cartridge : public SubComponent {
 protected:
 
     void _reset(bool hard) override;
-
-    template <class T>
-    void applyToPersistentItems(T& worker)
-    {
-
-    }
-
+
     template <class T>
     void serialize(T& worker)
     {

diff --git a/Emulator/Cartridges/CartridgeRom.cpp b/Emulator/Cartridges/CartridgeRom.cpp
@@ -40,7 +40,6 @@ isize
 CartridgeRom::_size()
 {
     util::SerCounter counter;
-    applyToPersistentItems(counter);
     serialize(counter);
 
     return size + counter.count;
@@ -50,7 +49,6 @@ isize
 CartridgeRom::_load(const u8 *buffer)
 {
     util::SerReader reader(buffer);
-    applyToPersistentItems(reader);
     serialize(reader);
 
     // Delete the old packet and create a new one with the proper size
@@ -68,7 +66,6 @@ isize
 CartridgeRom::_save(u8 *buffer)
 {
     util::SerWriter writer(buffer);
-    applyToPersistentItems(writer);
     serialize(writer);
 
     // Write packet data

diff --git a/Emulator/Cartridges/CartridgeRom.h b/Emulator/Cartridges/CartridgeRom.h
@@ -57,12 +57,6 @@ class CartridgeRom : public SubComponent {
 
 private:
 
-    template <class T>
-    void applyToPersistentItems(T& worker)
-    {
-
-    }
-
     template <class T>
     void serialize(T& worker)
     {

diff --git a/Emulator/Cartridges/CustomCartridges/EasyFlash.h b/Emulator/Cartridges/CustomCartridges/EasyFlash.h
@@ -61,13 +61,7 @@ class EasyFlash : public Cartridge {
     //
 
 private:
-
-    template <class T>
-    void applyToPersistentItems(T& worker)
-    {
 
-    }
-
     template <class T>
     void serialize(T& worker)
     {

diff --git a/Emulator/Cartridges/CustomCartridges/Epyx.h b/Emulator/Cartridges/CustomCartridges/Epyx.h
@@ -56,11 +56,6 @@ class Epyx : public Cartridge {
 
 private:
 
-    template <class T>
-    void applyToPersistentItems(T& worker)
-    {
-    }
-
     template <class T>
     void serialize(T& worker)
     {

diff --git a/Emulator/Cartridges/CustomCartridges/Expert.h b/Emulator/Cartridges/CustomCartridges/Expert.h
@@ -45,12 +45,6 @@ class Expert : public Cartridge {
 
 private:
 
-    template <class T>
-    void applyToPersistentItems(T& worker)
-    {
-
-    }
-
     template <class T>
     void serialize(T& worker)
     {

diff --git a/Emulator/Cartridges/CustomCartridges/FinalIII.h b/Emulator/Cartridges/CustomCartridges/FinalIII.h
@@ -55,13 +55,7 @@ class FinalIII : public Cartridge {
     //
 
 private:
-
-    template <class T>
-    void applyToPersistentItems(T& worker)
-    {
-
-    }
-
+
     template <class T>
     void serialize(T& worker)
     {

diff --git a/Emulator/Cartridges/CustomCartridges/GeoRam.h b/Emulator/Cartridges/CustomCartridges/GeoRam.h
@@ -52,13 +52,7 @@ class GeoRAM : public Cartridge {
     //
 
 private:
-
-    template <class T>
-    void applyToPersistentItems(T& worker)
-    {
 
-    }
-
     template <class T>
     void serialize(T& worker)
     {

diff --git a/Emulator/Cartridges/CustomCartridges/Isepic.h b/Emulator/Cartridges/CustomCartridges/Isepic.h
@@ -48,13 +48,7 @@ class Isepic : public Cartridge {
     //
 
 private:
-
-    template <class T>
-    void applyToPersistentItems(T& worker)
-    {
-
-    }
-
+
     template <class T>
     void serialize(T& worker)
     {

diff --git a/Emulator/Cartridges/CustomCartridges/PageFox.h b/Emulator/Cartridges/CustomCartridges/PageFox.h
@@ -48,12 +48,6 @@ class PageFox : public Cartridge {
 
 private:
 
-    template <class T>
-    void applyToPersistentItems(T& worker)
-    {
-
-    }
-
     template <class T>
     void serialize(T& worker)
     {

diff --git a/Emulator/Cartridges/CustomCartridges/Reu.h b/Emulator/Cartridges/CustomCartridges/Reu.h
@@ -84,12 +84,6 @@ class Reu : public Cartridge {
 
 private:
 
-    template <class T>
-    void applyToPersistentItems(T& worker)
-    {
-
-    }
-
     template <class T>
     void serialize(T& worker)
     {

diff --git a/Emulator/Cartridges/CustomCartridges/StarDos.h b/Emulator/Cartridges/CustomCartridges/StarDos.h
@@ -47,11 +47,6 @@ class StarDos : public Cartridge {
 
 private:
 
-    template <class T>
-    void applyToPersistentItems(T& worker)
-    {
-    }
-
     template <class T>
     void serialize(T& worker)
     {

diff --git a/Emulator/Cartridges/CustomCartridges/SuperGames.h b/Emulator/Cartridges/CustomCartridges/SuperGames.h
@@ -38,11 +38,6 @@ class SuperGames : public Cartridge {
 
 private:
 
-    template <class T>
-    void applyToPersistentItems(T& worker)
-    {
-    }
-
     template <class T>
     void serialize(T& worker)
     {

diff --git a/Emulator/Cartridges/FlashRom.h b/Emulator/Cartridges/FlashRom.h
@@ -83,12 +83,6 @@ class FlashRom : public SubComponent {
 
     void _reset(bool hard) override;
 
-    template <class T>
-    void applyToPersistentItems(T& worker)
-    {
-
-    }
-
     template <class T>
     void serialize(T& worker)
     {

diff --git a/Emulator/Components/C64.h b/Emulator/Components/C64.h
@@ -339,12 +339,6 @@ class C64 : public Thread {
 
 private:
 
-    template <class T>
-    void applyToPersistentItems(T& worker)
-    {
-
-    }
-
     template <class T>
     void serialize(T& worker)
     {

diff --git a/Emulator/Components/CIA/CIA.h b/Emulator/Components/CIA/CIA.h
@@ -311,12 +311,6 @@ class CIA : public SubComponent {
 
 private:
 
-    template <class T>
-    void applyToPersistentItems(T& worker)
-    {
-
-    }
-
     template <class T>
     void serialize(T& worker)
     {

diff --git a/Emulator/Components/CIA/TOD.h b/Emulator/Components/CIA/TOD.h
@@ -97,11 +97,6 @@ class TOD : public SubComponent {
     void _reset(bool hard) override;
     void _inspect() const override;
 
-    template <class T>
-    void applyToPersistentItems(T& worker)
-    {
-    }
-
     template <class T>
     void serialize(T& worker)
     {

diff --git a/Emulator/Components/CPU/CPU.h b/Emulator/Components/CPU/CPU.h
@@ -87,11 +87,6 @@ class CPU : public Peddle {
     void _inspect() const override;
     void _trackOn() override;
     void _trackOff() override;
-
-    template <class T>
-    void applyToPersistentItems(T& worker)
-    {
-    }
 
     template <class T>
     void serialize(T& worker)

diff --git a/Emulator/Components/LogicBoard/ControlPort.h b/Emulator/Components/LogicBoard/ControlPort.h
@@ -65,11 +65,7 @@ class ControlPort : public SubComponent {
 
     void _reset(bool hard) override { RESET_SNAPSHOT_ITEMS(hard) };
 
-    template <class T>
-    void applyToPersistentItems(T& worker) { }
-
-    template <class T>
-    void serialize(T& worker) { }
+    template <class T> void serialize(T& worker) { }
     isize _size() override { COMPUTE_SNAPSHOT_SIZE }
     u64 _checksum() override { COMPUTE_SNAPSHOT_CHECKSUM }
     isize _load(const u8 *buffer) override { LOAD_SNAPSHOT_ITEMS }

diff --git a/Emulator/Components/LogicBoard/ExpansionPort.cpp b/Emulator/Components/LogicBoard/ExpansionPort.cpp
@@ -30,7 +30,6 @@ isize
 ExpansionPort::_size()
 {
     util::SerCounter counter;
-    applyToPersistentItems(counter);
     serialize(counter);
 
     if (cartridge) counter.count += cartridge->size();
@@ -42,7 +41,6 @@ ExpansionPort::_checksum()
 {
     util::SerChecker checker;
 
-    applyToPersistentItems(checker);
     serialize(checker);
 
     if (cartridge) {
@@ -56,7 +54,6 @@ isize
 ExpansionPort::_load(const u8 *buffer)
 {
     util::SerReader reader(buffer);
-    applyToPersistentItems(reader);
     serialize(reader);
 
     // Load cartridge (if any)
@@ -73,7 +70,6 @@ isize
 ExpansionPort::_save(u8 *buffer)
 {
     util::SerWriter writer(buffer);
-    applyToPersistentItems(writer);
     serialize(writer);
 
     // Save cartridge (if any)

diff --git a/Emulator/Components/LogicBoard/ExpansionPort.h b/Emulator/Components/LogicBoard/ExpansionPort.h
@@ -68,12 +68,6 @@ class ExpansionPort : public SubComponent {
 private:
 
     void _reset(bool hard) override;
-
-    template <class T>
-    void applyToPersistentItems(T& worker)
-    {
-
-    }
 
     template <class T>
     void serialize(T& worker)

diff --git a/Emulator/Components/LogicBoard/IEC.h b/Emulator/Components/LogicBoard/IEC.h
@@ -85,11 +85,6 @@ class IEC : public SubComponent {
 
     void _reset(bool hard) override;
 
-    template <class T>
-    void applyToPersistentItems(T& worker)
-    {
-    }
-
     template <class T>
     void serialize(T& worker)
     {

diff --git a/Emulator/Components/LogicBoard/PowerSupply.h b/Emulator/Components/LogicBoard/PowerSupply.h
@@ -46,11 +46,8 @@ class PowerSupply : public SubComponent {
     void _reset(bool hard) override;
 
 private:
-
-    template <class T>
-    void applyToPersistentItems(T& worker) { }
-    template <class T>
-    void serialize(T& worker) { }
+
+    template <class T> void serialize(T& worker) { }
     isize _size() override { COMPUTE_SNAPSHOT_SIZE }
     u64 _checksum() override { COMPUTE_SNAPSHOT_CHECKSUM }
     isize _load(const u8 *buffer) override { LOAD_SNAPSHOT_ITEMS }