summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2015-01-31 14:57:32 -0200
committerGravatar Yuri Kunde Schlesner2015-02-02 15:37:04 -0200
commit5354a479bccc2ab47692e6cb237ec66ee8251207 (patch)
tree64fd66b44b434ad5c4553e1d39e07f2a0da8a59c /src/core/hle/kernel
parentKernel: Introduce unique Object ids for debugging (diff)
downloadyuzu-5354a479bccc2ab47692e6cb237ec66ee8251207.tar.gz
yuzu-5354a479bccc2ab47692e6cb237ec66ee8251207.tar.xz
yuzu-5354a479bccc2ab47692e6cb237ec66ee8251207.zip
Kernel: Remove Object::GetHandle (it's not used anymore :D)
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r--src/core/hle/kernel/kernel.cpp5
-rw-r--r--src/core/hle/kernel/kernel.h5
2 files changed, 1 insertions, 9 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index a2459e7b1..645c3bafc 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -76,13 +76,10 @@ ResultVal<Handle> HandleTable::Create(SharedPtr<Object> obj) {
76 // CTR-OS doesn't use generation 0, so skip straight to 1. 76 // CTR-OS doesn't use generation 0, so skip straight to 1.
77 if (next_generation >= (1 << 15)) next_generation = 1; 77 if (next_generation >= (1 << 15)) next_generation = 1;
78 78
79 Handle handle = generation | (slot << 15);
80 if (obj->handle == INVALID_HANDLE)
81 obj->handle = handle;
82
83 generations[slot] = generation; 79 generations[slot] = generation;
84 objects[slot] = std::move(obj); 80 objects[slot] = std::move(obj);
85 81
82 Handle handle = generation | (slot << 15);
86 return MakeResult<Handle>(handle); 83 return MakeResult<Handle>(handle);
87} 84}
88 85
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h
index 5567780fe..bf5b47a61 100644
--- a/src/core/hle/kernel/kernel.h
+++ b/src/core/hle/kernel/kernel.h
@@ -58,14 +58,9 @@ enum {
58 DEFAULT_STACK_SIZE = 0x4000, 58 DEFAULT_STACK_SIZE = 0x4000,
59}; 59};
60 60
61class HandleTable;
62
63class Object : NonCopyable { 61class Object : NonCopyable {
64 friend class HandleTable;
65 u32 handle = INVALID_HANDLE;
66public: 62public:
67 virtual ~Object() {} 63 virtual ~Object() {}
68 Handle GetHandle() const { return handle; }
69 64
70 /// Returns a unique identifier for the object. For debugging purposes only. 65 /// Returns a unique identifier for the object. For debugging purposes only.
71 unsigned int GetObjectId() const { return object_id; } 66 unsigned int GetObjectId() const { return object_id; }