diff options
| author | 2020-04-02 22:00:41 -0400 | |
|---|---|---|
| committer | 2020-04-17 00:59:29 -0400 | |
| commit | dc25c86556c36dd23224d88234afc9ecbf780719 (patch) | |
| tree | 5dbe45bcc17ecad8675e7a4cb03dd34361f01e03 /src/core/core.cpp | |
| parent | dynarmic: Enable strict alignment checks. (diff) | |
| download | yuzu-dc25c86556c36dd23224d88234afc9ecbf780719.tar.gz yuzu-dc25c86556c36dd23224d88234afc9ecbf780719.tar.xz yuzu-dc25c86556c36dd23224d88234afc9ecbf780719.zip | |
core: device_manager: Add a simple class to manage device RAM.
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 87b147f63..4bc71c7a7 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include "core/core_manager.h" | 14 | #include "core/core_manager.h" |
| 15 | #include "core/core_timing.h" | 15 | #include "core/core_timing.h" |
| 16 | #include "core/cpu_manager.h" | 16 | #include "core/cpu_manager.h" |
| 17 | #include "core/device_memory.h" | ||
| 17 | #include "core/file_sys/bis_factory.h" | 18 | #include "core/file_sys/bis_factory.h" |
| 18 | #include "core/file_sys/card_image.h" | 19 | #include "core/file_sys/card_image.h" |
| 19 | #include "core/file_sys/mode.h" | 20 | #include "core/file_sys/mode.h" |
| @@ -113,7 +114,7 @@ FileSys::VirtualFile GetGameFileFromPath(const FileSys::VirtualFilesystem& vfs, | |||
| 113 | } | 114 | } |
| 114 | struct System::Impl { | 115 | struct System::Impl { |
| 115 | explicit Impl(System& system) | 116 | explicit Impl(System& system) |
| 116 | : kernel{system}, fs_controller{system}, memory{system}, | 117 | : kernel{system}, device_memory{system}, fs_controller{system}, memory{system}, |
| 117 | cpu_manager{system}, reporter{system}, applet_manager{system} {} | 118 | cpu_manager{system}, reporter{system}, applet_manager{system} {} |
| 118 | 119 | ||
| 119 | CoreManager& CurrentCoreManager() { | 120 | CoreManager& CurrentCoreManager() { |
| @@ -337,6 +338,7 @@ struct System::Impl { | |||
| 337 | 338 | ||
| 338 | Timing::CoreTiming core_timing; | 339 | Timing::CoreTiming core_timing; |
| 339 | Kernel::KernelCore kernel; | 340 | Kernel::KernelCore kernel; |
| 341 | DeviceMemory device_memory; | ||
| 340 | /// RealVfsFilesystem instance | 342 | /// RealVfsFilesystem instance |
| 341 | FileSys::VirtualFilesystem virtual_filesystem; | 343 | FileSys::VirtualFilesystem virtual_filesystem; |
| 342 | /// ContentProviderUnion instance | 344 | /// ContentProviderUnion instance |
| @@ -472,6 +474,14 @@ Kernel::Process* System::CurrentProcess() { | |||
| 472 | return impl->kernel.CurrentProcess(); | 474 | return impl->kernel.CurrentProcess(); |
| 473 | } | 475 | } |
| 474 | 476 | ||
| 477 | DeviceMemory& System::GetDeviceMemory() { | ||
| 478 | return impl->device_memory; | ||
| 479 | } | ||
| 480 | |||
| 481 | const DeviceMemory& System::GetDeviceMemory() const { | ||
| 482 | return impl->device_memory; | ||
| 483 | } | ||
| 484 | |||
| 475 | const Kernel::Process* System::CurrentProcess() const { | 485 | const Kernel::Process* System::CurrentProcess() const { |
| 476 | return impl->kernel.CurrentProcess(); | 486 | return impl->kernel.CurrentProcess(); |
| 477 | } | 487 | } |