summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/kernel.h
diff options
context:
space:
mode:
authorGravatar bunnei2021-02-12 16:21:12 -0800
committerGravatar bunnei2021-02-18 16:16:25 -0800
commit9e520e8f1233cb4e586b076cd5cc8b7c22ec85ce (patch)
tree8a66a3efb40ec4f36374c97e02527010d4034902 /src/core/hle/kernel/kernel.h
parenthle: kernel: Migrate MemoryLayout to KMemoryLayout. (diff)
downloadyuzu-9e520e8f1233cb4e586b076cd5cc8b7c22ec85ce.tar.gz
yuzu-9e520e8f1233cb4e586b076cd5cc8b7c22ec85ce.tar.xz
yuzu-9e520e8f1233cb4e586b076cd5cc8b7c22ec85ce.zip
hle: kernel: Migrate SlabHeap to KSlabHeap.
Diffstat (limited to 'src/core/hle/kernel/kernel.h')
-rw-r--r--src/core/hle/kernel/kernel.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h
index c5b32b260..5488c962a 100644
--- a/src/core/hle/kernel/kernel.h
+++ b/src/core/hle/kernel/kernel.h
@@ -29,8 +29,7 @@ namespace Kernel {
29 29
30namespace Memory { 30namespace Memory {
31class MemoryManager; 31class MemoryManager;
32template <typename T> 32
33class SlabHeap;
34} // namespace Memory 33} // namespace Memory
35 34
36class ClientPort; 35class ClientPort;
@@ -46,6 +45,9 @@ class Synchronization;
46class KThread; 45class KThread;
47class TimeManager; 46class TimeManager;
48 47
48template <typename T>
49class KSlabHeap;
50
49using EmuThreadHandle = uintptr_t; 51using EmuThreadHandle = uintptr_t;
50constexpr EmuThreadHandle EmuThreadHandleInvalid{}; 52constexpr EmuThreadHandle EmuThreadHandleInvalid{};
51constexpr EmuThreadHandle EmuThreadHandleReserved{1ULL << 63}; 53constexpr EmuThreadHandle EmuThreadHandleReserved{1ULL << 63};
@@ -184,10 +186,10 @@ public:
184 const Memory::MemoryManager& MemoryManager() const; 186 const Memory::MemoryManager& MemoryManager() const;
185 187
186 /// Gets the slab heap allocated for user space pages. 188 /// Gets the slab heap allocated for user space pages.
187 Memory::SlabHeap<Memory::Page>& GetUserSlabHeapPages(); 189 KSlabHeap<Memory::Page>& GetUserSlabHeapPages();
188 190
189 /// Gets the slab heap allocated for user space pages. 191 /// Gets the slab heap allocated for user space pages.
190 const Memory::SlabHeap<Memory::Page>& GetUserSlabHeapPages() const; 192 const KSlabHeap<Memory::Page>& GetUserSlabHeapPages() const;
191 193
192 /// Gets the shared memory object for HID services. 194 /// Gets the shared memory object for HID services.
193 Kernel::KSharedMemory& GetHidSharedMem(); 195 Kernel::KSharedMemory& GetHidSharedMem();