arm: ResetContext shouldn't be part of ARM_Interface.
This commit is contained in:
parent
85861d44b7
commit
05e120a4cc
|
@ -121,15 +121,6 @@ public:
|
||||||
*/
|
*/
|
||||||
virtual void AddTicks(u64 ticks) = 0;
|
virtual void AddTicks(u64 ticks) = 0;
|
||||||
|
|
||||||
/**
|
|
||||||
* Initializes a CPU context for use on this CPU
|
|
||||||
* @param context Thread context to reset
|
|
||||||
* @param stack_top Pointer to the top of the stack
|
|
||||||
* @param entry_point Entry point for execution
|
|
||||||
* @param arg User argument for thread
|
|
||||||
*/
|
|
||||||
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
|
||||||
* @param ctx Thread context to save
|
* @param ctx Thread context to save
|
||||||
|
|
|
@ -130,15 +130,6 @@ void ARM_Dynarmic::ExecuteInstructions(int num_instructions) {
|
||||||
AddTicks(num_instructions);
|
AddTicks(num_instructions);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ARM_Dynarmic::ResetContext(Core::ThreadContext& context, u32 stack_top, u32 entry_point, u32 arg) {
|
|
||||||
memset(&context, 0, sizeof(Core::ThreadContext));
|
|
||||||
|
|
||||||
context.cpu_registers[0] = arg;
|
|
||||||
context.pc = entry_point;
|
|
||||||
context.sp = stack_top;
|
|
||||||
context.cpsr = USER32MODE | ((entry_point & 1) << 5); // Usermode and THUMB mode
|
|
||||||
}
|
|
||||||
|
|
||||||
void ARM_Dynarmic::SaveContext(Core::ThreadContext& ctx) {
|
void ARM_Dynarmic::SaveContext(Core::ThreadContext& ctx) {
|
||||||
memcpy(ctx.cpu_registers, jit->Regs().data(), sizeof(ctx.cpu_registers));
|
memcpy(ctx.cpu_registers, jit->Regs().data(), sizeof(ctx.cpu_registers));
|
||||||
memcpy(ctx.fpu_registers, jit->ExtRegs().data(), sizeof(ctx.fpu_registers));
|
memcpy(ctx.fpu_registers, jit->ExtRegs().data(), sizeof(ctx.fpu_registers));
|
||||||
|
|
|
@ -36,7 +36,6 @@ 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 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;
|
||||||
|
|
||||||
|
|
|
@ -93,15 +93,6 @@ 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) {
|
|
||||||
memset(&context, 0, sizeof(Core::ThreadContext));
|
|
||||||
|
|
||||||
context.cpu_registers[0] = arg;
|
|
||||||
context.pc = entry_point;
|
|
||||||
context.sp = stack_top;
|
|
||||||
context.cpsr = USER32MODE | ((entry_point & 1) << 5); // Usermode and THUMB mode
|
|
||||||
}
|
|
||||||
|
|
||||||
void ARM_DynCom::SaveContext(Core::ThreadContext& ctx) {
|
void ARM_DynCom::SaveContext(Core::ThreadContext& ctx) {
|
||||||
memcpy(ctx.cpu_registers, state->Reg.data(), sizeof(ctx.cpu_registers));
|
memcpy(ctx.cpu_registers, state->Reg.data(), sizeof(ctx.cpu_registers));
|
||||||
memcpy(ctx.fpu_registers, state->ExtReg.data(), sizeof(ctx.fpu_registers));
|
memcpy(ctx.fpu_registers, state->ExtReg.data(), sizeof(ctx.fpu_registers));
|
||||||
|
|
|
@ -38,7 +38,6 @@ 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 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;
|
||||||
|
|
||||||
|
|
|
@ -441,6 +441,22 @@ std::tuple<u32, u32, bool> GetFreeThreadLocalSlot(std::vector<std::bitset<8>>& t
|
||||||
return std::make_tuple(0, 0, true);
|
return std::make_tuple(0, 0, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Resets a thread context, making it ready to be scheduled and run by the CPU
|
||||||
|
* @param context Thread context to reset
|
||||||
|
* @param stack_top Address of the top of the stack
|
||||||
|
* @param entry_point Address of entry point for execution
|
||||||
|
* @param arg User argument for thread
|
||||||
|
*/
|
||||||
|
static void ResetThreadContext(Core::ThreadContext& context, u32 stack_top, u32 entry_point, u32 arg) {
|
||||||
|
memset(&context, 0, sizeof(Core::ThreadContext));
|
||||||
|
|
||||||
|
context.cpu_registers[0] = arg;
|
||||||
|
context.pc = entry_point;
|
||||||
|
context.sp = stack_top;
|
||||||
|
context.cpsr = USER32MODE | ((entry_point & 1) << 5); // Usermode and THUMB mode
|
||||||
|
}
|
||||||
|
|
||||||
ResultVal<SharedPtr<Thread>> Thread::Create(std::string name, VAddr entry_point, s32 priority,
|
ResultVal<SharedPtr<Thread>> Thread::Create(std::string name, VAddr entry_point, s32 priority,
|
||||||
u32 arg, s32 processor_id, VAddr stack_top) {
|
u32 arg, s32 processor_id, VAddr stack_top) {
|
||||||
if (priority < THREADPRIO_HIGHEST || priority > THREADPRIO_LOWEST) {
|
if (priority < THREADPRIO_HIGHEST || priority > THREADPRIO_LOWEST) {
|
||||||
|
@ -525,7 +541,7 @@ ResultVal<SharedPtr<Thread>> Thread::Create(std::string name, VAddr entry_point,
|
||||||
|
|
||||||
// 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);
|
ResetThreadContext(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;
|
||||||
|
|
Reference in New Issue