diff options
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 @@ | |||
| 20 | 20 | ||
| 21 | /* Note: this file handles interface with arm core and vfp registers */ | 21 | /* Note: this file handles interface with arm core and vfp registers */ |
| 22 | 22 | ||
| 23 | #include "common/common_funcs.h" | ||
| 23 | #include "common/logging/log.h" | 24 | #include "common/logging/log.h" |
| 24 | 25 | ||
| 25 | #include "core/arm/skyeye_common/armdefs.h" | 26 | #include "core/arm/skyeye_common/armdefs.h" |
| @@ -153,9 +154,8 @@ void vfp_raise_exceptions(ARMul_State* state, u32 exceptions, u32 inst, u32 fpsc | |||
| 153 | LOG_TRACE(Core_ARM11, "VFP: raising exceptions %08x\n", exceptions); | 154 | LOG_TRACE(Core_ARM11, "VFP: raising exceptions %08x\n", exceptions); |
| 154 | 155 | ||
| 155 | if (exceptions == VFP_EXCEPTION_ERROR) { | 156 | if (exceptions == VFP_EXCEPTION_ERROR) { |
| 156 | LOG_TRACE(Core_ARM11, "unhandled bounce %x\n", inst); | 157 | LOG_CRITICAL(Core_ARM11, "unhandled bounce %x\n", inst); |
| 157 | exit(-1); | 158 | Crash(); |
| 158 | return; | ||
| 159 | } | 159 | } |
| 160 | 160 | ||
| 161 | /* | 161 | /* |
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 @@ | |||
| 53 | 53 | ||
| 54 | #include <cinttypes> | 54 | #include <cinttypes> |
| 55 | 55 | ||
| 56 | #include "common/common_funcs.h" | ||
| 57 | #include "common/common_types.h" | ||
| 56 | #include "common/logging/log.h" | 58 | #include "common/logging/log.h" |
| 57 | 59 | ||
| 58 | #include "core/arm/skyeye_common/vfp/vfp_helper.h" | 60 | #include "core/arm/skyeye_common/vfp/vfp_helper.h" |
| @@ -1246,7 +1248,7 @@ u32 vfp_single_cpdo(ARMul_State* state, u32 inst, u32 fpscr) | |||
| 1246 | 1248 | ||
| 1247 | if (!fop->fn) { | 1249 | if (!fop->fn) { |
| 1248 | LOG_CRITICAL(Core_ARM11, "could not find single op %d, inst=0x%x@0x%x", FEXT_TO_IDX(inst), inst, state->Reg[15]); | 1250 | LOG_CRITICAL(Core_ARM11, "could not find single op %d, inst=0x%x@0x%x", FEXT_TO_IDX(inst), inst, state->Reg[15]); |
| 1249 | exit(-1); | 1251 | Crash(); |
| 1250 | goto invalid; | 1252 | goto invalid; |
| 1251 | } | 1253 | } |
| 1252 | 1254 | ||