diff options
| author | 2023-11-11 10:45:43 -0500 | |
|---|---|---|
| committer | 2023-11-11 10:45:43 -0500 | |
| commit | a6735cba5f6c7b9a7ad663686d99f8835ea000f6 (patch) | |
| tree | 2314fd4a7680dfc8d825011118bbfc8e78e0741b /src/core/hle/kernel | |
| parent | Merge pull request #11914 from liamwhite/newer-kpagetable (diff) | |
| download | yuzu-a6735cba5f6c7b9a7ad663686d99f8835ea000f6.tar.gz yuzu-a6735cba5f6c7b9a7ad663686d99f8835ea000f6.tar.xz yuzu-a6735cba5f6c7b9a7ad663686d99f8835ea000f6.zip | |
k_capabilities: ignore map region when KTrace is disabled
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/k_capabilities.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/hle/kernel/k_capabilities.cpp b/src/core/hle/kernel/k_capabilities.cpp index fb890f978..274fee493 100644 --- a/src/core/hle/kernel/k_capabilities.cpp +++ b/src/core/hle/kernel/k_capabilities.cpp | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | #include "core/hle/kernel/k_capabilities.h" | 5 | #include "core/hle/kernel/k_capabilities.h" |
| 6 | #include "core/hle/kernel/k_memory_layout.h" | 6 | #include "core/hle/kernel/k_memory_layout.h" |
| 7 | #include "core/hle/kernel/k_process_page_table.h" | 7 | #include "core/hle/kernel/k_process_page_table.h" |
| 8 | #include "core/hle/kernel/k_trace.h" | ||
| 8 | #include "core/hle/kernel/kernel.h" | 9 | #include "core/hle/kernel/kernel.h" |
| 9 | #include "core/hle/kernel/svc_results.h" | 10 | #include "core/hle/kernel/svc_results.h" |
| 10 | #include "core/hle/kernel/svc_version.h" | 11 | #include "core/hle/kernel/svc_version.h" |
| @@ -329,6 +330,8 @@ Result KCapabilities::SetCapabilities(std::span<const u32> caps, KProcessPageTab | |||
| 329 | 330 | ||
| 330 | // Map the range. | 331 | // Map the range. |
| 331 | R_TRY(this->MapRange_(cap, size_cap, page_table)); | 332 | R_TRY(this->MapRange_(cap, size_cap, page_table)); |
| 333 | } else if (GetCapabilityType(cap) == CapabilityType::MapRegion && !IsKTraceEnabled) { | ||
| 334 | continue; | ||
| 332 | } else { | 335 | } else { |
| 333 | R_TRY(this->SetCapability(cap, set_flags, set_svc, page_table)); | 336 | R_TRY(this->SetCapability(cap, set_flags, set_svc, page_table)); |
| 334 | } | 337 | } |