summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bunnei2022-02-26 10:15:04 -0800
committerGravatar bunnei2022-02-27 10:34:02 -0800
commitf7e65eb971d9d84693ded98eeb930dc407330a5b (patch)
tree15510f97a919d80a2906264c271006b0dcdc0bc3
parenthle: kernel: k_page_heap: Various updates and improvements. (diff)
downloadyuzu-f7e65eb971d9d84693ded98eeb930dc407330a5b.tar.gz
yuzu-f7e65eb971d9d84693ded98eeb930dc407330a5b.tar.xz
yuzu-f7e65eb971d9d84693ded98eeb930dc407330a5b.zip
hle: kernel: k_page_heap: Remove superfluous consexpr.
Diffstat (limited to '')
-rw-r--r--src/core/hle/kernel/k_page_table.cpp4
-rw-r--r--src/core/hle/kernel/k_page_table.h4
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
1547 return ResultSuccess; 1547 return ResultSuccess;
1548} 1548}
1549 1549
1550constexpr VAddr KPageTable::GetRegionAddress(KMemoryState state) const { 1550VAddr KPageTable::GetRegionAddress(KMemoryState state) const {
1551 switch (state) { 1551 switch (state) {
1552 case KMemoryState::Free: 1552 case KMemoryState::Free:
1553 case KMemoryState::Kernel: 1553 case KMemoryState::Kernel:
@@ -1583,7 +1583,7 @@ constexpr VAddr KPageTable::GetRegionAddress(KMemoryState state) const {
1583 } 1583 }
1584} 1584}
1585 1585
1586constexpr std::size_t KPageTable::GetRegionSize(KMemoryState state) const { 1586std::size_t KPageTable::GetRegionSize(KMemoryState state) const {
1587 switch (state) { 1587 switch (state) {
1588 case KMemoryState::Free: 1588 case KMemoryState::Free:
1589 case KMemoryState::Kernel: 1589 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:
102 OperationType operation); 102 OperationType operation);
103 ResultCode Operate(VAddr addr, std::size_t num_pages, KMemoryPermission perm, 103 ResultCode Operate(VAddr addr, std::size_t num_pages, KMemoryPermission perm,
104 OperationType operation, PAddr map_addr = 0); 104 OperationType operation, PAddr map_addr = 0);
105 constexpr VAddr GetRegionAddress(KMemoryState state) const; 105 VAddr GetRegionAddress(KMemoryState state) const;
106 constexpr std::size_t GetRegionSize(KMemoryState state) const; 106 std::size_t GetRegionSize(KMemoryState state) const;
107 107
108 ResultCode CheckMemoryStateContiguous(std::size_t* out_blocks_needed, VAddr addr, 108 ResultCode CheckMemoryStateContiguous(std::size_t* out_blocks_needed, VAddr addr,
109 std::size_t size, KMemoryState state_mask, 109 std::size_t size, KMemoryState state_mask,