Forks/citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra.git synced 2025-11-04 07:38:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Kernel: pass in MemorySystem

Browse source
This commit is contained in:
Weiyi Wang 2018-11-20 22:48:19 -05:00
parent 6992f76acf
commit 8118be6615
6 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/core/hle/kernel/kernel.cpp
View file

@ -16,7 +16,7 @@
namespace Kernel {
/// Initialize the kernel
KernelSystem::KernelSystem(u32 system_mode) {
KernelSystem::KernelSystem(Memory::MemorySystem& memory, u32 system_mode) : memory(memory) {
MemoryInit(system_mode);
resource_limits = std::make_unique<ResourceLimitList>(*this);

8
src/core/hle/kernel/kernel.h
View file

@ -23,6 +23,10 @@ namespace SharedPage {
class Handler;
}
namespace Memory {
class MemorySystem;
}
namespace Kernel {
class AddressArbiter;
@ -73,7 +77,7 @@ using SharedPtr = boost::intrusive_ptr<T>;
class KernelSystem {
public:
explicit KernelSystem(u32 system_mode);
explicit KernelSystem(Memory::MemorySystem& memory, u32 system_mode);
~KernelSystem();
/**
@ -220,6 +224,8 @@ public:
/// Map of named ports managed by the kernel, which can be retrieved using the ConnectToPort
std::unordered_map<std::string, SharedPtr<ClientPort>> named_ports;
Memory::MemorySystem& memory;
private:
void MemoryInit(u32 mem_type);