diff options
| author |  bunnei | 2020-06-18 16:07:15 -0400 |
|---|---|---|
| committer |  GitHub | 2020-06-18 16:07:15 -0400 |
| commit | bfa6193eb9857d4e7e244382a3ffbaccca7b1031 (patch) | |
| tree | ff746fe478bb6a4368cb2573dc2aef42a23798b4 | |
| parent | Merge pull request #4092 from Morph1984/image-bindings (diff) | |
| parent | arm_dynarmic_32: Fix implicit conversion error in SetTPIDR_EL0 (diff) | |
| download | yuzu-bfa6193eb9857d4e7e244382a3ffbaccca7b1031.tar.gz yuzu-bfa6193eb9857d4e7e244382a3ffbaccca7b1031.tar.xz yuzu-bfa6193eb9857d4e7e244382a3ffbaccca7b1031.zip | |
Merge pull request #4108 from ReinUsesLisp/a32-implicit-cast
arm_dynarmic_32: Fix implicit conversion error in SetTPIDR_EL0
Diffstat (limited to '')
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic_32.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp index e7456a8c3..19d798dc7 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp | |||
| @@ -165,7 +165,7 @@ u64 ARM_Dynarmic_32::GetTPIDR_EL0() const { | |||
| 165 | } | 165 | } |
| 166 | 166 | ||
| 167 | void ARM_Dynarmic_32::SetTPIDR_EL0(u64 value) { | 167 | void ARM_Dynarmic_32::SetTPIDR_EL0(u64 value) { |
| 168 | cp15->uprw = value; | 168 | cp15->uprw = static_cast<u32>(value); |
| 169 | } | 169 | } |
| 170 | 170 | ||
| 171 | void ARM_Dynarmic_32::SaveContext(ThreadContext32& ctx) { | 171 | void ARM_Dynarmic_32::SaveContext(ThreadContext32& ctx) { |