ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Verify that LookupObject actually returns an object of the requested type.

This commit is contained in:
Dr. Chat 2015-11-12 19:02:32 -06:00
parent 7fc22f1987
commit 4dfe1addaa
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,10 +38,22 @@ class ObjectTable {
template <typename T> template <typename T>
object_ref<T> LookupObject(X_HANDLE handle) { object_ref<T> LookupObject(X_HANDLE handle) {
auto object = LookupObject(handle, false); auto object = LookupObject(handle, false);
if (object) {
assert_true(object->type() == T::kType);
}
auto result = object_ref<T>(reinterpret_cast<T*>(object)); auto result = object_ref<T>(reinterpret_cast<T*>(object));
return result; return result;
} }
// Generic lookup
template <>
object_ref<XObject> LookupObject<XObject>(X_HANDLE handle) {
auto object = LookupObject(handle, false);
auto result = object_ref<XObject>(reinterpret_cast<XObject*>(object));
return result;
}
X_STATUS AddNameMapping(const std::string& name, X_HANDLE handle); X_STATUS AddNameMapping(const std::string& name, X_HANDLE handle);
void RemoveNameMapping(const std::string& name); void RemoveNameMapping(const std::string& name);
X_STATUS GetObjectByName(const std::string& name, X_HANDLE* out_handle); X_STATUS GetObjectByName(const std::string& name, X_HANDLE* out_handle);