diff options
| author | 2023-12-11 20:21:23 -0500 | |
|---|---|---|
| committer | 2023-12-22 21:52:49 -0500 | |
| commit | 419055e484f0f0073d5832f7ded5fd3a3e5ad7de (patch) | |
| tree | 81ff70e80fff780d6fb92f78a2df18cfc323df78 /src/core/hle/kernel/kernel.cpp | |
| parent | Merge pull request #12412 from ameerj/gl-query-prims (diff) | |
| download | yuzu-419055e484f0f0073d5832f7ded5fd3a3e5ad7de.tar.gz yuzu-419055e484f0f0073d5832f7ded5fd3a3e5ad7de.tar.xz yuzu-419055e484f0f0073d5832f7ded5fd3a3e5ad7de.zip | |
kernel: instantiate memory separately for each guest process
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index e479dacde..2efca27c2 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -126,8 +126,6 @@ struct KernelCore::Impl { | |||
| 126 | 126 | ||
| 127 | preemption_event = nullptr; | 127 | preemption_event = nullptr; |
| 128 | 128 | ||
| 129 | exclusive_monitor.reset(); | ||
| 130 | |||
| 131 | // Cleanup persistent kernel objects | 129 | // Cleanup persistent kernel objects |
| 132 | auto CleanupObject = [](KAutoObject* obj) { | 130 | auto CleanupObject = [](KAutoObject* obj) { |
| 133 | if (obj) { | 131 | if (obj) { |
| @@ -191,8 +189,6 @@ struct KernelCore::Impl { | |||
| 191 | } | 189 | } |
| 192 | 190 | ||
| 193 | void InitializePhysicalCores() { | 191 | void InitializePhysicalCores() { |
| 194 | exclusive_monitor = | ||
| 195 | Core::MakeExclusiveMonitor(system.ApplicationMemory(), Core::Hardware::NUM_CPU_CORES); | ||
| 196 | for (u32 i = 0; i < Core::Hardware::NUM_CPU_CORES; i++) { | 192 | for (u32 i = 0; i < Core::Hardware::NUM_CPU_CORES; i++) { |
| 197 | const s32 core{static_cast<s32>(i)}; | 193 | const s32 core{static_cast<s32>(i)}; |
| 198 | 194 | ||
| @@ -805,7 +801,6 @@ struct KernelCore::Impl { | |||
| 805 | std::mutex server_lock; | 801 | std::mutex server_lock; |
| 806 | std::vector<std::unique_ptr<Service::ServerManager>> server_managers; | 802 | std::vector<std::unique_ptr<Service::ServerManager>> server_managers; |
| 807 | 803 | ||
| 808 | std::unique_ptr<Core::ExclusiveMonitor> exclusive_monitor; | ||
| 809 | std::array<std::unique_ptr<Kernel::PhysicalCore>, Core::Hardware::NUM_CPU_CORES> cores; | 804 | std::array<std::unique_ptr<Kernel::PhysicalCore>, Core::Hardware::NUM_CPU_CORES> cores; |
| 810 | 805 | ||
| 811 | // Next host thead ID to use, 0-3 IDs represent core threads, >3 represent others | 806 | // Next host thead ID to use, 0-3 IDs represent core threads, >3 represent others |
| @@ -959,14 +954,6 @@ Kernel::KHardwareTimer& KernelCore::HardwareTimer() { | |||
| 959 | return *impl->hardware_timer; | 954 | return *impl->hardware_timer; |
| 960 | } | 955 | } |
| 961 | 956 | ||
| 962 | Core::ExclusiveMonitor& KernelCore::GetExclusiveMonitor() { | ||
| 963 | return *impl->exclusive_monitor; | ||
| 964 | } | ||
| 965 | |||
| 966 | const Core::ExclusiveMonitor& KernelCore::GetExclusiveMonitor() const { | ||
| 967 | return *impl->exclusive_monitor; | ||
| 968 | } | ||
| 969 | |||
| 970 | KAutoObjectWithListContainer& KernelCore::ObjectListContainer() { | 957 | KAutoObjectWithListContainer& KernelCore::ObjectListContainer() { |
| 971 | return *impl->global_object_list_container; | 958 | return *impl->global_object_list_container; |
| 972 | } | 959 | } |