diff options
| author |  bunnei | 2015-02-10 23:08:04 -0500 |
|---|---|---|
| committer | bunnei | 2015-02-10 23:08:04 -0500 |
| commit | 2fb1e4c9a2e45aad6c3e9408a3895369b8a8729f (patch) | |
| tree | fca138e8377c4d66bd1fe026a3d2fef54a7f090c /src/core/arm | |
| parent | GSP: Fixed typo in SignalInterrupt (diff) | |
| parent | Asserts: break/crash program, fit to style guide; log.h->assert.h (diff) | |
| download | yuzu-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/arm')
| -rw-r--r-- | src/core/arm/disassembler/arm_disasm.cpp | 2 | ||||
| -rw-r--r-- | src/core/arm/dyncom/arm_dyncom_run.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/core/arm/disassembler/arm_disasm.cpp b/src/core/arm/disassembler/arm_disasm.cpp index 45c720e16..f7c7451e9 100644 --- a/src/core/arm/disassembler/arm_disasm.cpp +++ b/src/core/arm/disassembler/arm_disasm.cpp | |||
| @@ -963,4 +963,4 @@ Opcode ARM_Disasm::DecodeALU(uint32_t insn) { | |||
| 963 | } | 963 | } |
| 964 | // Unreachable | 964 | // Unreachable |
| 965 | return OP_INVALID; | 965 | return OP_INVALID; |
| 966 | } \ No newline at end of file | 966 | } |
diff --git a/src/core/arm/dyncom/arm_dyncom_run.cpp b/src/core/arm/dyncom/arm_dyncom_run.cpp index d457d0ac5..15677da27 100644 --- a/src/core/arm/dyncom/arm_dyncom_run.cpp +++ b/src/core/arm/dyncom/arm_dyncom_run.cpp | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | #include <assert.h> | 5 | #include <assert.h> |
| 6 | 6 | ||
| 7 | #include "common/logging/log.h" | ||
| 7 | #include "core/arm/skyeye_common/armdefs.h" | 8 | #include "core/arm/skyeye_common/armdefs.h" |
| 8 | 9 | ||
| 9 | void switch_mode(arm_core_t *core, uint32_t mode) { | 10 | void switch_mode(arm_core_t *core, uint32_t mode) { |