diff options
| author |  bunnei | 2018-07-24 04:48:06 -0700 |
|---|---|---|
| committer |  GitHub | 2018-07-24 04:48:06 -0700 |
| commit | 316c994f55c38a8eea6a3e4046238ff8da7ecd8c (patch) | |
| tree | c214cef9b4e3830ee5f78ebefe9cfa8ee4614cd5 /src | |
| parent | Merge pull request #797 from lioncash/explicit (diff) | |
| parent | arm_dynarmic: Make MakeJit() a const member function (diff) | |
| download | yuzu-316c994f55c38a8eea6a3e4046238ff8da7ecd8c.tar.gz yuzu-316c994f55c38a8eea6a3e4046238ff8da7ecd8c.tar.xz yuzu-316c994f55c38a8eea6a3e4046238ff8da7ecd8c.zip | |
Merge pull request #798 from lioncash/const
arm_dynarmic: Make MakeJit() a const member function
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.cpp | 4 | ||||
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic.h | 2 |
2 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 d23adb28a..57b8634b9 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic.cpp | |||
| @@ -102,8 +102,8 @@ public: | |||
| 102 | u64 tpidr_el0 = 0; | 102 | u64 tpidr_el0 = 0; |
| 103 | }; | 103 | }; |
| 104 | 104 | ||
| 105 | std::unique_ptr<Dynarmic::A64::Jit> ARM_Dynarmic::MakeJit() { | 105 | std::unique_ptr<Dynarmic::A64::Jit> ARM_Dynarmic::MakeJit() const { |
| 106 | const auto page_table = Core::CurrentProcess()->vm_manager.page_table.pointers.data(); | 106 | auto** const page_table = Core::CurrentProcess()->vm_manager.page_table.pointers.data(); |
| 107 | 107 | ||
| 108 | Dynarmic::A64::UserConfig config; | 108 | Dynarmic::A64::UserConfig config; |
| 109 | 109 | ||
diff --git a/src/core/arm/dynarmic/arm_dynarmic.h b/src/core/arm/dynarmic/arm_dynarmic.h index 350f61fd2..14c072601 100644 --- a/src/core/arm/dynarmic/arm_dynarmic.h +++ b/src/core/arm/dynarmic/arm_dynarmic.h | |||
| @@ -50,7 +50,7 @@ public: | |||
| 50 | void PageTableChanged() override; | 50 | void PageTableChanged() override; |
| 51 | 51 | ||
| 52 | private: | 52 | private: |
| 53 | std::unique_ptr<Dynarmic::A64::Jit> MakeJit(); | 53 | std::unique_ptr<Dynarmic::A64::Jit> MakeJit() const; |
| 54 | 54 | ||
| 55 | friend class ARM_Dynarmic_Callbacks; | 55 | friend class ARM_Dynarmic_Callbacks; |
| 56 | std::unique_ptr<ARM_Dynarmic_Callbacks> cb; | 56 | std::unique_ptr<ARM_Dynarmic_Callbacks> cb; |