summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/thread.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2018-03-16 20:06:27 -0400
committerGravatar GitHub2018-03-16 20:06:27 -0400
commite7ba2a4447bb06146f23163e82689852bf83008e (patch)
tree7ff83f9d4b4fd4df5f48333d07fb743e3c4531cb /src/core/hle/kernel/thread.cpp
parentMerge pull request #237 from mailwl/nifm-module (diff)
parentprocess: MirrorMemory should use MemoryState::Mapped. (diff)
downloadyuzu-e7ba2a4447bb06146f23163e82689852bf83008e.tar.gz
yuzu-e7ba2a4447bb06146f23163e82689852bf83008e.tar.xz
yuzu-e7ba2a4447bb06146f23163e82689852bf83008e.zip
Merge pull request #232 from bunnei/heap-fixes
Various heap fixes for libtransistor
Diffstat (limited to 'src/core/hle/kernel/thread.cpp')
-rw-r--r--src/core/hle/kernel/thread.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index 2394620eb..a39c53db5 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -314,7 +314,7 @@ ResultVal<SharedPtr<Thread>> Thread::Create(std::string name, VAddr entry_point,
314 // TODO(Subv): Find the correct MemoryState for this region. 314 // TODO(Subv): Find the correct MemoryState for this region.
315 vm_manager.MapMemoryBlock(Memory::TLS_AREA_VADDR + available_page * Memory::PAGE_SIZE, 315 vm_manager.MapMemoryBlock(Memory::TLS_AREA_VADDR + available_page * Memory::PAGE_SIZE,
316 linheap_memory, offset, Memory::PAGE_SIZE, 316 linheap_memory, offset, Memory::PAGE_SIZE,
317 MemoryState::ThreadLocalStorage); 317 MemoryState::ThreadLocal);
318 } 318 }
319 319
320 // Mark the slot as used 320 // Mark the slot as used
@@ -357,7 +357,7 @@ SharedPtr<Thread> SetupMainThread(VAddr entry_point, u32 priority,
357 357
358 // Initialize new "main" thread 358 // Initialize new "main" thread
359 auto thread_res = Thread::Create("main", entry_point, priority, 0, THREADPROCESSORID_0, 359 auto thread_res = Thread::Create("main", entry_point, priority, 0, THREADPROCESSORID_0,
360 Memory::HEAP_VADDR_END, owner_process); 360 Memory::STACK_VADDR_END, owner_process);
361 361
362 SharedPtr<Thread> thread = std::move(thread_res).Unwrap(); 362 SharedPtr<Thread> thread = std::move(thread_res).Unwrap();
363 363