summaryrefslogtreecommitdiffstats
path: root/src/core/arm/dynarmic
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2021-05-03 04:14:15 +0200
committerLioncash <mathew1800@gmail.com>2021-05-03 07:19:13 +0200
commitebb64d5bf4c6a1b3e89e7addbd72ca310be7807b (patch)
tree024cebd87e461cc8212810576b0e759321911f1f /src/core/arm/dynarmic
parentMerge pull request #6269 from lioncash/file-shadow (diff)
downloadyuzu-ebb64d5bf4c6a1b3e89e7addbd72ca310be7807b.tar
yuzu-ebb64d5bf4c6a1b3e89e7addbd72ca310be7807b.tar.gz
yuzu-ebb64d5bf4c6a1b3e89e7addbd72ca310be7807b.tar.bz2
yuzu-ebb64d5bf4c6a1b3e89e7addbd72ca310be7807b.tar.lz
yuzu-ebb64d5bf4c6a1b3e89e7addbd72ca310be7807b.tar.xz
yuzu-ebb64d5bf4c6a1b3e89e7addbd72ca310be7807b.tar.zst
yuzu-ebb64d5bf4c6a1b3e89e7addbd72ca310be7807b.zip
Diffstat (limited to 'src/core/arm/dynarmic')
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic_cp15.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic_cp15.cpp b/src/core/arm/dynarmic/arm_dynarmic_cp15.cpp
index caefc09f4..ebd506121 100644
--- a/src/core/arm/dynarmic/arm_dynarmic_cp15.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic_cp15.cpp
@@ -94,12 +94,11 @@ CallbackOrAccessOneWord DynarmicCP15::CompileGetOneWord(bool two, unsigned opc1,
CallbackOrAccessTwoWords DynarmicCP15::CompileGetTwoWords(bool two, unsigned opc, CoprocReg CRm) {
if (!two && opc == 0 && CRm == CoprocReg::C14) {
// CNTPCT
- const auto callback = static_cast<u64 (*)(Dynarmic::A32::Jit*, void*, u32, u32)>(
- [](Dynarmic::A32::Jit*, void* arg, u32, u32) -> u64 {
- ARM_Dynarmic_32& parent = *(ARM_Dynarmic_32*)arg;
- return parent.system.CoreTiming().GetClockTicks();
- });
- return Dynarmic::A32::Coprocessor::Callback{callback, (void*)&parent};
+ const auto callback = [](Dynarmic::A32::Jit*, void* arg, u32, u32) -> u64 {
+ const auto& parent_arg = *static_cast<ARM_Dynarmic_32*>(arg);
+ return parent_arg.system.CoreTiming().GetClockTicks();
+ };
+ return Callback{callback, &parent};
}
LOG_CRITICAL(Core_ARM, "CP15: mrrc{} p15, {}, <Rt>, <Rt2>, {}", two ? "2" : "", opc, CRm);