diff options
| author | bunnei <bunneidev@gmail.com> | 2022-02-26 19:15:04 +0100 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2022-02-27 19:34:02 +0100 |
| commit | f7e65eb971d9d84693ded98eeb930dc407330a5b (patch) | |
| tree | 15510f97a919d80a2906264c271006b0dcdc0bc3 | |
| parent | hle: kernel: k_page_heap: Various updates and improvements. (diff) | |
| download | yuzu-f7e65eb971d9d84693ded98eeb930dc407330a5b.tar yuzu-f7e65eb971d9d84693ded98eeb930dc407330a5b.tar.gz yuzu-f7e65eb971d9d84693ded98eeb930dc407330a5b.tar.bz2 yuzu-f7e65eb971d9d84693ded98eeb930dc407330a5b.tar.lz yuzu-f7e65eb971d9d84693ded98eeb930dc407330a5b.tar.xz yuzu-f7e65eb971d9d84693ded98eeb930dc407330a5b.tar.zst yuzu-f7e65eb971d9d84693ded98eeb930dc407330a5b.zip | |
| -rw-r--r-- | src/core/hle/kernel/k_page_table.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/kernel/k_page_table.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/kernel/k_page_table.cpp b/src/core/hle/kernel/k_page_table.cpp index 88aa2a152..a23226d70 100644 --- a/src/core/hle/kernel/k_page_table.cpp +++ b/src/core/hle/kernel/k_page_table.cpp @@ -1547,7 +1547,7 @@ ResultCode KPageTable::Operate(VAddr addr, std::size_t num_pages, KMemoryPermiss return ResultSuccess; } -constexpr VAddr KPageTable::GetRegionAddress(KMemoryState state) const { +VAddr KPageTable::GetRegionAddress(KMemoryState state) const { switch (state) { case KMemoryState::Free: case KMemoryState::Kernel: @@ -1583,7 +1583,7 @@ constexpr VAddr KPageTable::GetRegionAddress(KMemoryState state) const { } } -constexpr std::size_t KPageTable::GetRegionSize(KMemoryState state) const { +std::size_t KPageTable::GetRegionSize(KMemoryState state) const { switch (state) { case KMemoryState::Free: case KMemoryState::Kernel: diff --git a/src/core/hle/kernel/k_page_table.h b/src/core/hle/kernel/k_page_table.h index c98887d34..211b9444c 100644 --- a/src/core/hle/kernel/k_page_table.h +++ b/src/core/hle/kernel/k_page_table.h @@ -102,8 +102,8 @@ private: OperationType operation); ResultCode Operate(VAddr addr, std::size_t num_pages, KMemoryPermission perm, OperationType operation, PAddr map_addr = 0); - constexpr VAddr GetRegionAddress(KMemoryState state) const; - constexpr std::size_t GetRegionSize(KMemoryState state) const; + VAddr GetRegionAddress(KMemoryState state) const; + std::size_t GetRegionSize(KMemoryState state) const; ResultCode CheckMemoryStateContiguous(std::size_t* out_blocks_needed, VAddr addr, std::size_t size, KMemoryState state_mask, |