summaryrefslogtreecommitdiff
path: root/src/core/mem_map_funcs.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/mem_map_funcs.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/mem_map_funcs.cpp')
-rw-r--r--src/core/mem_map_funcs.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp
index 0e3b81b28..4f93c0e64 100644
--- a/src/core/mem_map_funcs.cpp
+++ b/src/core/mem_map_funcs.cpp
@@ -136,9 +136,9 @@ inline void Write(const VAddr vaddr, const T data) {
136 *(T*)&g_dsp_mem[vaddr - DSP_MEMORY_VADDR] = data; 136 *(T*)&g_dsp_mem[vaddr - DSP_MEMORY_VADDR] = data;
137 137
138 //} else if ((vaddr & 0xFFFF0000) == 0x1FF80000) { 138 //} else if ((vaddr & 0xFFFF0000) == 0x1FF80000) {
139 // _assert_msg_(MEMMAP, false, "umimplemented write to Configuration Memory"); 139 // ASSERT_MSG(MEMMAP, false, "umimplemented write to Configuration Memory");
140 //} else if ((vaddr & 0xFFFFF000) == 0x1FF81000) { 140 //} else if ((vaddr & 0xFFFFF000) == 0x1FF81000) {
141 // _assert_msg_(MEMMAP, false, "umimplemented write to shared page"); 141 // ASSERT_MSG(MEMMAP, false, "umimplemented write to shared page");
142 142
143 // Error out... 143 // Error out...
144 } else { 144 } else {