fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Kernel/Object] Added base to object handle

Browse Source
This commit is contained in:
Gliniak
2020-08-29 09:48:31 +02:00
committed by Triang3l
parent 1b3db70a07
commit 7fd1991074
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/xenia/kernel/util/object_table.cc
View File

@@ -112,8 +112,7 @@ X_STATUS ObjectTable::AddHandle(XObject* object, X_HANDLE* out_handle) {
ObjectTableEntry& entry = table_[slot];
entry.object = object;
entry.handle_ref_count = 1;
handle = slot << 2;
handle = XObject::kHandleBase + (slot << 2);
object->handles().push_back(handle);
// Retain so long as the object is in the table.
@@ -251,7 +250,7 @@ ObjectTable::ObjectTableEntry* ObjectTable::LookupTable(X_HANDLE handle) {
auto global_lock = global_critical_region_.Acquire();
// Lower 2 bits are ignored.
uint32_t slot = handle >> 2;
uint32_t slot = GetHandleSlot(handle);
if (slot <= table_capacity_) {
return &table_[slot];
}
@@ -279,7 +278,7 @@ XObject* ObjectTable::LookupObject(X_HANDLE handle, bool already_locked) {
}
// Lower 2 bits are ignored.
uint32_t slot = handle >> 2;
uint32_t slot = GetHandleSlot(handle);
// Verify slot.
if (slot < table_capacity_) {
@@ -390,7 +389,7 @@ bool ObjectTable::Restore(ByteStream* stream) {
}
X_STATUS ObjectTable::RestoreHandle(X_HANDLE handle, XObject* object) {
uint32_t slot = handle >> 2;
uint32_t slot = GetHandleSlot(handle);
assert_true(table_capacity_ >= slot);
if (table_capacity_ >= slot) {