diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2015-06-21 18:47:21 +0200 |
|---|---|---|
| committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2015-06-28 01:36:55 +0200 |
| commit | f48b28ad271c6759868f55cc429e02098576857e (patch) | |
| tree | f0b0cc678e91b43233bf8c62fb20a8db8ed5fd4a /src/core | |
| parent | Core: Cleanup file_sys includes. (diff) | |
| download | yuzu-f48b28ad271c6759868f55cc429e02098576857e.tar yuzu-f48b28ad271c6759868f55cc429e02098576857e.tar.gz yuzu-f48b28ad271c6759868f55cc429e02098576857e.tar.bz2 yuzu-f48b28ad271c6759868f55cc429e02098576857e.tar.lz yuzu-f48b28ad271c6759868f55cc429e02098576857e.tar.xz yuzu-f48b28ad271c6759868f55cc429e02098576857e.tar.zst yuzu-f48b28ad271c6759868f55cc429e02098576857e.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/arm/skyeye_common/vfp/vfp.cpp | 6 | ||||
| -rw-r--r-- | src/core/arm/skyeye_common/vfp/vfpsingle.cpp | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/core/arm/skyeye_common/vfp/vfp.cpp b/src/core/arm/skyeye_common/vfp/vfp.cpp index 571d6c2f2..bbe11f690 100644 --- a/src/core/arm/skyeye_common/vfp/vfp.cpp +++ b/src/core/arm/skyeye_common/vfp/vfp.cpp @@ -20,6 +20,7 @@ /* Note: this file handles interface with arm core and vfp registers */ +#include "common/common_funcs.h" #include "common/logging/log.h" #include "core/arm/skyeye_common/armdefs.h" @@ -153,9 +154,8 @@ void vfp_raise_exceptions(ARMul_State* state, u32 exceptions, u32 inst, u32 fpsc LOG_TRACE(Core_ARM11, "VFP: raising exceptions %08x\n", exceptions); if (exceptions == VFP_EXCEPTION_ERROR) { - LOG_TRACE(Core_ARM11, "unhandled bounce %x\n", inst); - exit(-1); - return; + LOG_CRITICAL(Core_ARM11, "unhandled bounce %x\n", inst); + Crash(); } /* diff --git a/src/core/arm/skyeye_common/vfp/vfpsingle.cpp b/src/core/arm/skyeye_common/vfp/vfpsingle.cpp index 5a655a6f2..e5d339252 100644 --- a/src/core/arm/skyeye_common/vfp/vfpsingle.cpp +++ b/src/core/arm/skyeye_common/vfp/vfpsingle.cpp @@ -53,6 +53,8 @@ #include <cinttypes> +#include "common/common_funcs.h" +#include "common/common_types.h" #include "common/logging/log.h" #include "core/arm/skyeye_common/vfp/vfp_helper.h" @@ -1246,7 +1248,7 @@ u32 vfp_single_cpdo(ARMul_State* state, u32 inst, u32 fpscr) if (!fop->fn) { LOG_CRITICAL(Core_ARM11, "could not find single op %d, inst=0x%x@0x%x", FEXT_TO_IDX(inst), inst, state->Reg[15]); - exit(-1); + Crash(); goto invalid; } |