fixup! hle: kernel: Add initial impl. of KAutoObject.

This commit is contained in:
bunnei 2021-05-01 12:36:21 -07:00
parent 9bae3992e6
commit 25538db150

View File

@ -5,6 +5,7 @@
#pragma once #pragma once
#include <atomic> #include <atomic>
#include <string>
#include "common/assert.h" #include "common/assert.h"
#include "common/common_funcs.h" #include "common/common_funcs.h"
@ -45,19 +46,15 @@ public:
return GetStaticTypeName(); \ return GetStaticTypeName(); \
} \ } \
\ \
private: private: \
constexpr bool operator!=(const TypeObj& rhs)
class KAutoObject { class KAutoObject {
protected: protected:
class TypeObj { class TypeObj {
private:
const char* m_name;
ClassTokenType m_class_token;
public: public:
constexpr explicit TypeObj(const char* n, ClassTokenType tok) constexpr explicit TypeObj(const char* n, ClassTokenType tok)
: m_name(n), m_class_token(tok) { // ... : m_name(n), m_class_token(tok) {}
}
constexpr const char* GetName() const { constexpr const char* GetName() const {
return m_name; return m_name;
@ -66,35 +63,31 @@ protected:
return m_class_token; return m_class_token;
} }
constexpr bool operator==(const TypeObj& rhs) { constexpr bool operator==(const TypeObj& rhs) const {
return this->GetClassToken() == rhs.GetClassToken(); return this->GetClassToken() == rhs.GetClassToken();
} }
constexpr bool operator!=(const TypeObj& rhs) { constexpr bool operator!=(const TypeObj& rhs) const {
return this->GetClassToken() != rhs.GetClassToken(); return this->GetClassToken() != rhs.GetClassToken();
} }
constexpr bool IsDerivedFrom(const TypeObj& rhs) { constexpr bool IsDerivedFrom(const TypeObj& rhs) const {
return (this->GetClassToken() | rhs.GetClassToken()) == this->GetClassToken(); return (this->GetClassToken() | rhs.GetClassToken()) == this->GetClassToken();
} }
private:
const char* m_name;
ClassTokenType m_class_token;
}; };
private: private:
KERNEL_AUTOOBJECT_TRAITS(KAutoObject, KAutoObject); KERNEL_AUTOOBJECT_TRAITS(KAutoObject, KAutoObject);
private:
std::atomic<u32> m_ref_count{};
protected:
KernelCore& kernel;
std::string name;
public:
static KAutoObject* Create(KAutoObject* ptr);
public: public:
explicit KAutoObject(KernelCore& kernel_) : kernel(kernel_) {} explicit KAutoObject(KernelCore& kernel_) : kernel(kernel_) {}
virtual ~KAutoObject() {} virtual ~KAutoObject() = default;
static KAutoObject* Create(KAutoObject* ptr);
// Destroy is responsible for destroying the auto object's resources when ref_count hits zero. // Destroy is responsible for destroying the auto object's resources when ref_count hits zero.
virtual void Destroy() { virtual void Destroy() {
@ -122,8 +115,8 @@ public:
template <typename Derived> template <typename Derived>
Derived DynamicCast() { Derived DynamicCast() {
static_assert(std::is_pointer<Derived>::value); static_assert(std::is_pointer_v<Derived>);
using DerivedType = typename std::remove_pointer<Derived>::type; using DerivedType = std::remove_pointer_t<Derived>;
if (this->IsDerivedFrom(DerivedType::GetStaticTypeObj())) { if (this->IsDerivedFrom(DerivedType::GetStaticTypeObj())) {
return static_cast<Derived>(this); return static_cast<Derived>(this);
@ -134,8 +127,8 @@ public:
template <typename Derived> template <typename Derived>
const Derived DynamicCast() const { const Derived DynamicCast() const {
static_assert(std::is_pointer<Derived>::value); static_assert(std::is_pointer_v<Derived>);
using DerivedType = typename std::remove_pointer<Derived>::type; using DerivedType = std::remove_pointer_t<Derived>;
if (this->IsDerivedFrom(DerivedType::GetStaticTypeObj())) { if (this->IsDerivedFrom(DerivedType::GetStaticTypeObj())) {
return static_cast<Derived>(this); return static_cast<Derived>(this);
@ -171,20 +164,18 @@ public:
this->Destroy(); this->Destroy();
} }
} }
protected:
KernelCore& kernel;
std::string name;
private:
std::atomic<u32> m_ref_count{};
}; };
class KAutoObjectWithListContainer; class KAutoObjectWithListContainer;
class KAutoObjectWithList : public KAutoObject { class KAutoObjectWithList : public KAutoObject {
private:
friend class KAutoObjectWithListContainer;
private:
Common::IntrusiveRedBlackTreeNode list_node;
protected:
KernelCore& kernel;
public: public:
explicit KAutoObjectWithList(KernelCore& kernel_) : KAutoObject(kernel_), kernel(kernel_) {} explicit KAutoObjectWithList(KernelCore& kernel_) : KAutoObject(kernel_), kernel(kernel_) {}
@ -209,24 +200,21 @@ public:
virtual const std::string& GetName() const { virtual const std::string& GetName() const {
return name; return name;
} }
private:
friend class KAutoObjectWithListContainer;
private:
Common::IntrusiveRedBlackTreeNode list_node;
protected:
KernelCore& kernel;
}; };
template <typename T> template <typename T>
class KScopedAutoObject { class KScopedAutoObject {
YUZU_NON_COPYABLE(KScopedAutoObject); YUZU_NON_COPYABLE(KScopedAutoObject);
private:
template <typename U>
friend class KScopedAutoObject;
private:
T* m_obj{};
private:
constexpr void Swap(KScopedAutoObject& rhs) {
std::swap(m_obj, rhs.m_obj);
}
public: public:
constexpr KScopedAutoObject() = default; constexpr KScopedAutoObject() = default;
@ -301,6 +289,18 @@ public:
constexpr bool IsNotNull() const { constexpr bool IsNotNull() const {
return m_obj != nullptr; return m_obj != nullptr;
} }
private:
template <typename U>
friend class KScopedAutoObject;
private:
T* m_obj{};
private:
constexpr void Swap(KScopedAutoObject& rhs) noexcept {
std::swap(m_obj, rhs.m_obj);
}
}; };
} // namespace Kernel } // namespace Kernel