XObject SetNativePointer: Added flag to disable asserts on uninitialized memory
This commit is contained in:
parent
6adde32558
commit
662fa97444
|
@ -146,7 +146,7 @@ X_STATUS XThread::Create() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set native info.
|
// Set native info.
|
||||||
SetNativePointer(thread_state_address_);
|
SetNativePointer(thread_state_address_, true);
|
||||||
|
|
||||||
XUserModule* module = kernel_state()->GetExecutableModule();
|
XUserModule* module = kernel_state()->GetExecutableModule();
|
||||||
|
|
||||||
|
|
|
@ -152,13 +152,16 @@ X_STATUS XObject::WaitMultiple(uint32_t count, XObject** objects,
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
void XObject::SetNativePointer(uint32_t native_ptr) {
|
void XObject::SetNativePointer(uint32_t native_ptr, bool uninitialized) {
|
||||||
std::lock_guard<std::mutex> lock(kernel_state_->object_mutex());
|
std::lock_guard<std::mutex> lock(kernel_state_->object_mutex());
|
||||||
|
|
||||||
auto header =
|
auto header =
|
||||||
kernel_state_->memory()->TranslateVirtual<DISPATCH_HEADER*>(native_ptr);
|
kernel_state_->memory()->TranslateVirtual<DISPATCH_HEADER*>(native_ptr);
|
||||||
|
|
||||||
assert_true(!(header->wait_list_blink & 0x1));
|
// Memory uninitialized, so don't bother with the check.
|
||||||
|
if (!uninitialized) {
|
||||||
|
assert_true(!(header->wait_list_blink & 0x1));
|
||||||
|
}
|
||||||
|
|
||||||
// Stash pointer in struct.
|
// Stash pointer in struct.
|
||||||
uint64_t object_ptr = reinterpret_cast<uint64_t>(this);
|
uint64_t object_ptr = reinterpret_cast<uint64_t>(this);
|
||||||
|
|
|
@ -78,7 +78,7 @@ class XObject {
|
||||||
virtual void* GetWaitHandle() { return 0; }
|
virtual void* GetWaitHandle() { return 0; }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void SetNativePointer(uint32_t native_ptr);
|
void SetNativePointer(uint32_t native_ptr, bool uninitialized = false);
|
||||||
|
|
||||||
static uint32_t TimeoutTicksToMs(int64_t timeout_ticks);
|
static uint32_t TimeoutTicksToMs(int64_t timeout_ticks);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue