mirror of
https://git.h3cjp.net/H3cJP/citra.git
synced 2024-12-01 00:12:55 +00:00
Core, test: perform kernel and memory destruction in the correct order
The change in test is temporary due to it accessing global state
This commit is contained in:
parent
b49f2d2958
commit
9293760d0a
|
@ -276,12 +276,10 @@ private:
|
|||
|
||||
public: // HACK: this is temporary exposed for tests,
|
||||
// due to WIP kernel refactor causing desync state in memory
|
||||
std::unique_ptr<Memory::MemorySystem> memory;
|
||||
std::unique_ptr<Kernel::KernelSystem> kernel;
|
||||
std::unique_ptr<Timing> timing;
|
||||
|
||||
/// Memory system
|
||||
std::unique_ptr<Memory::MemorySystem> memory;
|
||||
|
||||
private:
|
||||
static System s_instance;
|
||||
|
||||
|
|
|
@ -40,6 +40,7 @@ TestEnvironment::~TestEnvironment() {
|
|||
Memory::MemorySystem& memory = *Core::System::GetInstance().memory;
|
||||
memory.UnmapRegion(*page_table, 0x80000000, 0x80000000);
|
||||
memory.UnmapRegion(*page_table, 0x00000000, 0x80000000);
|
||||
Core::System::GetInstance().kernel.reset();
|
||||
}
|
||||
|
||||
void TestEnvironment::SetMemory64(VAddr vaddr, u64 value) {
|
||||
|
|
Loading…
Reference in a new issue