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.
This commit is contained in:
Subv 2015-05-10 18:35:37 -05:00
parent ba0bfe7d82
commit 000876858d
8 changed files with 31 additions and 11 deletions

View file

@ -99,8 +99,9 @@ public:
* @param stack_top Pointer to the top of the stack * @param stack_top Pointer to the top of the stack
* @param entry_point Entry point for execution * @param entry_point Entry point for execution
* @param arg User argument for thread * @param arg User argument for thread
* @param tls_address Address of the Thread Local Storage for the thread
*/ */
virtual void ResetContext(Core::ThreadContext& context, u32 stack_top, u32 entry_point, u32 arg) = 0; virtual void ResetContext(Core::ThreadContext& context, u32 stack_top, u32 entry_point, u32 arg, u32 tls_address) = 0;
/** /**
* Saves the current CPU context * Saves the current CPU context

View file

@ -90,13 +90,14 @@ void ARM_DynCom::ExecuteInstructions(int num_instructions) {
AddTicks(ticks_executed); AddTicks(ticks_executed);
} }
void ARM_DynCom::ResetContext(Core::ThreadContext& context, u32 stack_top, u32 entry_point, u32 arg) { void ARM_DynCom::ResetContext(Core::ThreadContext& context, u32 stack_top, u32 entry_point, u32 arg, u32 tls_address) {
memset(&context, 0, sizeof(Core::ThreadContext)); memset(&context, 0, sizeof(Core::ThreadContext));
context.cpu_registers[0] = arg; context.cpu_registers[0] = arg;
context.pc = entry_point; context.pc = entry_point;
context.sp = stack_top; context.sp = stack_top;
context.cpsr = 0x1F; // Usermode context.cpsr = 0x1F; // Usermode
context.tls = tls_address;
} }
void ARM_DynCom::SaveContext(Core::ThreadContext& ctx) { void ARM_DynCom::SaveContext(Core::ThreadContext& ctx) {
@ -123,6 +124,8 @@ void ARM_DynCom::LoadContext(const Core::ThreadContext& ctx) {
state->VFP[1] = ctx.fpscr; state->VFP[1] = ctx.fpscr;
state->VFP[2] = ctx.fpexc; state->VFP[2] = ctx.fpexc;
SetCP15Register(CP15_THREAD_URO, ctx.tls);
} }
void ARM_DynCom::PrepareReschedule() { void ARM_DynCom::PrepareReschedule() {

View file

@ -27,7 +27,7 @@ public:
void AddTicks(u64 ticks) override; void AddTicks(u64 ticks) override;
void ResetContext(Core::ThreadContext& context, u32 stack_top, u32 entry_point, u32 arg) override; void ResetContext(Core::ThreadContext& context, u32 stack_top, u32 entry_point, u32 arg, u32 tls_address) override;
void SaveContext(Core::ThreadContext& ctx) override; void SaveContext(Core::ThreadContext& ctx) override;
void LoadContext(const Core::ThreadContext& ctx) override; void LoadContext(const Core::ThreadContext& ctx) override;

View file

@ -61,10 +61,6 @@ int Init() {
g_sys_core = new ARM_DynCom(USER32MODE); g_sys_core = new ARM_DynCom(USER32MODE);
g_app_core = new ARM_DynCom(USER32MODE); g_app_core = new ARM_DynCom(USER32MODE);
// TODO: Whenever TLS is implemented, this should contain
// the address of the 0x200-byte TLS
g_app_core->SetCP15Register(CP15_THREAD_URO, Memory::TLS_AREA_VADDR);
LOG_DEBUG(Core, "Initialized OK"); LOG_DEBUG(Core, "Initialized OK");
return 0; return 0;
} }

View file

@ -21,6 +21,8 @@ struct ThreadContext {
u32 fpu_registers[32]; u32 fpu_registers[32];
u32 fpscr; u32 fpscr;
u32 fpexc; u32 fpexc;
u32 tls;
}; };
extern ARM_Interface* g_app_core; ///< ARM11 application core extern ARM_Interface* g_app_core; ///< ARM11 application core

View file

@ -5,6 +5,7 @@
#pragma once #pragma once
#include "core/hle/kernel/kernel.h" #include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/thread.h"
#include "core/mem_map.h" #include "core/mem_map.h"
namespace Kernel { namespace Kernel {
@ -12,12 +13,15 @@ namespace Kernel {
static const int kCommandHeaderOffset = 0x80; ///< Offset into command buffer of header 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 * @param offset Optional offset into command buffer
* @return Pointer to command buffer * @return Pointer to command buffer
*/ */
inline static u32* GetCommandBuffer(const int offset = 0) { inline static u32* GetCommandBuffer(const int offset = 0) {
return (u32*)Memory::GetPointer(Memory::TLS_AREA_VADDR + kCommandHeaderOffset + offset); return (u32*)Memory::GetPointer(GetCurrentThread()->GetTLSAddress() + kCommandHeaderOffset + offset);
} }
/** /**

View file

@ -402,9 +402,13 @@ ResultVal<SharedPtr<Thread>> Thread::Create(std::string name, VAddr entry_point,
thread->name = std::move(name); thread->name = std::move(name);
thread->callback_handle = wakeup_callback_handle_table.Create(thread).MoveFrom(); thread->callback_handle = wakeup_callback_handle_table.Create(thread).MoveFrom();
VAddr tls_address = Memory::TLS_AREA_VADDR + (thread->thread_id - 1) * 0x200;
ASSERT_MSG(tls_address < Memory::TLS_AREA_VADDR_END, "Too many threads");
// TODO(peachum): move to ScheduleThread() when scheduler is added so selected core is used // TODO(peachum): move to ScheduleThread() when scheduler is added so selected core is used
// to initialize the context // to initialize the context
Core::g_app_core->ResetContext(thread->context, stack_top, entry_point, arg); Core::g_app_core->ResetContext(thread->context, stack_top, entry_point, arg, tls_address);
ready_queue.push_back(thread->current_priority, thread.get()); ready_queue.push_back(thread->current_priority, thread.get());
thread->status = THREADSTATUS_READY; thread->status = THREADSTATUS_READY;
@ -495,6 +499,10 @@ void Thread::SetWaitSynchronizationOutput(s32 output) {
context.cpu_registers[1] = output; context.cpu_registers[1] = output;
} }
VAddr Thread::GetTLSAddress() const {
return context.tls;
}
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
void ThreadingInit() { void ThreadingInit() {

View file

@ -135,6 +135,12 @@ public:
*/ */
void Stop(); void Stop();
/*
* Returns the Thread Local Storage address of the current thread
* @returns VAddr of the thread's TLS
*/
VAddr GetTLSAddress() const;
Core::ThreadContext context; Core::ThreadContext context;
u32 thread_id; u32 thread_id;