diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2022-08-21 12:59:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-21 12:59:01 -0400 |
| commit | 064f836d1c4f6de7d7c100b4aff700bf66448e22 (patch) | |
| tree | 7f087cacbde745c7d64f205618b80624c8599074 /src/core/memory.h | |
| parent | e37e3d3634cefb18a90b094cfd000535d08d1944 (diff) | |
| parent | 14e9de6678dab47625826006f001d5e94dfb2716 (diff) | |
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 { * Page size used by the ARM architecture. This is the smallest granularity with which memory can * be mapped. */ -constexpr std::size_t PAGE_BITS = 12; -constexpr u64 PAGE_SIZE = 1ULL << PAGE_BITS; -constexpr u64 PAGE_MASK = PAGE_SIZE - 1; +constexpr std::size_t YUZU_PAGEBITS = 12; +constexpr u64 YUZU_PAGESIZE = 1ULL << YUZU_PAGEBITS; +constexpr u64 YUZU_PAGEMASK = YUZU_PAGESIZE - 1; /// Virtual user-space memory regions enum : VAddr { |