summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorarchshift <gh@archshift.com>2015-05-17 07:06:59 +0200
committerarchshift <gh@archshift.com>2015-05-17 07:06:59 +0200
commit11057488f94ec8ec012ddd524d7c1acb530c9788 (patch)
tree95feeb0dfe11181a9883bed9d2cf4424252ce257 /src/core
parentMerge pull request #781 from archshift/delete (diff)
downloadyuzu-11057488f94ec8ec012ddd524d7c1acb530c9788.tar
yuzu-11057488f94ec8ec012ddd524d7c1acb530c9788.tar.gz
yuzu-11057488f94ec8ec012ddd524d7c1acb530c9788.tar.bz2
yuzu-11057488f94ec8ec012ddd524d7c1acb530c9788.tar.lz
yuzu-11057488f94ec8ec012ddd524d7c1acb530c9788.tar.xz
yuzu-11057488f94ec8ec012ddd524d7c1acb530c9788.tar.zst
yuzu-11057488f94ec8ec012ddd524d7c1acb530c9788.zip
Diffstat (limited to 'src/core')
-rw-r--r--src/core/hle/function_wrappers.h4
-rw-r--r--src/core/hle/svc.cpp14
2 files changed, 17 insertions, 1 deletions
diff --git a/src/core/hle/function_wrappers.h b/src/core/hle/function_wrappers.h
index 0e5ae29ae..23c86a72d 100644
--- a/src/core/hle/function_wrappers.h
+++ b/src/core/hle/function_wrappers.h
@@ -166,6 +166,10 @@ template<void func(const char*)> void Wrap() {
func((char*)Memory::GetPointer(PARAM(0)));
}
+template<void func(u8)> void Wrap() {
+ func((u8)PARAM(0));
+}
+
#undef PARAM
#undef FuncReturn
diff --git a/src/core/hle/svc.cpp b/src/core/hle/svc.cpp
index 654ee2bf6..22adf9595 100644
--- a/src/core/hle/svc.cpp
+++ b/src/core/hle/svc.cpp
@@ -296,6 +296,18 @@ static ResultCode ArbitrateAddress(Handle handle, u32 address, u32 type, u32 val
return res;
}
+static void Break(u8 break_reason) {
+ LOG_CRITICAL(Debug_Emulated, "Emulated program broke execution!");
+ std::string reason_str;
+ switch (break_reason) {
+ case 0: reason_str = "PANIC"; break;
+ case 1: reason_str = "ASSERT"; break;
+ case 2: reason_str = "USER"; break;
+ default: reason_str = "UNKNOWN"; break;
+ }
+ LOG_CRITICAL(Debug_Emulated, "Break reason: %s", reason_str.c_str());
+}
+
/// Used to output a message on a debug hardware unit - does nothing on a retail unit
static void OutputDebugString(const char* string) {
LOG_DEBUG(Debug_Emulated, "%s", string);
@@ -737,7 +749,7 @@ static const FunctionDef SVC_Table[] = {
{0x39, HLE::Wrap<GetResourceLimitLimitValues>, "GetResourceLimitLimitValues"},
{0x3A, HLE::Wrap<GetResourceLimitCurrentValues>, "GetResourceLimitCurrentValues"},
{0x3B, nullptr, "GetThreadContext"},
- {0x3C, nullptr, "Break"},
+ {0x3C, HLE::Wrap<Break>, "Break"},
{0x3D, HLE::Wrap<OutputDebugString>, "OutputDebugString"},
{0x3E, nullptr, "ControlPerformanceCounter"},
{0x3F, nullptr, "Unknown"},