diff options
| author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-12-30 01:16:57 +0100 |
|---|---|---|
| committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2020-12-30 01:54:49 +0100 |
| commit | b3587102d160fb74a12935a79f06ee8a12712f12 (patch) | |
| tree | 2afb7123bafef085cb97fc97f96be1aaf8c3a660 /src/core/arm | |
| parent | Merge pull request #5248 from ReinUsesLisp/update-dynarmic (diff) | |
| download | yuzu-b3587102d160fb74a12935a79f06ee8a12712f12.tar yuzu-b3587102d160fb74a12935a79f06ee8a12712f12.tar.gz yuzu-b3587102d160fb74a12935a79f06ee8a12712f12.tar.bz2 yuzu-b3587102d160fb74a12935a79f06ee8a12712f12.tar.lz yuzu-b3587102d160fb74a12935a79f06ee8a12712f12.tar.xz yuzu-b3587102d160fb74a12935a79f06ee8a12712f12.tar.zst yuzu-b3587102d160fb74a12935a79f06ee8a12712f12.zip | |
Diffstat (limited to 'src/core/arm')
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic_32.cpp | 1 | ||||
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic_64.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp index e9c74b1a6..8aaf11eee 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp @@ -133,6 +133,7 @@ std::shared_ptr<Dynarmic::A32::Jit> ARM_Dynarmic_32::MakeJit(Common::PageTable& config.page_table = reinterpret_cast<std::array<std::uint8_t*, NUM_PAGE_TABLE_ENTRIES>*>( page_table.pointers.data()); config.absolute_offset_page_table = true; + config.page_table_pointer_mask_bits = Common::PageTable::ATTRIBUTE_BITS; config.detect_misaligned_access_via_page_table = 16 | 32 | 64 | 128; config.only_detect_misalignment_via_page_table_on_page_boundary = true; diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.cpp b/src/core/arm/dynarmic/arm_dynarmic_64.cpp index 7a4eb88a2..d2e1dc724 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_64.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_64.cpp @@ -152,6 +152,7 @@ std::shared_ptr<Dynarmic::A64::Jit> ARM_Dynarmic_64::MakeJit(Common::PageTable& // Memory config.page_table = reinterpret_cast<void**>(page_table.pointers.data()); config.page_table_address_space_bits = address_space_bits; + config.page_table_pointer_mask_bits = Common::PageTable::ATTRIBUTE_BITS; config.silently_mirror_page_table = false; config.absolute_offset_page_table = true; config.detect_misaligned_access_via_page_table = 16 | 32 | 64 | 128; |