diff options
author | bunnei <bunneidev@gmail.com> | 2016-09-02 14:53:42 +0200 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2016-09-15 23:49:30 +0200 |
commit | 05e120a4cc380db318a5ee194579053b850f14fe (patch) | |
tree | 86f0801b9b79adf9832a328bf0981433d199b0ff /src/core/arm | |
parent | arm_dynarmic/arm_dyncom: Remove unnecessary "virtual" keyword. (diff) | |
download | yuzu-05e120a4cc380db318a5ee194579053b850f14fe.tar yuzu-05e120a4cc380db318a5ee194579053b850f14fe.tar.gz yuzu-05e120a4cc380db318a5ee194579053b850f14fe.tar.bz2 yuzu-05e120a4cc380db318a5ee194579053b850f14fe.tar.lz yuzu-05e120a4cc380db318a5ee194579053b850f14fe.tar.xz yuzu-05e120a4cc380db318a5ee194579053b850f14fe.tar.zst yuzu-05e120a4cc380db318a5ee194579053b850f14fe.zip |
Diffstat (limited to 'src/core/arm')
-rw-r--r-- | src/core/arm/arm_interface.h | 9 | ||||
-rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.cpp | 9 | ||||
-rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.h | 1 | ||||
-rw-r--r-- | src/core/arm/dyncom/arm_dyncom.cpp | 9 | ||||
-rw-r--r-- | src/core/arm/dyncom/arm_dyncom.h | 1 |
5 files changed, 0 insertions, 29 deletions
diff --git a/src/core/arm/arm_interface.h b/src/core/arm/arm_interface.h index de5e9c8fa..480c90e66 100644 --- a/src/core/arm/arm_interface.h +++ b/src/core/arm/arm_interface.h @@ -122,15 +122,6 @@ public: 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 * @param ctx Thread context to save */ diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp index 46b4d6103..a9cb973df 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic.cpp @@ -130,15 +130,6 @@ void ARM_Dynarmic::ExecuteInstructions(int 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) { memcpy(ctx.cpu_registers, jit->Regs().data(), sizeof(ctx.cpu_registers)); memcpy(ctx.fpu_registers, jit->ExtRegs().data(), sizeof(ctx.fpu_registers)); diff --git a/src/core/arm/dynarmic/arm_dynarmic.h b/src/core/arm/dynarmic/arm_dynarmic.h index 58323135d..d493cabd5 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.h +++ b/src/core/arm/dynarmic/arm_dynarmic.h @@ -36,7 +36,6 @@ public: 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 LoadContext(const Core::ThreadContext& ctx) override; diff --git a/src/core/arm/dyncom/arm_dyncom.cpp b/src/core/arm/dyncom/arm_dyncom.cpp index 976e81480..d84917529 100644 --- a/src/core/arm/dyncom/arm_dyncom.cpp +++ b/src/core/arm/dyncom/arm_dyncom.cpp @@ -93,15 +93,6 @@ void ARM_DynCom::ExecuteInstructions(int num_instructions) { 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) { memcpy(ctx.cpu_registers, state->Reg.data(), sizeof(ctx.cpu_registers)); memcpy(ctx.fpu_registers, state->ExtReg.data(), sizeof(ctx.fpu_registers)); diff --git a/src/core/arm/dyncom/arm_dyncom.h b/src/core/arm/dyncom/arm_dyncom.h index cc040b174..70f71a828 100644 --- a/src/core/arm/dyncom/arm_dyncom.h +++ b/src/core/arm/dyncom/arm_dyncom.h @@ -38,7 +38,6 @@ public: 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 LoadContext(const Core::ThreadContext& ctx) override; |