diff options
author | Lioncash <mathew1800@gmail.com> | 2019-04-09 19:25:54 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2019-04-12 04:11:40 +0200 |
commit | f2331a804a2fa300d9a7dc0d012e3242b7accdaf (patch) | |
tree | d7f61aa201effed9e37fc07c626218759fc75288 /src/core/hle/kernel | |
parent | Merge pull request #2235 from ReinUsesLisp/spirv-decompiler (diff) | |
download | yuzu-f2331a804a2fa300d9a7dc0d012e3242b7accdaf.tar yuzu-f2331a804a2fa300d9a7dc0d012e3242b7accdaf.tar.gz yuzu-f2331a804a2fa300d9a7dc0d012e3242b7accdaf.tar.bz2 yuzu-f2331a804a2fa300d9a7dc0d012e3242b7accdaf.tar.lz yuzu-f2331a804a2fa300d9a7dc0d012e3242b7accdaf.tar.xz yuzu-f2331a804a2fa300d9a7dc0d012e3242b7accdaf.tar.zst yuzu-f2331a804a2fa300d9a7dc0d012e3242b7accdaf.zip |
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r-- | src/core/hle/kernel/kernel.cpp | 7 | ||||
-rw-r--r-- | src/core/hle/kernel/process.cpp | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 4d58e7c69..8539fabe4 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -182,7 +182,12 @@ void KernelCore::AppendNewProcess(SharedPtr<Process> process) { void KernelCore::MakeCurrentProcess(Process* process) { impl->current_process = process; - Memory::SetCurrentPageTable(&process->VMManager().page_table); + + if (process == nullptr) { + return; + } + + Memory::SetCurrentPageTable(*process); } Process* KernelCore::CurrentProcess() { diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp index 4e94048da..94d196e5c 100644 --- a/src/core/hle/kernel/process.cpp +++ b/src/core/hle/kernel/process.cpp @@ -107,7 +107,7 @@ ResultCode Process::LoadFromMetadata(const FileSys::ProgramMetadata& metadata) { vm_manager.Reset(metadata.GetAddressSpaceType()); // Ensure that the potentially resized page table is seen by CPU backends. - Memory::SetCurrentPageTable(&vm_manager.page_table); + Memory::SetCurrentPageTable(*this); const auto& caps = metadata.GetKernelCapabilities(); const auto capability_init_result = |