diff options
author | bunnei <bunneidev@gmail.com> | 2021-02-13 01:21:12 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2021-02-19 01:16:25 +0100 |
commit | 9e520e8f1233cb4e586b076cd5cc8b7c22ec85ce (patch) | |
tree | 8a66a3efb40ec4f36374c97e02527010d4034902 /src/core/hle/kernel/kernel.h | |
parent | hle: kernel: Migrate MemoryLayout to KMemoryLayout. (diff) | |
download | yuzu-9e520e8f1233cb4e586b076cd5cc8b7c22ec85ce.tar yuzu-9e520e8f1233cb4e586b076cd5cc8b7c22ec85ce.tar.gz yuzu-9e520e8f1233cb4e586b076cd5cc8b7c22ec85ce.tar.bz2 yuzu-9e520e8f1233cb4e586b076cd5cc8b7c22ec85ce.tar.lz yuzu-9e520e8f1233cb4e586b076cd5cc8b7c22ec85ce.tar.xz yuzu-9e520e8f1233cb4e586b076cd5cc8b7c22ec85ce.tar.zst yuzu-9e520e8f1233cb4e586b076cd5cc8b7c22ec85ce.zip |
Diffstat (limited to 'src/core/hle/kernel/kernel.h')
-rw-r--r-- | src/core/hle/kernel/kernel.h | 10 |
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 { namespace Memory { class MemoryManager; -template <typename T> -class SlabHeap; + } // namespace Memory class ClientPort; @@ -46,6 +45,9 @@ class Synchronization; class KThread; class TimeManager; +template <typename T> +class KSlabHeap; + using EmuThreadHandle = uintptr_t; constexpr EmuThreadHandle EmuThreadHandleInvalid{}; constexpr EmuThreadHandle EmuThreadHandleReserved{1ULL << 63}; @@ -184,10 +186,10 @@ public: const Memory::MemoryManager& MemoryManager() const; /// Gets the slab heap allocated for user space pages. - Memory::SlabHeap<Memory::Page>& GetUserSlabHeapPages(); + KSlabHeap<Memory::Page>& GetUserSlabHeapPages(); /// Gets the slab heap allocated for user space pages. - const Memory::SlabHeap<Memory::Page>& GetUserSlabHeapPages() const; + const KSlabHeap<Memory::Page>& GetUserSlabHeapPages() const; /// Gets the shared memory object for HID services. Kernel::KSharedMemory& GetHidSharedMem(); |