mirror of
https://github.com/citra-emu/citra.git
synced 2024-11-22 17:40:06 +00:00
fixup! Set the TLS address in the scheduler
This commit is contained in:
parent
000876858d
commit
115ad8e16a
@ -99,9 +99,8 @@ 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, u32 tls_address) = 0;
|
virtual void ResetContext(Core::ThreadContext& context, u32 stack_top, u32 entry_point, u32 arg) = 0;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Saves the current CPU context
|
* Saves the current CPU context
|
||||||
|
@ -90,14 +90,13 @@ 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, u32 tls_address) {
|
void ARM_DynCom::ResetContext(Core::ThreadContext& context, u32 stack_top, u32 entry_point, u32 arg) {
|
||||||
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) {
|
||||||
@ -124,8 +123,6 @@ 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() {
|
||||||
|
@ -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, u32 tls_address) override;
|
void ResetContext(Core::ThreadContext& context, u32 stack_top, u32 entry_point, u32 arg) 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;
|
||||||
|
|
||||||
|
@ -21,8 +21,6 @@ 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
|
||||||
|
@ -197,6 +197,7 @@ static void SwitchContext(Thread* new_thread) {
|
|||||||
new_thread->current_priority = new_thread->nominal_priority;
|
new_thread->current_priority = new_thread->nominal_priority;
|
||||||
|
|
||||||
Core::g_app_core->LoadContext(new_thread->context);
|
Core::g_app_core->LoadContext(new_thread->context);
|
||||||
|
Core::g_app_core->SetCP15Register(CP15_THREAD_URO, new_thread->GetTLSAddress());
|
||||||
} else {
|
} else {
|
||||||
current_thread = nullptr;
|
current_thread = nullptr;
|
||||||
}
|
}
|
||||||
@ -406,9 +407,11 @@ ResultVal<SharedPtr<Thread>> Thread::Create(std::string name, VAddr entry_point,
|
|||||||
|
|
||||||
ASSERT_MSG(tls_address < Memory::TLS_AREA_VADDR_END, "Too many threads");
|
ASSERT_MSG(tls_address < Memory::TLS_AREA_VADDR_END, "Too many threads");
|
||||||
|
|
||||||
|
thread->tls_address = tls_address;
|
||||||
|
|
||||||
// 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, tls_address);
|
Core::g_app_core->ResetContext(thread->context, stack_top, entry_point, arg);
|
||||||
|
|
||||||
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;
|
||||||
@ -500,7 +503,7 @@ void Thread::SetWaitSynchronizationOutput(s32 output) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
VAddr Thread::GetTLSAddress() const {
|
VAddr Thread::GetTLSAddress() const {
|
||||||
return context.tls;
|
return tls_address;
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
@ -156,6 +156,8 @@ public:
|
|||||||
|
|
||||||
s32 processor_id;
|
s32 processor_id;
|
||||||
|
|
||||||
|
VAddr tls_address; ///< Address of the Thread Local Storage of the thread
|
||||||
|
|
||||||
/// Mutexes currently held by this thread, which will be released when it exits.
|
/// Mutexes currently held by this thread, which will be released when it exits.
|
||||||
boost::container::flat_set<SharedPtr<Mutex>> held_mutexes;
|
boost::container::flat_set<SharedPtr<Mutex>> held_mutexes;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user