summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel
diff options
context:
space:
mode:
authorGravatar bunnei2014-06-06 00:19:40 -0400
committerGravatar bunnei2014-06-13 09:51:11 -0400
commitd7363322c79d6e7598e0d80cf1af9c05b652cecb (patch)
tree162a31d1cda9cada208f3732a7f76317d891a0f2 /src/core/hle/kernel
parentMutex: Moved ReleaseMutex iterator declaration to be inside while loop. (diff)
downloadyuzu-d7363322c79d6e7598e0d80cf1af9c05b652cecb.tar.gz
yuzu-d7363322c79d6e7598e0d80cf1af9c05b652cecb.tar.xz
yuzu-d7363322c79d6e7598e0d80cf1af9c05b652cecb.zip
HLE: Updated various handle debug assertions to be more clear.
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r--src/core/hle/kernel/mutex.cpp2
-rw-r--r--src/core/hle/kernel/thread.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp
index eee7c4935..ee7507edf 100644
--- a/src/core/hle/kernel/mutex.cpp
+++ b/src/core/hle/kernel/mutex.cpp
@@ -122,7 +122,7 @@ bool ReleaseMutex(Mutex* mutex) {
122Result ReleaseMutex(Handle handle) { 122Result ReleaseMutex(Handle handle) {
123 Mutex* mutex = Kernel::g_object_pool.GetFast<Mutex>(handle); 123 Mutex* mutex = Kernel::g_object_pool.GetFast<Mutex>(handle);
124 124
125 _assert_msg_(KERNEL, mutex, "ReleaseMutex tried to release a NULL mutex!"); 125 _assert_msg_(KERNEL, (mutex != NULL), "ReleaseMutex tried to release a NULL mutex!");
126 126
127 if (!ReleaseMutex(mutex)) { 127 if (!ReleaseMutex(mutex)) {
128 return -1; 128 return -1;
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index da93e006c..5fdb4fbe6 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -353,7 +353,7 @@ Handle CreateThread(const char* name, u32 entry_point, s32 priority, u32 arg, s3
353/// Get the priority of the thread specified by handle 353/// Get the priority of the thread specified by handle
354u32 GetThreadPriority(const Handle handle) { 354u32 GetThreadPriority(const Handle handle) {
355 Thread* thread = g_object_pool.GetFast<Thread>(handle); 355 Thread* thread = g_object_pool.GetFast<Thread>(handle);
356 _assert_msg_(KERNEL, thread, "called, but thread is NULL!"); 356 _assert_msg_(KERNEL, (thread != NULL), "called, but thread is NULL!");
357 return thread->current_priority; 357 return thread->current_priority;
358} 358}
359 359
@@ -365,7 +365,7 @@ Result SetThreadPriority(Handle handle, s32 priority) {
365 } else { 365 } else {
366 thread = g_object_pool.GetFast<Thread>(handle); 366 thread = g_object_pool.GetFast<Thread>(handle);
367 } 367 }
368 _assert_msg_(KERNEL, thread, "called, but thread is NULL!"); 368 _assert_msg_(KERNEL, (thread != NULL), "called, but thread is NULL!");
369 369
370 // If priority is invalid, clamp to valid range 370 // If priority is invalid, clamp to valid range
371 if (priority < THREADPRIO_HIGHEST || priority > THREADPRIO_LOWEST) { 371 if (priority < THREADPRIO_HIGHEST || priority > THREADPRIO_LOWEST) {