From f5ce71793e1d60fdecd641484038a1436c161905 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 21 Nov 2018 18:22:24 -0500 Subject: kernel/handle_table: Default destructor in the cpp file We don't need to potentially inline the teardown logic of all of the handle instances. --- src/core/hle/kernel/handle_table.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/core/hle/kernel/handle_table.cpp') diff --git a/src/core/hle/kernel/handle_table.cpp b/src/core/hle/kernel/handle_table.cpp index 5ee5c05e3..9f2b996c4 100644 --- a/src/core/hle/kernel/handle_table.cpp +++ b/src/core/hle/kernel/handle_table.cpp @@ -18,6 +18,8 @@ HandleTable::HandleTable() { Clear(); } +HandleTable::~HandleTable() = default; + ResultVal HandleTable::Create(SharedPtr obj) { DEBUG_ASSERT(obj != nullptr); -- cgit v1.2.3 From 0e35f1bb18b71fcb936b3a00e6bda0fa82a0b59c Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 21 Nov 2018 18:30:58 -0500 Subject: kernel/handle_table: Move private static functions into the cpp file These don't depend on class state, and are effectively implementation details, so they can go into the cpp file . --- src/core/hle/kernel/handle_table.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/core/hle/kernel/handle_table.cpp') diff --git a/src/core/hle/kernel/handle_table.cpp b/src/core/hle/kernel/handle_table.cpp index 9f2b996c4..1bf79b692 100644 --- a/src/core/hle/kernel/handle_table.cpp +++ b/src/core/hle/kernel/handle_table.cpp @@ -12,6 +12,15 @@ #include "core/hle/kernel/thread.h" namespace Kernel { +namespace { +constexpr u16 GetSlot(Handle handle) { + return handle >> 15; +} + +constexpr u16 GetGeneration(Handle handle) { + return handle & 0x7FFF; +} +} // Anonymous namespace HandleTable::HandleTable() { next_generation = 1; -- cgit v1.2.3