diff options
| author | 2018-01-19 18:01:41 -0500 | |
|---|---|---|
| committer | 2018-01-19 18:01:41 -0500 | |
| commit | dd62f125c359b37d71be6ccf873177c1a108d015 (patch) | |
| tree | 0d543402a25f4ba701dc547808b289daa0fc325b /src/core/arm | |
| parent | Merge pull request #112 from Rozelette/master (diff) | |
| download | yuzu-dd62f125c359b37d71be6ccf873177c1a108d015.tar.gz yuzu-dd62f125c359b37d71be6ccf873177c1a108d015.tar.xz yuzu-dd62f125c359b37d71be6ccf873177c1a108d015.zip | |
Fixes some cast warnings, partial port of citra #3064 (#106)
* Fixes some cast warnings, partially fixes citra #3064
* Converted casts to uint32_t to u32
* Ran clang-format
Diffstat (limited to 'src/core/arm')
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.cpp | 6 |
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: | |||
| 46 | ARM_Interface::ThreadContext ctx; | 46 | ARM_Interface::ThreadContext ctx; |
| 47 | parent.SaveContext(ctx); | 47 | parent.SaveContext(ctx); |
| 48 | parent.inner_unicorn.LoadContext(ctx); | 48 | parent.inner_unicorn.LoadContext(ctx); |
| 49 | parent.inner_unicorn.ExecuteInstructions(num_instructions); | 49 | parent.inner_unicorn.ExecuteInstructions(static_cast<int>(num_instructions)); |
| 50 | parent.inner_unicorn.SaveContext(ctx); | 50 | parent.inner_unicorn.SaveContext(ctx); |
| 51 | parent.LoadContext(ctx); | 51 | parent.LoadContext(ctx); |
| 52 | num_interpreted_instructions += num_instructions; | 52 | num_interpreted_instructions += num_instructions; |
| @@ -163,9 +163,9 @@ void ARM_Dynarmic::LoadContext(const ARM_Interface::ThreadContext& ctx) { | |||
| 163 | jit.SetRegisters(ctx.cpu_registers); | 163 | jit.SetRegisters(ctx.cpu_registers); |
| 164 | jit.SetSP(ctx.sp); | 164 | jit.SetSP(ctx.sp); |
| 165 | jit.SetPC(ctx.pc); | 165 | jit.SetPC(ctx.pc); |
| 166 | jit.SetPstate(ctx.cpsr); | 166 | jit.SetPstate(static_cast<u32>(ctx.cpsr)); |
| 167 | jit.SetVectors(ctx.fpu_registers); | 167 | jit.SetVectors(ctx.fpu_registers); |
| 168 | jit.SetFpcr(ctx.fpscr); | 168 | jit.SetFpcr(static_cast<u32>(ctx.fpscr)); |
| 169 | cb->tpidrr0_el0 = ctx.tls_address; | 169 | cb->tpidrr0_el0 = ctx.tls_address; |
| 170 | } | 170 | } |
| 171 | 171 | ||