diff options
author | Lioncash <mathew1800@gmail.com> | 2015-07-26 17:39:57 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2015-07-26 19:21:04 +0200 |
commit | 816b1ca776fe9d8ac0e618f82afd8e4b5549d582 (patch) | |
tree | d9346472d6de028c831248b850b4006b81d2dd64 /src/core/arm/dyncom | |
parent | dyncom: Use ARMul_State as an object (diff) | |
download | yuzu-816b1ca776fe9d8ac0e618f82afd8e4b5549d582.tar yuzu-816b1ca776fe9d8ac0e618f82afd8e4b5549d582.tar.gz yuzu-816b1ca776fe9d8ac0e618f82afd8e4b5549d582.tar.bz2 yuzu-816b1ca776fe9d8ac0e618f82afd8e4b5549d582.tar.lz yuzu-816b1ca776fe9d8ac0e618f82afd8e4b5549d582.tar.xz yuzu-816b1ca776fe9d8ac0e618f82afd8e4b5549d582.tar.zst yuzu-816b1ca776fe9d8ac0e618f82afd8e4b5549d582.zip |
Diffstat (limited to 'src/core/arm/dyncom')
-rw-r--r-- | src/core/arm/dyncom/arm_dyncom.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom.cpp b/src/core/arm/dyncom/arm_dyncom.cpp index 9228a49ab..c665f706f 100644 --- a/src/core/arm/dyncom/arm_dyncom.cpp +++ b/src/core/arm/dyncom/arm_dyncom.cpp @@ -82,8 +82,8 @@ void ARM_DynCom::ResetContext(Core::ThreadContext& context, u32 stack_top, u32 e } void ARM_DynCom::SaveContext(Core::ThreadContext& ctx) { - memcpy(ctx.cpu_registers, state->Reg, sizeof(ctx.cpu_registers)); - memcpy(ctx.fpu_registers, state->ExtReg, sizeof(ctx.fpu_registers)); + memcpy(ctx.cpu_registers, state->Reg.data(), sizeof(ctx.cpu_registers)); + memcpy(ctx.fpu_registers, state->ExtReg.data(), sizeof(ctx.fpu_registers)); ctx.sp = state->Reg[13]; ctx.lr = state->Reg[14]; @@ -95,8 +95,8 @@ void ARM_DynCom::SaveContext(Core::ThreadContext& ctx) { } void ARM_DynCom::LoadContext(const Core::ThreadContext& ctx) { - memcpy(state->Reg, ctx.cpu_registers, sizeof(ctx.cpu_registers)); - memcpy(state->ExtReg, ctx.fpu_registers, sizeof(ctx.fpu_registers)); + memcpy(state->Reg.data(), ctx.cpu_registers, sizeof(ctx.cpu_registers)); + memcpy(state->ExtReg.data(), ctx.fpu_registers, sizeof(ctx.fpu_registers)); state->Reg[13] = ctx.sp; state->Reg[14] = ctx.lr; |