diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-11-12 02:02:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-12 02:02:01 +0100 |
| commit | 9f1c9599a2c2e31c9eaa4dc728a4e1ecca30988c (patch) | |
| tree | 0f1acdaf5a6c525ea0740984783dd0c8cb89caac /src/core/hle/kernel | |
| parent | Merge pull request #12003 from liamwhite/read-modules (diff) | |
| parent | k_capabilities: ignore map region when KTrace is disabled (diff) | |
| download | yuzu-9f1c9599a2c2e31c9eaa4dc728a4e1ecca30988c.tar yuzu-9f1c9599a2c2e31c9eaa4dc728a4e1ecca30988c.tar.gz yuzu-9f1c9599a2c2e31c9eaa4dc728a4e1ecca30988c.tar.bz2 yuzu-9f1c9599a2c2e31c9eaa4dc728a4e1ecca30988c.tar.lz yuzu-9f1c9599a2c2e31c9eaa4dc728a4e1ecca30988c.tar.xz yuzu-9f1c9599a2c2e31c9eaa4dc728a4e1ecca30988c.tar.zst yuzu-9f1c9599a2c2e31c9eaa4dc728a4e1ecca30988c.zip | |
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 @@ #include "core/hle/kernel/k_capabilities.h" #include "core/hle/kernel/k_memory_layout.h" #include "core/hle/kernel/k_process_page_table.h" +#include "core/hle/kernel/k_trace.h" #include "core/hle/kernel/kernel.h" #include "core/hle/kernel/svc_results.h" #include "core/hle/kernel/svc_version.h" @@ -329,6 +330,8 @@ Result KCapabilities::SetCapabilities(std::span<const u32> caps, KProcessPageTab // Map the range. R_TRY(this->MapRange_(cap, size_cap, page_table)); + } else if (GetCapabilityType(cap) == CapabilityType::MapRegion && !IsKTraceEnabled) { + continue; } else { R_TRY(this->SetCapability(cap, set_flags, set_svc, page_table)); } |