mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-31 13:50:03 +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
					
				
					 2 changed files with 2 additions and 3 deletions
				
			
		|  | @ -276,12 +276,10 @@ private: | ||||||
| 
 | 
 | ||||||
| public: // HACK: this is temporary exposed for tests,
 | public: // HACK: this is temporary exposed for tests,
 | ||||||
|         // due to WIP kernel refactor causing desync state in memory
 |         // 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<Kernel::KernelSystem> kernel; | ||||||
|     std::unique_ptr<Timing> timing; |     std::unique_ptr<Timing> timing; | ||||||
| 
 | 
 | ||||||
|     /// Memory system
 |  | ||||||
|     std::unique_ptr<Memory::MemorySystem> memory; |  | ||||||
| 
 |  | ||||||
| private: | private: | ||||||
|     static System s_instance; |     static System s_instance; | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -40,6 +40,7 @@ TestEnvironment::~TestEnvironment() { | ||||||
|     Memory::MemorySystem& memory = *Core::System::GetInstance().memory; |     Memory::MemorySystem& memory = *Core::System::GetInstance().memory; | ||||||
|     memory.UnmapRegion(*page_table, 0x80000000, 0x80000000); |     memory.UnmapRegion(*page_table, 0x80000000, 0x80000000); | ||||||
|     memory.UnmapRegion(*page_table, 0x00000000, 0x80000000); |     memory.UnmapRegion(*page_table, 0x00000000, 0x80000000); | ||||||
|  |     Core::System::GetInstance().kernel.reset(); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| void TestEnvironment::SetMemory64(VAddr vaddr, u64 value) { | void TestEnvironment::SetMemory64(VAddr vaddr, u64 value) { | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue