octo
/
yuzu-mainline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hle: kernel: k_memory_region: Minor code cleanup.

This commit is contained in:
bunnei 2021-03-23 18:37:39 -07:00
parent 9032d21365
commit 4eac8703d2
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/core/hle/kernel/k_memory_region.h
View File

@ -160,7 +160,7 @@ private:
KMemoryRegionAllocator& memory_region_allocator; KMemoryRegionAllocator& memory_region_allocator;
public: public:
KMemoryRegionTree(KMemoryRegionAllocator& memory_region_allocator_); explicit KMemoryRegionTree(KMemoryRegionAllocator& memory_region_allocator_);
public: public:
KMemoryRegion* FindModifiable(u64 address) { KMemoryRegion* FindModifiable(u64 address) {
@ -328,14 +328,8 @@ class KMemoryRegionAllocator final : NonCopyable {
public: public:
static constexpr size_t MaxMemoryRegions = 200; static constexpr size_t MaxMemoryRegions = 200;
private:
std::array<KMemoryRegion, MaxMemoryRegions> region_heap{};
size_t num_regions{};
public:
constexpr KMemoryRegionAllocator() = default; constexpr KMemoryRegionAllocator() = default;
public:
template <typename... Args> template <typename... Args>
KMemoryRegion* Allocate(Args&&... args) { KMemoryRegion* Allocate(Args&&... args) {
// Ensure we stay within the bounds of our heap. // Ensure we stay within the bounds of our heap.
@ -347,6 +341,10 @@ public:
return region; return region;
} }
private:
std::array<KMemoryRegion, MaxMemoryRegions> region_heap{};
size_t num_regions{};
}; };
} // namespace Kernel } // namespace Kernel