summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-07-31 05:46:07 +0200
committerLioncash <mathew1800@gmail.com>2018-07-31 13:54:58 +0200
commit444a01afa6ed52df21a22b28e9efe949ce1a428c (patch)
tree45811412810d414fd42ada416f7043dc465e8729 /src
parentMerge pull request #855 from bunnei/cubeb (diff)
downloadyuzu-444a01afa6ed52df21a22b28e9efe949ce1a428c.tar
yuzu-444a01afa6ed52df21a22b28e9efe949ce1a428c.tar.gz
yuzu-444a01afa6ed52df21a22b28e9efe949ce1a428c.tar.bz2
yuzu-444a01afa6ed52df21a22b28e9efe949ce1a428c.tar.lz
yuzu-444a01afa6ed52df21a22b28e9efe949ce1a428c.tar.xz
yuzu-444a01afa6ed52df21a22b28e9efe949ce1a428c.tar.zst
yuzu-444a01afa6ed52df21a22b28e9efe949ce1a428c.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/arm/dynarmic/arm_dynarmic.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic.cpp b/src/core/arm/dynarmic/arm_dynarmic.cpp
index 57b8634b9..343866251 100644
--- a/src/core/arm/dynarmic/arm_dynarmic.cpp
+++ b/src/core/arm/dynarmic/arm_dynarmic.cpp
@@ -139,14 +139,12 @@ void ARM_Dynarmic::Step() {
}
ARM_Dynarmic::ARM_Dynarmic(std::shared_ptr<ExclusiveMonitor> exclusive_monitor, size_t core_index)
- : cb(std::make_unique<ARM_Dynarmic_Callbacks>(*this)),
- jit(MakeJit()), exclusive_monitor{std::dynamic_pointer_cast<DynarmicExclusiveMonitor>(
- exclusive_monitor)},
- core_index{core_index} {
+ : cb(std::make_unique<ARM_Dynarmic_Callbacks>(*this)), core_index{core_index},
+ exclusive_monitor{std::dynamic_pointer_cast<DynarmicExclusiveMonitor>(exclusive_monitor)} {
ARM_Interface::ThreadContext ctx;
inner_unicorn.SaveContext(ctx);
- LoadContext(ctx);
PageTableChanged();
+ LoadContext(ctx);
}
ARM_Dynarmic::~ARM_Dynarmic() = default;