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

Added basic UI; misc memory fixes

Browse source
This commit is contained in:
Hamish Milne 2020-01-03 17:19:59 +00:00 • committed by zhupengfei
parent 558e710e17
commit 26e90a99cd
13 changed files with 90 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/core/memory.h
View file

@ -9,7 +9,9 @@
#include <memory>
#include <string>
#include <vector>
#include "boost/serialization/access.hpp"
#include <boost/serialization/access.hpp>
#include <boost/serialization/array.hpp>
#include <boost/serialization/vector.hpp>
#include "common/common_types.h"
#include "core/mmio.h"
@ -54,12 +56,14 @@ struct SpecialRegion {
u32 size;
MMIORegionPointer handler;
private:
template <class Archive>
void serialize(Archive& ar, const unsigned int file_version) {
ar& base;
ar& size;
ar& handler;
}
friend class boost::serialization::access;
};
/**
@ -86,6 +90,15 @@ struct PageTable {
* the corresponding entry in `pointers` MUST be set to null.
*/
std::array<PageType, PAGE_TABLE_NUM_ENTRIES> attributes;
private:
template <class Archive>
void serialize(Archive& ar, const unsigned int) {
// TODO: Pointers; same as VMA backing regions we need to serialize the u8*
ar& special_regions;
ar& attributes;
}
friend class boost::serialization::access;
};
/// Physical memory regions as seen from the ARM11