diff options
| author | 2018-10-23 18:43:11 -0400 | |
|---|---|---|
| committer | 2018-10-23 18:43:11 -0400 | |
| commit | e61a62066a1d7668a5e6a792463eccf33baf470e (patch) | |
| tree | 6e58ea645719d31151168763fb9eb2b4196e7b30 /src/core/hle/kernel/thread.cpp | |
| parent | Merge pull request #1552 from FearlessTobi/port-4336 (diff) | |
| parent | kernel/process: Make the handle table per-process (diff) | |
| download | yuzu-e61a62066a1d7668a5e6a792463eccf33baf470e.tar.gz yuzu-e61a62066a1d7668a5e6a792463eccf33baf470e.tar.xz yuzu-e61a62066a1d7668a5e6a792463eccf33baf470e.zip | |
Merge pull request #1540 from lioncash/handle
kernel/process: Make the handle table per-process
Diffstat (limited to 'src/core/hle/kernel/thread.cpp')
| -rw-r--r-- | src/core/hle/kernel/thread.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index 35ec98c1a..59bc9e0af 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp | |||
| @@ -266,7 +266,7 @@ SharedPtr<Thread> SetupMainThread(KernelCore& kernel, VAddr entry_point, u32 pri | |||
| 266 | SharedPtr<Thread> thread = std::move(thread_res).Unwrap(); | 266 | SharedPtr<Thread> thread = std::move(thread_res).Unwrap(); |
| 267 | 267 | ||
| 268 | // Register 1 must be a handle to the main thread | 268 | // Register 1 must be a handle to the main thread |
| 269 | const Handle guest_handle = kernel.HandleTable().Create(thread).Unwrap(); | 269 | const Handle guest_handle = owner_process.GetHandleTable().Create(thread).Unwrap(); |
| 270 | thread->SetGuestHandle(guest_handle); | 270 | thread->SetGuestHandle(guest_handle); |
| 271 | thread->GetContext().cpu_registers[1] = guest_handle; | 271 | thread->GetContext().cpu_registers[1] = guest_handle; |
| 272 | 272 | ||