diff options
Diffstat (limited to 'src/core/memory.h')
| -rw-r--r-- | src/core/memory.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/core/memory.h b/src/core/memory.h index f06e04a75..2a27c0251 100644 --- a/src/core/memory.h +++ b/src/core/memory.h | |||
| @@ -22,11 +22,11 @@ namespace Memory { | |||
| 22 | * Page size used by the ARM architecture. This is the smallest granularity with which memory can | 22 | * Page size used by the ARM architecture. This is the smallest granularity with which memory can |
| 23 | * be mapped. | 23 | * be mapped. |
| 24 | */ | 24 | */ |
| 25 | constexpr size_t PAGE_BITS = 12; | 25 | constexpr std::size_t PAGE_BITS = 12; |
| 26 | constexpr u64 PAGE_SIZE = 1 << PAGE_BITS; | 26 | constexpr u64 PAGE_SIZE = 1 << PAGE_BITS; |
| 27 | constexpr u64 PAGE_MASK = PAGE_SIZE - 1; | 27 | constexpr u64 PAGE_MASK = PAGE_SIZE - 1; |
| 28 | constexpr size_t ADDRESS_SPACE_BITS = 36; | 28 | constexpr std::size_t ADDRESS_SPACE_BITS = 36; |
| 29 | constexpr size_t PAGE_TABLE_NUM_ENTRIES = 1ULL << (ADDRESS_SPACE_BITS - PAGE_BITS); | 29 | constexpr std::size_t PAGE_TABLE_NUM_ENTRIES = 1ULL << (ADDRESS_SPACE_BITS - PAGE_BITS); |
| 30 | 30 | ||
| 31 | enum class PageType : u8 { | 31 | enum class PageType : u8 { |
| 32 | /// Page is unmapped and should cause an access error. | 32 | /// Page is unmapped and should cause an access error. |
| @@ -154,13 +154,13 @@ void Write16(VAddr addr, u16 data); | |||
| 154 | void Write32(VAddr addr, u32 data); | 154 | void Write32(VAddr addr, u32 data); |
| 155 | void Write64(VAddr addr, u64 data); | 155 | void Write64(VAddr addr, u64 data); |
| 156 | 156 | ||
| 157 | void ReadBlock(const Kernel::Process& process, VAddr src_addr, void* dest_buffer, size_t size); | 157 | void ReadBlock(const Kernel::Process& process, VAddr src_addr, void* dest_buffer, std::size_t size); |
| 158 | void ReadBlock(VAddr src_addr, void* dest_buffer, size_t size); | 158 | void ReadBlock(VAddr src_addr, void* dest_buffer, std::size_t size); |
| 159 | void WriteBlock(const Kernel::Process& process, VAddr dest_addr, const void* src_buffer, | 159 | void WriteBlock(const Kernel::Process& process, VAddr dest_addr, const void* src_buffer, |
| 160 | size_t size); | 160 | std::size_t size); |
| 161 | void WriteBlock(VAddr dest_addr, const void* src_buffer, size_t size); | 161 | void WriteBlock(VAddr dest_addr, const void* src_buffer, std::size_t size); |
| 162 | void ZeroBlock(const Kernel::Process& process, VAddr dest_addr, size_t size); | 162 | void ZeroBlock(const Kernel::Process& process, VAddr dest_addr, std::size_t size); |
| 163 | void CopyBlock(VAddr dest_addr, VAddr src_addr, size_t size); | 163 | void CopyBlock(VAddr dest_addr, VAddr src_addr, std::size_t size); |
| 164 | 164 | ||
| 165 | u8* GetPointer(VAddr vaddr); | 165 | u8* GetPointer(VAddr vaddr); |
| 166 | 166 | ||