diff options
| author | 2017-09-20 23:14:06 -0400 | |
|---|---|---|
| committer | 2017-09-30 14:28:54 -0400 | |
| commit | c5ce5c06e471d556254c1cf465b1d92d6a8f695d (patch) | |
| tree | d2a08cba5800b41032ff309ce0cddef4cd6680ba /src/core/hle/kernel/thread.cpp | |
| parent | core: Various changes to support 64-bit addressing. (diff) | |
| download | yuzu-c5ce5c06e471d556254c1cf465b1d92d6a8f695d.tar.gz yuzu-c5ce5c06e471d556254c1cf465b1d92d6a8f695d.tar.xz yuzu-c5ce5c06e471d556254c1cf465b1d92d6a8f695d.zip | |
kernel: Various threading fixes to support 64-bit addressing.
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 f5f2eb2f7..736be50db 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp | |||
| @@ -341,8 +341,8 @@ std::tuple<u32, u32, bool> GetFreeThreadLocalSlot(std::vector<std::bitset<8>>& t | |||
| 341 | * @param entry_point Address of entry point for execution | 341 | * @param entry_point Address of entry point for execution |
| 342 | * @param arg User argument for thread | 342 | * @param arg User argument for thread |
| 343 | */ | 343 | */ |
| 344 | static void ResetThreadContext(ARM_Interface::ThreadContext& context, u32 stack_top, | 344 | static void ResetThreadContext(ARM_Interface::ThreadContext& context, VAddr stack_top, |
| 345 | u32 entry_point, u32 arg) { | 345 | VAddr entry_point, u64 arg) { |
| 346 | memset(&context, 0, sizeof(ARM_Interface::ThreadContext)); | 346 | memset(&context, 0, sizeof(ARM_Interface::ThreadContext)); |
| 347 | 347 | ||
| 348 | context.cpu_registers[0] = arg; | 348 | context.cpu_registers[0] = arg; |
| @@ -477,7 +477,7 @@ void Thread::BoostPriority(s32 priority) { | |||
| 477 | current_priority = priority; | 477 | current_priority = priority; |
| 478 | } | 478 | } |
| 479 | 479 | ||
| 480 | SharedPtr<Thread> SetupMainThread(u32 entry_point, s32 priority) { | 480 | SharedPtr<Thread> SetupMainThread(VAddr entry_point, s32 priority) { |
| 481 | DEBUG_ASSERT(!GetCurrentThread()); | 481 | DEBUG_ASSERT(!GetCurrentThread()); |
| 482 | 482 | ||
| 483 | // Initialize new "main" thread | 483 | // Initialize new "main" thread |