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

[Kernel/Object] Added base to object handle

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

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

@ -92,6 +92,9 @@ class ObjectTable {
std::vector<object_ref<XObject>>* results); std::vector<object_ref<XObject>>* results);
X_HANDLE TranslateHandle(X_HANDLE handle); X_HANDLE TranslateHandle(X_HANDLE handle);
static constexpr uint32_t GetHandleSlot(X_HANDLE handle) {
return (handle - XObject::kHandleBase) >> 2;
}
X_STATUS FindFreeSlot(uint32_t* out_slot); X_STATUS FindFreeSlot(uint32_t* out_slot);
bool Resize(uint32_t new_capacity); bool Resize(uint32_t new_capacity);

7
src/xenia/kernel/xobject.h
View File

@ -109,6 +109,13 @@ struct X_OBJECT_TYPE {
class XObject { class XObject {
public: public:
// Burnout Paradise needs proper handle value for certain calculations
// It gets handle value from TLS (without base handle value is 0x88)
// and substract 0xF8000088. Without base we're receiving wrong address
// Instead of receiving address that starts with 0x82... we're receiving
// one with 0x8A... which causes crash
static constexpr uint32_t kHandleBase = 0xF8000000;
enum Type { enum Type {
kTypeUndefined, kTypeUndefined,
kTypeEnumerator, kTypeEnumerator,