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/memory.h | |
| 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/memory.h')
| -rw-r--r-- | src/core/memory.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/memory.h b/src/core/memory.h index 2a21fbcfd..a11ff8766 100644 --- a/src/core/memory.h +++ b/src/core/memory.h | |||
| @@ -27,9 +27,9 @@ namespace Core::Memory { | |||
| 27 | * Page size used by the ARM architecture. This is the smallest granularity with which memory can | 27 | * Page size used by the ARM architecture. This is the smallest granularity with which memory can |
| 28 | * be mapped. | 28 | * be mapped. |
| 29 | */ | 29 | */ |
| 30 | constexpr std::size_t PAGE_BITS = 12; | 30 | constexpr std::size_t YUZU_PAGEBITS = 12; |
| 31 | constexpr u64 PAGE_SIZE = 1ULL << PAGE_BITS; | 31 | constexpr u64 YUZU_PAGESIZE = 1ULL << YUZU_PAGEBITS; |
| 32 | constexpr u64 PAGE_MASK = PAGE_SIZE - 1; | 32 | constexpr u64 YUZU_PAGEMASK = YUZU_PAGESIZE - 1; |
| 33 | 33 | ||
| 34 | /// Virtual user-space memory regions | 34 | /// Virtual user-space memory regions |
| 35 | enum : VAddr { | 35 | enum : VAddr { |