Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Core/Memory: Give every emulated thread it's own TLS area.

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

10
src/core/hle/kernel/thread.cpp
View file

@ -402,9 +402,13 @@ ResultVal<SharedPtr<Thread>> Thread::Create(std::string name, VAddr entry_point,
thread->name = std::move(name);
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
// 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());
thread->status = THREADSTATUS_READY;
@ -495,6 +499,10 @@ void Thread::SetWaitSynchronizationOutput(s32 output) {
context.cpu_registers[1] = output;
}
VAddr Thread::GetTLSAddress() const {
return context.tls;
}
////////////////////////////////////////////////////////////////////////////////////////////////////
void ThreadingInit() {