diff options
| author | 2018-09-20 23:35:29 -0400 | |
|---|---|---|
| committer | 2018-09-20 23:35:29 -0400 | |
| commit | 0285ddfbd4be7af072eb4624c0f7eec21f1889da (patch) | |
| tree | 89e2962fca3cb3505c51409f4f8c4cbb398abd9c /src/core/hle/kernel/thread.cpp | |
| parent | Merge pull request #1371 from lioncash/fwd-arm (diff) | |
| parent | kernel/thread: Use owner_process when setting the page table in SetupMainThre... (diff) | |
| download | yuzu-0285ddfbd4be7af072eb4624c0f7eec21f1889da.tar.gz yuzu-0285ddfbd4be7af072eb4624c0f7eec21f1889da.tar.xz yuzu-0285ddfbd4be7af072eb4624c0f7eec21f1889da.zip | |
Merge pull request #1372 from lioncash/thread
kernel/thread: Use owner_process when setting the page table in SetupMainThread()
Diffstat (limited to 'src/core/hle/kernel/thread.cpp')
| -rw-r--r-- | src/core/hle/kernel/thread.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index d4183d6e3..c2d7535c9 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp | |||
| @@ -311,13 +311,13 @@ void Thread::BoostPriority(u32 priority) { | |||
| 311 | } | 311 | } |
| 312 | 312 | ||
| 313 | SharedPtr<Thread> SetupMainThread(KernelCore& kernel, VAddr entry_point, u32 priority, | 313 | SharedPtr<Thread> SetupMainThread(KernelCore& kernel, VAddr entry_point, u32 priority, |
| 314 | SharedPtr<Process> owner_process) { | 314 | Process& owner_process) { |
| 315 | // Setup page table so we can write to memory | 315 | // Setup page table so we can write to memory |
| 316 | SetCurrentPageTable(&Core::CurrentProcess()->vm_manager.page_table); | 316 | SetCurrentPageTable(&owner_process.vm_manager.page_table); |
| 317 | 317 | ||
| 318 | // Initialize new "main" thread | 318 | // Initialize new "main" thread |
| 319 | auto thread_res = Thread::Create(kernel, "main", entry_point, priority, 0, THREADPROCESSORID_0, | 319 | auto thread_res = Thread::Create(kernel, "main", entry_point, priority, 0, THREADPROCESSORID_0, |
| 320 | Memory::STACK_AREA_VADDR_END, std::move(owner_process)); | 320 | Memory::STACK_AREA_VADDR_END, &owner_process); |
| 321 | 321 | ||
| 322 | SharedPtr<Thread> thread = std::move(thread_res).Unwrap(); | 322 | SharedPtr<Thread> thread = std::move(thread_res).Unwrap(); |
| 323 | 323 | ||