More base-derived fixes

TODO

@@ -7,6 +7,11 @@
 ☐ Review base class serialization everywhere
     Make sure that all base/derived relationships are registered
 ☐ Serialize codeset with an apploader reference instead
+☐ Additional stuff to serialize
+    ☐ Self-NCCH archive
+    ☐ File backends
+    ☐ Directory backends
+    ☐ File/directory 'services'
 ✔ CPU @done(19-08-13 15:41)
 ✔ Memory @done(19-08-13 15:41)
     ✔ Page tables @done(20-01-05 16:33)

src/core/file_sys/archive_extsavedata.h

@@ -60,6 +60,7 @@ private:
     ArchiveFactory_ExtSaveData() = default;
     template <class Archive>
     void serialize(Archive& ar, const unsigned int) {
+        ar& boost::serialization::base_object<ArchiveFactory>(*this);
         ar& shared;
         ar& mount_point;
     }

src/core/file_sys/archive_ncch.h

@@ -116,7 +116,9 @@ public:
 
 private:
     template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {}
+    void serialize(Archive& ar, const unsigned int) {
+        ar& boost::serialization::base_object<ArchiveFactory>(*this);
+    }
     friend class boost::serialization::access;
 };
 

src/core/file_sys/archive_other_savedata.h

@@ -35,6 +35,7 @@ private:
     ArchiveFactory_OtherSaveDataPermitted() = default;
     template <class Archive>
     void serialize(Archive& ar, const unsigned int) {
+        ar& boost::serialization::base_object<ArchiveFactory>(*this);
         ar& sd_savedata_source;
     }
     friend class boost::serialization::access;
@@ -62,6 +63,7 @@ private:
     ArchiveFactory_OtherSaveDataGeneral() = default;
     template <class Archive>
     void serialize(Archive& ar, const unsigned int) {
+        ar& boost::serialization::base_object<ArchiveFactory>(*this);
         ar& sd_savedata_source;
     }
     friend class boost::serialization::access;

src/core/file_sys/archive_savedata.h

@@ -34,6 +34,7 @@ private:
     ArchiveFactory_SaveData() = default;
     template <class Archive>
     void serialize(Archive& ar, const unsigned int) {
+        ar& boost::serialization::base_object<ArchiveFactory>(*this);
         ar& sd_savedata_source;
     }
     friend class boost::serialization::access;

src/core/file_sys/archive_sdmc.h

@@ -81,6 +81,7 @@ private:
     ArchiveFactory_SDMC() = default;
     template <class Archive>
     void serialize(Archive& ar, const unsigned int) {
+        ar& boost::serialization::base_object<ArchiveFactory>(*this);
         ar& sdmc_directory;
     }
     friend class boost::serialization::access;

src/core/file_sys/archive_sdmcwriteonly.h

@@ -67,6 +67,7 @@ private:
     ArchiveFactory_SDMCWriteOnly() = default;
     template <class Archive>
     void serialize(Archive& ar, const unsigned int) {
+        ar& boost::serialization::base_object<ArchiveFactory>(*this);
         ar& sdmc_directory;
     }
     friend class boost::serialization::access;

src/core/file_sys/archive_selfncch.h

@@ -47,6 +47,12 @@ private:
     /// Mapping of ProgramId -> NCCHData
     std::unordered_map<u64, NCCHData>
         ncch_data; // TODO: Remove this, or actually set the values here
+
+    template <class Archive>
+    void serialize(Archive& ar, const unsigned int) {
+        ar& boost::serialization::base_object<ArchiveFactory>(*this);
+    }
+    friend class boost::serialization::access;
 };
 
 } // namespace FileSys

src/core/file_sys/archive_systemsavedata.h

@@ -37,6 +37,7 @@ private:
     ArchiveFactory_SystemSaveData() = default;
     template <class Archive>
     void serialize(Archive& ar, const unsigned int) {
+        ar& boost::serialization::base_object<ArchiveFactory>(*this);
         ar& base_path;
     }
     friend class boost::serialization::access;

src/core/file_sys/savedata_archive.cpp

@@ -357,4 +357,5 @@ u64 SaveDataArchive::GetFreeBytes() const {
 
 } // namespace FileSys
 
+SERIALIZE_EXPORT_IMPL(FileSys::SaveDataArchive)
 SERIALIZE_EXPORT_IMPL(FileSys::SaveDataDelayGenerator)

src/core/file_sys/savedata_archive.h

@@ -38,10 +38,21 @@ public:
 
 protected:
     std::string mount_point;
+
+private:
+    SaveDataArchive() = default;
+
+    template <class Archive>
+    void serialize(Archive& ar, const unsigned int) {
+        ar& boost::serialization::base_object<ArchiveBackend>(*this);
+        ar& mount_point;
+    }
+    friend class boost::serialization::access;
 };
 
 class SaveDataDelayGenerator;
 
 } // namespace FileSys
 
+BOOST_CLASS_EXPORT_KEY(FileSys::SaveDataArchive)
 BOOST_CLASS_EXPORT_KEY(FileSys::SaveDataDelayGenerator)

src/core/hle/kernel/config_mem.h

@@ -70,6 +70,7 @@ private:
     friend class boost::serialization::access;
     template <class Archive>
     void serialize(Archive& ar, const unsigned int file_version) {
+        ar& boost::serialization::base_object<BackingMem>(*this);
         ar& boost::serialization::make_binary_object(&config_mem, sizeof(config_mem));
     }
 };

src/core/hle/kernel/hle_ipc.cpp

@@ -50,6 +50,7 @@ private:
 
     template <class Archive>
     void serialize(Archive& ar, const unsigned int) {
+        ar& boost::serialization::base_object<Kernel::WakeupCallback>(*this);
         ar& callback;
         ar& context;
     }

src/core/hle/kernel/hle_ipc.h

@@ -222,6 +222,11 @@ public:
         virtual ~WakeupCallback() = default;
         virtual void WakeUp(std::shared_ptr<Thread> thread, HLERequestContext& context,
                             ThreadWakeupReason reason) = 0;
+
+    private:
+        template <class Archive>
+        void serialize(Archive& ar, const unsigned int) {}
+        friend class boost::serialization::access;
     };
 
     /**

src/core/hle/kernel/server_session.h

@@ -111,7 +111,7 @@ private:
     friend class boost::serialization::access;
     template <class Archive>
     void serialize(Archive& ar, const unsigned int file_version) {
-        ar& boost::serialization::base_object<Object>(*this);
+        ar& boost::serialization::base_object<WaitObject>(*this);
         ar& name;
         ar& parent;
         ar& hle_handler;

src/core/hle/kernel/shared_memory.h

@@ -109,6 +109,7 @@ private:
 
     template <class Archive>
     void serialize(Archive& ar, const unsigned int file_version) {
+        ar& boost::serialization::base_object<Object>(*this);
         ar& linear_heap_phys_offset;
         ar& backing_blocks;
         ar& size;

src/core/hle/kernel/shared_page.h

@@ -117,6 +117,7 @@ private:
 
     template <class Archive>
     void serialize(Archive& ar, const unsigned int) {
+        ar& boost::serialization::base_object<BackingMem>(*this);
         ar& boost::serialization::make_binary_object(&shared_page, sizeof(shared_page));
     }
     friend class boost::serialization::access;

src/core/hle/kernel/svc.cpp

@@ -434,6 +434,7 @@ private:
     SVC_SyncCallback() = default;
     template <class Archive>
     void serialize(Archive& ar, const unsigned int) {
+        ar& boost::serialization::base_object<Kernel::WakeupCallback>(*this);
         ar& do_output;
     }
     friend class boost::serialization::access;
@@ -466,7 +467,9 @@ private:
     SVC_IPCCallback() : system(Core::Global<Core::System>()) {}
 
     template <class Archive>
-    void serialize(Archive& ar, const unsigned int) {}
+    void serialize(Archive& ar, const unsigned int) {
+        ar& boost::serialization::base_object<Kernel::WakeupCallback>(*this);
+    }
     friend class boost::serialization::access;
 };
 

src/core/hle/kernel/thread.cpp

@@ -32,6 +32,7 @@ namespace Kernel {
 
 template <class Archive>
 void Thread::serialize(Archive& ar, const unsigned int file_version) {
+    ar& boost::serialization::base_object<Object>(*this);
     ar&* context.get();
     ar& thread_id;
     ar& status;

src/core/hle/kernel/thread.h

@@ -66,6 +66,11 @@ public:
     virtual ~WakeupCallback() = default;
     virtual void WakeUp(ThreadWakeupReason reason, std::shared_ptr<Thread> thread,
                         std::shared_ptr<WaitObject> object) = 0;
+
+private:
+    template <class Archive>
+    void serialize(Archive& ar, const unsigned int) {}
+    friend class boost::serialization::access;
 };
 
 class ThreadManager {

src/core/hle/service/nwm/nwm_uds.cpp

@@ -1189,6 +1189,7 @@ private:
 
     template <class Archive>
     void serialize(Archive& ar, const unsigned int) {
+        ar& boost::serialization::base_object<Kernel::HLERequestContext::WakeupCallback>(*this);
         ar& command_id;
     }
     friend class boost::serialization::access;

src/core/hle/service/sm/srv.cpp

@@ -3,6 +3,9 @@
 // Refer to the license.txt file included.
 
 #include <tuple>
+#include <boost/serialization/shared_ptr.hpp>
+#include <boost/serialization/string.hpp>
+#include <boost/serialization/unordered_map.hpp>
 #include "common/archives.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
@@ -21,8 +24,19 @@
 #include "core/hle/service/sm/sm.h"
 #include "core/hle/service/sm/srv.h"
 
+SERVICE_CONSTRUCT_IMPL(Service::SM::SRV)
+SERIALIZE_EXPORT_IMPL(Service::SM::SRV)
+
 namespace Service::SM {
 
+template <class Archive>
+void SRV::serialize(Archive& ar, const unsigned int) {
+    ar& boost::serialization::base_object<Kernel::SessionRequestHandler>(*this);
+    ar& notification_semaphore;
+    ar& get_service_handle_delayed_map;
+}
+SERIALIZE_IMPL(SRV)
+
 constexpr int MAX_PENDING_NOTIFICATIONS = 16;
 
 /**
@@ -107,6 +121,7 @@ private:
 
     template <class Archive>
     void serialize(Archive& ar, const unsigned int) {
+        ar& boost::serialization::base_object<Kernel::HLERequestContext::WakeupCallback>(*this);
         ar& name;
     }
     friend class boost::serialization::access;

src/core/hle/service/sm/srv.h

@@ -40,8 +40,14 @@ private:
     Core::System& system;
     std::shared_ptr<Kernel::Semaphore> notification_semaphore;
     std::unordered_map<std::string, std::shared_ptr<Kernel::Event>> get_service_handle_delayed_map;
+
+    template <class Archive>
+    void serialize(Archive& ar, const unsigned int);
+    friend class boost::serialization::access;
 };
 
 } // namespace Service::SM
 
+SERVICE_CONSTRUCT(Service::SM::SRV)
+BOOST_CLASS_EXPORT_KEY(Service::SM::SRV)
 BOOST_CLASS_EXPORT_KEY(Service::SM::SRV::ThreadCallback)