diff options
| author |  liamwhite | 2022-08-21 12:59:01 -0400 |
|---|---|---|
| committer |  GitHub | 2022-08-21 12:59:01 -0400 |
| commit | 064f836d1c4f6de7d7c100b4aff700bf66448e22 (patch) | |
| tree | 7f087cacbde745c7d64f205618b80624c8599074 /src/core/arm | |
| parent | Merge pull request #8790 from liamwhite/too-many-ways-to-name-a-byte-string (diff) | |
| parent | code: dodge PAGE_SIZE #define (diff) | |
| download | yuzu-064f836d1c4f6de7d7c100b4aff700bf66448e22.tar.gz yuzu-064f836d1c4f6de7d7c100b4aff700bf66448e22.tar.xz yuzu-064f836d1c4f6de7d7c100b4aff700bf66448e22.zip | |
Merge pull request #8784 from Docteh/nosnek
code: dodge PAGE_SIZE #define
Diffstat (limited to 'src/core/arm')
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic_32.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp index 3b8b43994..d1e70f19d 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp | |||
| @@ -190,8 +190,8 @@ std::shared_ptr<Dynarmic::A32::Jit> ARM_Dynarmic_32::MakeJit(Common::PageTable* | |||
| 190 | config.callbacks = cb.get(); | 190 | config.callbacks = cb.get(); |
| 191 | config.coprocessors[15] = cp15; | 191 | config.coprocessors[15] = cp15; |
| 192 | config.define_unpredictable_behaviour = true; | 192 | config.define_unpredictable_behaviour = true; |
| 193 | static constexpr std::size_t PAGE_BITS = 12; | 193 | static constexpr std::size_t YUZU_PAGEBITS = 12; |
| 194 | static constexpr std::size_t NUM_PAGE_TABLE_ENTRIES = 1 << (32 - PAGE_BITS); | 194 | static constexpr std::size_t NUM_PAGE_TABLE_ENTRIES = 1 << (32 - YUZU_PAGEBITS); |
| 195 | if (page_table) { | 195 | if (page_table) { |
| 196 | config.page_table = reinterpret_cast<std::array<std::uint8_t*, NUM_PAGE_TABLE_ENTRIES>*>( | 196 | config.page_table = reinterpret_cast<std::array<std::uint8_t*, NUM_PAGE_TABLE_ENTRIES>*>( |
| 197 | page_table->pointers.data()); | 197 | page_table->pointers.data()); |