summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/kernel.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2015-02-10 23:08:04 -0500
committerGravatar bunnei2015-02-10 23:08:04 -0500
commit2fb1e4c9a2e45aad6c3e9408a3895369b8a8729f (patch)
treefca138e8377c4d66bd1fe026a3d2fef54a7f090c /src/core/hle/kernel/kernel.cpp
parentGSP: Fixed typo in SignalInterrupt (diff)
parentAsserts: break/crash program, fit to style guide; log.h->assert.h (diff)
downloadyuzu-2fb1e4c9a2e45aad6c3e9408a3895369b8a8729f.tar.gz
yuzu-2fb1e4c9a2e45aad6c3e9408a3895369b8a8729f.tar.xz
yuzu-2fb1e4c9a2e45aad6c3e9408a3895369b8a8729f.zip
Merge pull request #500 from archshift/assert
Made asserts actually break the debugger, or crash if the program is not in debug mode.
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
-rw-r--r--src/core/hle/kernel/kernel.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index a2ffbcdb7..eb61d8ef3 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -52,7 +52,7 @@ void WaitObject::WakeupAllWaitingThreads() {
52 for (auto thread : waiting_threads_copy) 52 for (auto thread : waiting_threads_copy)
53 thread->ReleaseWaitObject(this); 53 thread->ReleaseWaitObject(this);
54 54
55 _assert_msg_(Kernel, waiting_threads.empty(), "failed to awaken all waiting threads!"); 55 ASSERT_MSG(waiting_threads.empty(), "failed to awaken all waiting threads!");
56} 56}
57 57
58HandleTable::HandleTable() { 58HandleTable::HandleTable() {
@@ -61,7 +61,7 @@ HandleTable::HandleTable() {
61} 61}
62 62
63ResultVal<Handle> HandleTable::Create(SharedPtr<Object> obj) { 63ResultVal<Handle> HandleTable::Create(SharedPtr<Object> obj) {
64 _dbg_assert_(Kernel, obj != nullptr); 64 DEBUG_ASSERT(obj != nullptr);
65 65
66 u16 slot = next_free_slot; 66 u16 slot = next_free_slot;
67 if (slot >= generations.size()) { 67 if (slot >= generations.size()) {