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

[Kernel] Improvements to host and guest objects handling

Browse Source
This commit is contained in:
Gliniak
2023-01-05 22:51:18 +01:00
committed by Radosław Gliński
parent 5b0fe5aada
commit 40f6b5b3ac
4 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/xenia/kernel/util/object_table.h
View File

@@ -49,9 +49,6 @@ class ObjectTable {
X_STATUS RestoreHandle(X_HANDLE handle, XObject* object);
template <typename T>
object_ref<T> LookupObject(X_HANDLE handle, bool already_locked = false) {
if (T::kObjectType == XObject::Type::Socket) {
handle |= XObject::kHandleBase;
}
auto object = LookupObject(handle, already_locked);
if (object) {
assert_true(object->type() == T::kObjectType);
@@ -96,7 +93,7 @@ class ObjectTable {
X_HANDLE TranslateHandle(X_HANDLE handle);
static constexpr uint32_t GetHandleSlot(X_HANDLE handle, bool host) {
if (!host) handle -= XObject::kHandleBase;
handle &= host ? ~XObject::kHandleHostBase : ~XObject::kHandleBase;
return handle >> 2;
}
X_STATUS FindFreeSlot(uint32_t* out_slot, bool host);