Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pretty sure ARM/Thread serialization works now

Browse source
This commit is contained in:
Hamish Milne 2020-01-20 21:32:38 +00:00 • committed by zhupengfei
parent c983528862
commit 246ae84a52
8 changed files with 40 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/core/arm/arm_interface.h
View file

@ -11,6 +11,10 @@
#include "core/arm/skyeye_common/arm_regformat.h"
#include "core/arm/skyeye_common/vfp/asm_vfp.h"
namespace Memory {
struct PageTable;
}
/// Generic ARM11 CPU interface
class ARM_Interface : NonCopyable {
public:
@ -111,7 +115,9 @@ public:
virtual void InvalidateCacheRange(u32 start_address, std::size_t length) = 0;
/// Notify CPU emulation that page tables have changed
virtual void PageTableChanged() = 0;
virtual void SetPageTable(const std::shared_ptr<Memory::PageTable>& page_table) = 0;
virtual std::shared_ptr<Memory::PageTable> GetPageTable() const = 0;
/**
* Set the Program Counter to an address
@ -214,11 +220,15 @@ public:
/// Prepare core for thread reschedule (if needed to correctly handle state)
virtual void PrepareReschedule() = 0;
virtual void PurgeState() = 0;
private:
friend class boost::serialization::access;
template <class Archive>
void save(Archive& ar, const unsigned int file_version) const {
auto page_table = GetPageTable();
ar << page_table;
for (auto i = 0; i < 15; i++) {
auto r = GetReg(i);
ar << r;
@ -243,6 +253,10 @@ private:
template <class Archive>
void load(Archive& ar, const unsigned int file_version) {
PurgeState();
std::shared_ptr<Memory::PageTable> page_table = nullptr;
ar >> page_table;
SetPageTable(page_table);
u32 r;
for (auto i = 0; i < 15; i++) {
ar >> r;
@ -264,7 +278,6 @@ private:
ar >> r;
SetCP15Register(static_cast<CP15Register>(i), r);
}
ClearInstructionCache();
}
BOOST_SERIALIZATION_SPLIT_MEMBER()