diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-09 05:39:56 +0200 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2015-05-09 06:29:52 +0200 |
commit | 1c0b87edc2d8262c06ea4c301bcfc884875f918b (patch) | |
tree | f5b49739cc6cb7ca758111c5171c84b2c3152f5f /src/core/hle/kernel | |
parent | Loader: Remove .bin file support (diff) | |
download | yuzu-1c0b87edc2d8262c06ea4c301bcfc884875f918b.tar yuzu-1c0b87edc2d8262c06ea4c301bcfc884875f918b.tar.gz yuzu-1c0b87edc2d8262c06ea4c301bcfc884875f918b.tar.bz2 yuzu-1c0b87edc2d8262c06ea4c301bcfc884875f918b.tar.lz yuzu-1c0b87edc2d8262c06ea4c301bcfc884875f918b.tar.xz yuzu-1c0b87edc2d8262c06ea4c301bcfc884875f918b.tar.zst yuzu-1c0b87edc2d8262c06ea4c301bcfc884875f918b.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/session.h | 2 | ||||
-rw-r--r-- | src/core/hle/kernel/thread.cpp | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/core/hle/kernel/session.h b/src/core/hle/kernel/session.h index 9e9288e0f..0fd18148a 100644 --- a/src/core/hle/kernel/session.h +++ b/src/core/hle/kernel/session.h @@ -17,7 +17,7 @@ static const int kCommandHeaderOffset = 0x80; ///< Offset into command buffer of * @return Pointer to command buffer */ inline static u32* GetCommandBuffer(const int offset=0) { - return (u32*)Memory::GetPointer(Memory::KERNEL_MEMORY_VADDR + kCommandHeaderOffset + offset); + return (u32*)Memory::GetPointer(Memory::TLS_AREA_VADDR + kCommandHeaderOffset + offset); } /** diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index 9577b889a..0a3fd7cb1 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp @@ -443,7 +443,8 @@ void Thread::BoostPriority(s32 priority) { SharedPtr<Thread> SetupIdleThread() { // We need to pass a few valid values to get around parameter checking in Thread::Create. - auto thread = Thread::Create("idle", Memory::KERNEL_MEMORY_VADDR, THREADPRIO_LOWEST, 0, + // TODO(yuriks): Figure out a way to avoid passing the bogus VAddr parameter + auto thread = Thread::Create("idle", Memory::TLS_AREA_VADDR, THREADPRIO_LOWEST, 0, THREADPROCESSORID_0, 0).MoveFrom(); thread->idle = true; @@ -455,7 +456,7 @@ SharedPtr<Thread> SetupMainThread(u32 stack_size, u32 entry_point, s32 priority) // Initialize new "main" thread auto thread_res = Thread::Create("main", entry_point, priority, 0, - THREADPROCESSORID_0, Memory::SCRATCHPAD_VADDR_END); + THREADPROCESSORID_0, Memory::HEAP_VADDR_END - stack_size); SharedPtr<Thread> thread = thread_res.MoveFrom(); |