diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/memory.h | 2 | ||||
| -rw-r--r-- | src/core/memory_setup.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/core/memory.h b/src/core/memory.h index 418609de0..2a06cc6c3 100644 --- a/src/core/memory.h +++ b/src/core/memory.h | |||
| @@ -15,6 +15,8 @@ namespace Memory { | |||
| 15 | * be mapped. | 15 | * be mapped. |
| 16 | */ | 16 | */ |
| 17 | const u32 PAGE_SIZE = 0x1000; | 17 | const u32 PAGE_SIZE = 0x1000; |
| 18 | const u32 PAGE_MASK = PAGE_SIZE - 1; | ||
| 19 | const int PAGE_BITS = 12; | ||
| 18 | 20 | ||
| 19 | /// Physical memory regions as seen from the ARM11 | 21 | /// Physical memory regions as seen from the ARM11 |
| 20 | enum : PAddr { | 22 | enum : PAddr { |
diff --git a/src/core/memory_setup.h b/src/core/memory_setup.h index 361bfc816..84ff30120 100644 --- a/src/core/memory_setup.h +++ b/src/core/memory_setup.h | |||
| @@ -10,9 +10,6 @@ | |||
| 10 | 10 | ||
| 11 | namespace Memory { | 11 | namespace Memory { |
| 12 | 12 | ||
| 13 | const u32 PAGE_MASK = PAGE_SIZE - 1; | ||
| 14 | const int PAGE_BITS = 12; | ||
| 15 | |||
| 16 | void InitMemoryMap(); | 13 | void InitMemoryMap(); |
| 17 | 14 | ||
| 18 | /** | 15 | /** |