eitan.c/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

Kernel: Remove Object::GetHandle (it's not used anymore :D)

Browse source
This commit is contained in:
Yuri Kunde Schlesner 2015-01-31 14:57:32 -02:00
parent 869ec46683
commit 5354a479bc
2 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/core/hle/kernel/kernel.cpp
View file

@ -76,13 +76,10 @@ ResultVal<Handle> HandleTable::Create(SharedPtr<Object> obj) {
// CTR-OS doesn't use generation 0, so skip straight to 1. // CTR-OS doesn't use generation 0, so skip straight to 1.
if (next_generation >= (1 << 15)) next_generation = 1; if (next_generation >= (1 << 15)) next_generation = 1;
Handle handle = generation | (slot << 15);
if (obj->handle == INVALID_HANDLE)
obj->handle = handle;
generations[slot] = generation; generations[slot] = generation;
objects[slot] = std::move(obj); objects[slot] = std::move(obj);
Handle handle = generation | (slot << 15);
return MakeResult<Handle>(handle); return MakeResult<Handle>(handle);
} }

5
src/core/hle/kernel/kernel.h
View file

@ -58,14 +58,9 @@ enum {
DEFAULT_STACK_SIZE = 0x4000, DEFAULT_STACK_SIZE = 0x4000,
}; };
class HandleTable;
class Object : NonCopyable { class Object : NonCopyable {
friend class HandleTable;
u32 handle = INVALID_HANDLE;
public: public:
virtual ~Object() {} virtual ~Object() {}
Handle GetHandle() const { return handle; }
/// Returns a unique identifier for the object. For debugging purposes only. /// Returns a unique identifier for the object. For debugging purposes only.
unsigned int GetObjectId() const { return object_id; } unsigned int GetObjectId() const { return object_id; }