summaryrefslogtreecommitdiffstats
path: root/src/core/arm/dynarmic
diff options
context:
space:
mode:
authorRiver City Ransomware <richyateswebdesign@gmail.com>2018-01-20 00:01:41 +0100
committerbunnei <bunneidev@gmail.com>2018-01-20 00:01:41 +0100
commitdd62f125c359b37d71be6ccf873177c1a108d015 (patch)
tree0d543402a25f4ba701dc547808b289daa0fc325b /src/core/arm/dynarmic
parentMerge pull request #112 from Rozelette/master (diff)
downloadyuzu-dd62f125c359b37d71be6ccf873177c1a108d015.tar
yuzu-dd62f125c359b37d71be6ccf873177c1a108d015.tar.gz
yuzu-dd62f125c359b37d71be6ccf873177c1a108d015.tar.bz2
yuzu-dd62f125c359b37d71be6ccf873177c1a108d015.tar.lz
yuzu-dd62f125c359b37d71be6ccf873177c1a108d015.tar.xz
yuzu-dd62f125c359b37d71be6ccf873177c1a108d015.tar.zst
yuzu-dd62f125c359b37d71be6ccf873177c1a108d015.zip
Diffstat (limited to 'src/core/arm/dynarmic')
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp
index 2ad48dcc7..72c54f984 100644
--- a/src/core/arm/dynarmic/arm_dynarmic.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic.cpp
@@ -46,7 +46,7 @@ public:
ARM_Interface::ThreadContext ctx;
parent.SaveContext(ctx);
parent.inner_unicorn.LoadContext(ctx);
- parent.inner_unicorn.ExecuteInstructions(num_instructions);
+ parent.inner_unicorn.ExecuteInstructions(static_cast<int>(num_instructions));
parent.inner_unicorn.SaveContext(ctx);
parent.LoadContext(ctx);
num_interpreted_instructions += num_instructions;
@@ -163,9 +163,9 @@ void ARM_Dynarmic::LoadContext(const ARM_Interface::ThreadContext& ctx) {
jit.SetRegisters(ctx.cpu_registers);
jit.SetSP(ctx.sp);
jit.SetPC(ctx.pc);
- jit.SetPstate(ctx.cpsr);
+ jit.SetPstate(static_cast<u32>(ctx.cpsr));
jit.SetVectors(ctx.fpu_registers);
- jit.SetFpcr(ctx.fpscr);
+ jit.SetFpcr(static_cast<u32>(ctx.fpscr));
cb->tpidrr0_el0 = ctx.tls_address;
}