Removed applyToPersistentItems (everything is handled inside serializ…

…e() now)
dirkwhoffmann · Jan 19, 2024 · 2f0d524 · 2f0d524
1 parent db23503
commit 2f0d524
Show file tree

Hide file tree

Showing 37 changed files with 0 additions and 198 deletions.
diff --git a/Emulator/Base/CoreComponent.h b/Emulator/Base/CoreComponent.h
@@ -226,25 +226,21 @@ 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); \
 return (isize)(reader.ptr - buffer);
 
 #define SAVE_SNAPSHOT_ITEMS \
 util::SerWriter writer(buffer); \
-applyToPersistentItems(writer); \
 serialize(writer); \
 return (isize)(writer.ptr - buffer);
 

diff --git a/Emulator/Components/Agnus/Agnus.h b/Emulator/Components/Agnus/Agnus.h
@@ -228,12 +228,6 @@ class Agnus : 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/Agnus/Blitter/Blitter.h b/Emulator/Components/Agnus/Blitter/Blitter.h
@@ -211,12 +211,6 @@ class Blitter : public SubComponent
     void _run() override;
     void _inspect() const override;
 
-    template <class T>
-    void applyToPersistentItems(T& worker)
-    {
-
-    }
-
     template <class T>
     void serialize(T& worker)
     {

diff --git a/Emulator/Components/Agnus/Copper/Copper.h b/Emulator/Components/Agnus/Copper/Copper.h
@@ -114,12 +114,6 @@ class Copper : 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/Agnus/Sequencer/Sequencer.h b/Emulator/Components/Agnus/Sequencer/Sequencer.h
@@ -231,12 +231,6 @@ class Sequencer : public SubComponent
     void _initialize() override;
     void _reset(bool hard) override;
 
-    template <class T>
-    void applyToPersistentItems(T& worker)
-    {
-
-    }
-
     template <class T>
     void serialize(T& worker)
     {

diff --git a/Emulator/Components/Amiga.h b/Emulator/Components/Amiga.h
@@ -218,12 +218,6 @@ class Amiga : public Thread {
     void _trackOff() override;
     void _inspect() const override;
 
-    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
@@ -285,12 +285,6 @@ class CIA : public SubComponent {
     void _initialize() override;
     void _reset(bool hard) override;
 
-    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,12 +97,6 @@ class TOD : 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/CPU/CPU.h b/Emulator/Components/CPU/CPU.h
@@ -70,12 +70,6 @@ class CPU : public moira::Moira {
     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/Denise/Denise.h b/Emulator/Components/Denise/Denise.h
@@ -330,12 +330,6 @@ class Denise : 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/Denise/PixelEngine.h b/Emulator/Components/Denise/PixelEngine.h
@@ -136,12 +136,6 @@ class PixelEngine : public SubComponent {
 
 private:
 
-    template <class T>
-    void applyToPersistentItems(T& worker)
-    {
-
-    }
-
     template <class T>
     void serialize(T& worker)
     {

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

diff --git a/Emulator/Components/Memory/Memory.cpp b/Emulator/Components/Memory/Memory.cpp
@@ -315,7 +315,6 @@ Memory::_size()
     i32 slowSize = config.slowSize;
     i32 fastSize = config.fastSize;
 
-    applyToPersistentItems(counter);
     serialize(counter);
 
     counter
@@ -341,7 +340,6 @@ Memory::_checksum()
 {
     util::SerChecker checker;
 
-    applyToPersistentItems(checker);
     serialize(checker);
 
     if (config.chipSize) {

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

diff --git a/Emulator/Components/Paula/Audio/AudioFilter.h b/Emulator/Components/Paula/Audio/AudioFilter.h
@@ -191,12 +191,6 @@ class AudioFilter : 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)
     {

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

diff --git a/Emulator/Components/Paula/Audio/StateMachine.h b/Emulator/Components/Paula/Audio/StateMachine.h
@@ -103,12 +103,6 @@ class StateMachine : 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/Paula/DiskController/DiskController.h b/Emulator/Components/Paula/DiskController/DiskController.h
@@ -115,12 +115,6 @@ class DiskController : 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/Paula/Paula.h b/Emulator/Components/Paula/Paula.h
@@ -131,12 +131,6 @@ class Paula : public SubComponent {
     void _warpOff() override;
     void _inspect() const override;
 
-    template <class T>
-    void applyToPersistentItems(T& worker)
-    {
-
-    }
-
     template <class T>
     void serialize(T& worker)
     {

diff --git a/Emulator/Components/Paula/UART/UART.h b/Emulator/Components/Paula/UART/UART.h
@@ -72,12 +72,6 @@ class UART : 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/Ports/ControlPort.h b/Emulator/Components/Ports/ControlPort.h
@@ -85,12 +85,6 @@ class ControlPort : public SubComponent {
     void _reset(bool hard) override { RESET_SNAPSHOT_ITEMS(hard) }
     void _inspect() const override;
 
-    template <class T>
-    void applyToPersistentItems(T& worker)
-    {
-
-    }
-
     template <class T>
     void serialize(T& worker)
     {

diff --git a/Emulator/Components/Ports/SerialPort.h b/Emulator/Components/Ports/SerialPort.h
@@ -69,12 +69,6 @@ class SerialPort : 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/RTC/RTC.h b/Emulator/Components/RTC/RTC.h
@@ -69,12 +69,6 @@ class RTC : 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/Zorro/DiagBoard.h b/Emulator/Components/Zorro/DiagBoard.h
@@ -61,12 +61,6 @@ class DiagBoard : public ZorroBoard {
 
     void _reset(bool hard) override;
 
-    template <class T>
-    void applyToPersistentItems(T& worker)
-    {
-
-    }
-
     template <class T>
     void serialize(T& worker)
     {

diff --git a/Emulator/Components/Zorro/HdController.h b/Emulator/Components/Zorro/HdController.h
@@ -71,12 +71,6 @@ class HdController : public ZorroBoard {
     void _initialize() override;
     void _reset(bool hard) override;
 
-    template <class T>
-    void applyToPersistentItems(T& worker)
-    {
-
-    }
-
     template <class T>
     void serialize(T& worker)
     {

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

diff --git a/Emulator/Components/Zorro/ZorroManager.h b/Emulator/Components/Zorro/ZorroManager.h
@@ -64,8 +64,6 @@ class ZorroManager : 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) { }
 

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

diff --git a/Emulator/Peripherals/Drive/FloppyDisk.cpp b/Emulator/Peripherals/Drive/FloppyDisk.cpp
@@ -44,7 +44,6 @@ void
 FloppyDisk::init(util::SerReader &reader, Diameter dia, Density den)
 {
     init(dia, den);
-    applyToPersistentItems(reader);
     serialize(reader);
 }
 

diff --git a/Emulator/Peripherals/Drive/FloppyDisk.h b/Emulator/Peripherals/Drive/FloppyDisk.h
@@ -128,12 +128,6 @@ class FloppyDisk : public CoreObject {
 
 private:
 
-    template <class T>
-    void applyToPersistentItems(T& worker)
-    {
-
-    }
-
     template <class T>
     void serialize(T& worker)
     {