diff options
author | bunnei <bunneidev@gmail.com> | 2021-02-13 00:29:25 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2021-02-19 01:16:24 +0100 |
commit | 701ef616b265d8914f77a399d9a1f41e68683a72 (patch) | |
tree | 6aeef88a010acd35a15f421fffedbc70605251b7 /src/core/hle/kernel/memory/memory_manager.h | |
parent | hle: kernel: KSystemControl does not belong in Memory namespace. (diff) | |
download | yuzu-701ef616b265d8914f77a399d9a1f41e68683a72.tar yuzu-701ef616b265d8914f77a399d9a1f41e68683a72.tar.gz yuzu-701ef616b265d8914f77a399d9a1f41e68683a72.tar.bz2 yuzu-701ef616b265d8914f77a399d9a1f41e68683a72.tar.lz yuzu-701ef616b265d8914f77a399d9a1f41e68683a72.tar.xz yuzu-701ef616b265d8914f77a399d9a1f41e68683a72.tar.zst yuzu-701ef616b265d8914f77a399d9a1f41e68683a72.zip |
Diffstat (limited to 'src/core/hle/kernel/memory/memory_manager.h')
-rw-r--r-- | src/core/hle/kernel/memory/memory_manager.h | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/src/core/hle/kernel/memory/memory_manager.h b/src/core/hle/kernel/memory/memory_manager.h index 00c04eebd..80dfbc8c2 100644 --- a/src/core/hle/kernel/memory/memory_manager.h +++ b/src/core/hle/kernel/memory/memory_manager.h @@ -6,7 +6,9 @@ #include <array> #include <mutex> +#include <tuple> +#include "common/common_funcs.h" #include "common/common_types.h" #include "core/hle/kernel/memory/page_heap.h" #include "core/hle/result.h" @@ -44,8 +46,8 @@ public: } void InitializeManager(Pool pool, u64 start_address, u64 end_address); - VAddr AllocateContinuous(std::size_t num_pages, std::size_t align_pages, Pool pool, - Direction dir = Direction::FromFront); + + VAddr AllocateAndOpenContinuous(size_t num_pages, size_t align_pages, u32 option); ResultCode Allocate(PageLinkedList& page_list, std::size_t num_pages, Pool pool, Direction dir = Direction::FromFront); ResultCode Free(PageLinkedList& page_list, std::size_t num_pages, Pool pool, @@ -53,6 +55,27 @@ public: static constexpr std::size_t MaxManagerCount = 10; +public: + static constexpr u32 EncodeOption(Pool pool, Direction dir) { + return (static_cast<u32>(pool) << static_cast<u32>(Pool::Shift)) | + (static_cast<u32>(dir) << static_cast<u32>(Direction::Shift)); + } + + static constexpr Pool GetPool(u32 option) { + return static_cast<Pool>((static_cast<u32>(option) & static_cast<u32>(Pool::Mask)) >> + static_cast<u32>(Pool::Shift)); + } + + static constexpr Direction GetDirection(u32 option) { + return static_cast<Direction>( + (static_cast<u32>(option) & static_cast<u32>(Direction::Mask)) >> + static_cast<u32>(Direction::Shift)); + } + + static constexpr std::tuple<Pool, Direction> DecodeOption(u32 option) { + return std::make_tuple(GetPool(option), GetDirection(option)); + } + private: class Impl final : NonCopyable { private: |