aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/hle/kernel/session.h
diff options
context:
space:
mode:
authorGravatar Subv <subv2112@gmail.com>2015-05-10 18:35:37 -0500
committerGravatar Subv <subv2112@gmail.com>2015-05-10 18:35:37 -0500
commit000876858d52d7e4fa8e21bc4407d43d548eff30 (patch)
treef0af4cde78349cfe4ea7875b24d37cf85eb3eb03 /src/core/hle/kernel/session.h
parentba0bfe7d82a241f1dbe449a1bdcc2a76c594c667 (diff)
Core/Memory: Give every emulated thread it's own TLS area.
The TLS area for thread T with id Ti is located at TLS_AREA_VADDR + (Ti - 1) * 0x200. This allows some games like Mario Kart 7 to continue further.
Diffstat (limited to 'src/core/hle/kernel/session.h')
-rw-r--r--src/core/hle/kernel/session.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/core/hle/kernel/session.h b/src/core/hle/kernel/session.h
index 0fd18148..8c3886ff 100644
--- a/src/core/hle/kernel/session.h
+++ b/src/core/hle/kernel/session.h
@@ -5,6 +5,7 @@
#pragma once
#include "core/hle/kernel/kernel.h"
+#include "core/hle/kernel/thread.h"
#include "core/mem_map.h"
namespace Kernel {
@@ -12,12 +13,15 @@ namespace Kernel {
static const int kCommandHeaderOffset = 0x80; ///< Offset into command buffer of header
/**
- * Returns a pointer to the command buffer in kernel memory
+ * Returns a pointer to the command buffer in the current thread's TLS
+ * TODO(Subv): This is not entirely correct, the command buffer should be copied from
+ * the thread's TLS to an intermediate buffer in kernel memory, and then copied again to
+ * the service handler process' memory.
* @param offset Optional offset into command buffer
* @return Pointer to command buffer
*/
-inline static u32* GetCommandBuffer(const int offset=0) {
- return (u32*)Memory::GetPointer(Memory::TLS_AREA_VADDR + kCommandHeaderOffset + offset);
+inline static u32* GetCommandBuffer(const int offset = 0) {
+ return (u32*)Memory::GetPointer(GetCurrentThread()->GetTLSAddress() + kCommandHeaderOffset + offset);
}
/**