summaryrefslogtreecommitdiffstats
path: root/src/core/arm/skyeye_common
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2015-07-11 01:36:12 +0200
committerYuri Kunde Schlesner <yuriks@yuriks.net>2015-07-11 01:36:12 +0200
commit867c28ae03b3b2883713896765f3ff76eaf90a19 (patch)
tree8ff8cf3ab24d2f167c19217efb8175a8841c0359 /src/core/arm/skyeye_common
parentMerge pull request #906 from aroulin/loader-format-specifier-warning (diff)
parentCore: Cleanup hw includes. (diff)
downloadyuzu-867c28ae03b3b2883713896765f3ff76eaf90a19.tar
yuzu-867c28ae03b3b2883713896765f3ff76eaf90a19.tar.gz
yuzu-867c28ae03b3b2883713896765f3ff76eaf90a19.tar.bz2
yuzu-867c28ae03b3b2883713896765f3ff76eaf90a19.tar.lz
yuzu-867c28ae03b3b2883713896765f3ff76eaf90a19.tar.xz
yuzu-867c28ae03b3b2883713896765f3ff76eaf90a19.tar.zst
yuzu-867c28ae03b3b2883713896765f3ff76eaf90a19.zip
Diffstat (limited to 'src/core/arm/skyeye_common')
-rw-r--r--src/core/arm/skyeye_common/vfp/vfp.cpp6
-rw-r--r--src/core/arm/skyeye_common/vfp/vfpsingle.cpp4
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 592d32a74..1ffc1f9af 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"
@@ -143,9 +144,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;
}