From b2413b7464c344747d1b13fcdbffdd3ed7e2640c Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Tue, 22 Mar 2022 00:51:41 -0700 Subject: [PATCH] fatal: update for new 14.0.0 command --- .../stratosphere/fatal/fatal_types.hpp | 6 ++- .../fatal/impl/fatal_i_private_service.hpp | 5 ++- .../fatal/impl/fatal_i_service.hpp | 2 +- stratosphere/fatal/source/fatal_service.cpp | 44 +++++++++++++------ stratosphere/fatal/source/fatal_service.hpp | 1 + 5 files changed, 40 insertions(+), 18 deletions(-) diff --git a/libraries/libstratosphere/include/stratosphere/fatal/fatal_types.hpp b/libraries/libstratosphere/include/stratosphere/fatal/fatal_types.hpp index 67d464cab..1df55cb1b 100644 --- a/libraries/libstratosphere/include/stratosphere/fatal/fatal_types.hpp +++ b/libraries/libstratosphere/include/stratosphere/fatal/fatal_types.hpp @@ -21,7 +21,7 @@ namespace ams::fatal { - enum FatalPolicy { + enum FatalPolicy : u32 { FatalPolicy_ErrorReportAndErrorScreen = 0, FatalPolicy_ErrorReport = 1, FatalPolicy_ErrorScreen = 2 @@ -474,7 +474,9 @@ namespace ams::fatal { struct ThrowContext { Result result; + FatalPolicy policy; ncm::ProgramId program_id; + ncm::ProgramId throw_program_id; char proc_name[0xD]; bool is_creport; CpuContext cpu_ctx; @@ -488,7 +490,7 @@ namespace ams::fatal { u8 tls_dump[0x100]; ThrowContext(os::Event *erpt, os::Event *bat) - : result(ResultSuccess()), program_id(), proc_name(), is_creport(), cpu_ctx(), generate_error_report(), + : result(ResultSuccess()), policy(), program_id(), throw_program_id(), proc_name(), is_creport(), cpu_ctx(), generate_error_report(), erpt_event(erpt), battery_event(bat), stack_dump_size(), stack_dump_base(), stack_dump(), tls_address(), tls_dump() { diff --git a/libraries/libstratosphere/include/stratosphere/fatal/impl/fatal_i_private_service.hpp b/libraries/libstratosphere/include/stratosphere/fatal/impl/fatal_i_private_service.hpp index 29f4071ff..3b051875c 100644 --- a/libraries/libstratosphere/include/stratosphere/fatal/impl/fatal_i_private_service.hpp +++ b/libraries/libstratosphere/include/stratosphere/fatal/impl/fatal_i_private_service.hpp @@ -19,7 +19,8 @@ #include #include -#define AMS_FATAL_I_PRIVATE_SERVICE_INTERFACE_INFO(C, H) \ - AMS_SF_METHOD_INFO(C, H, 0, Result, GetFatalEvent, (sf::OutCopyHandle out_h), (out_h)) +#define AMS_FATAL_I_PRIVATE_SERVICE_INTERFACE_INFO(C, H) \ + AMS_SF_METHOD_INFO(C, H, 0, Result, GetFatalEvent, (sf::OutCopyHandle out_h), (out_h)) \ + AMS_SF_METHOD_INFO(C, H, 10, Result, GetFatalContext, (sf::Out out_error, sf::Out out_program_id, sf::Out out_policy, sf::Out out_ctx), (out_error, out_program_id, out_policy, out_ctx)) AMS_SF_DEFINE_INTERFACE(ams::fatal::impl, IPrivateService, AMS_FATAL_I_PRIVATE_SERVICE_INTERFACE_INFO) diff --git a/libraries/libstratosphere/include/stratosphere/fatal/impl/fatal_i_service.hpp b/libraries/libstratosphere/include/stratosphere/fatal/impl/fatal_i_service.hpp index c8406fe28..f3649856b 100644 --- a/libraries/libstratosphere/include/stratosphere/fatal/impl/fatal_i_service.hpp +++ b/libraries/libstratosphere/include/stratosphere/fatal/impl/fatal_i_service.hpp @@ -19,7 +19,7 @@ #include #include -#define AMS_FATAL_I_SERVICE_INTERFACE_INFO(C, H) \ +#define AMS_FATAL_I_SERVICE_INTERFACE_INFO(C, H) \ AMS_SF_METHOD_INFO(C, H, 0, Result, ThrowFatal, (Result error, const sf::ClientProcessId &client_pid), (error, client_pid)) \ AMS_SF_METHOD_INFO(C, H, 1, Result, ThrowFatalWithPolicy, (Result error, const sf::ClientProcessId &client_pid, fatal::FatalPolicy policy), (error, client_pid, policy)) \ AMS_SF_METHOD_INFO(C, H, 2, Result, ThrowFatalWithCpuContext, (Result error, const sf::ClientProcessId &client_pid, fatal::FatalPolicy policy, const fatal::CpuContext &cpu_ctx), (error, client_pid, policy, cpu_ctx)) diff --git a/stratosphere/fatal/source/fatal_service.cpp b/stratosphere/fatal/source/fatal_service.cpp index dc07c91f7..3668dfce6 100644 --- a/stratosphere/fatal/source/fatal_service.cpp +++ b/stratosphere/fatal/source/fatal_service.cpp @@ -37,7 +37,7 @@ namespace ams::fatal::srv { Result TrySetHasThrown() { R_UNLESS(!m_has_thrown, fatal::ResultAlreadyThrown()); m_has_thrown = true; - return ResultSuccess(); + R_SUCCEED(); } public: ServiceContext() @@ -48,15 +48,25 @@ namespace ams::fatal::srv { } Result GetEvent(const os::SystemEventType **out) { - return m_event_manager.GetEvent(out); + R_RETURN(m_event_manager.GetEvent(out)); + } + + Result GetThrowContext(Result *out_error, ncm::ProgramId *out_program_id, FatalPolicy *out_policy, CpuContext *out_ctx) { + /* Set the output. */ + *out_error = m_context.result; + *out_program_id = m_context.throw_program_id; + *out_policy = m_context.policy; + *out_ctx = m_context.cpu_ctx; + + R_SUCCEED(); } Result ThrowFatal(Result result, os::ProcessId process_id) { - return this->ThrowFatalWithCpuContext(result, process_id, FatalPolicy_ErrorReportAndErrorScreen, {}); + R_RETURN(this->ThrowFatalWithCpuContext(result, process_id, FatalPolicy_ErrorReportAndErrorScreen, {})); } Result ThrowFatalWithPolicy(Result result, os::ProcessId process_id, FatalPolicy policy) { - return this->ThrowFatalWithCpuContext(result, process_id, policy, {}); + R_RETURN(this->ThrowFatalWithCpuContext(result, process_id, policy, {})); } Result ThrowFatalWithCpuContext(Result result, os::ProcessId process_id, FatalPolicy policy, const CpuContext &cpu_ctx); @@ -74,8 +84,9 @@ namespace ams::fatal::srv { R_TRY(this->TrySetHasThrown()); /* At this point we have exclusive access to m_context. */ - m_context.result = result; + m_context.result = result; m_context.cpu_ctx = cpu_ctx; + m_context.policy = policy; /* Cap the stack trace to a sane limit. */ if (cpu_ctx.architecture == CpuContext::Architecture_Aarch64) { @@ -85,10 +96,13 @@ namespace ams::fatal::srv { } /* Get program id. */ - pm::info::GetProgramId(std::addressof(m_context.program_id), process_id); - m_context.is_creport = (m_context.program_id == ncm::SystemProgramId::Creport); + pm::info::GetProgramId(std::addressof(m_context.throw_program_id), process_id); + m_context.is_creport = (m_context.throw_program_id == ncm::SystemProgramId::Creport); + if (!m_context.is_creport) { + m_context.program_id = m_context.throw_program_id; + /* On firmware version 2.0.0, use debugging SVCs to collect information. */ if (hos::GetVersion() >= hos::Version_2_0_0) { fatal::srv::TryCollectDebugInformation(std::addressof(m_context), process_id); @@ -124,32 +138,36 @@ namespace ams::fatal::srv { AMS_UNREACHABLE_DEFAULT_CASE(); } - return ResultSuccess(); + R_SUCCEED(); } } Result ThrowFatalForSelf(Result result) { - return g_context.ThrowFatalWithPolicy(result, os::GetCurrentProcessId(), FatalPolicy_ErrorScreen); + R_RETURN(g_context.ThrowFatalWithPolicy(result, os::GetCurrentProcessId(), FatalPolicy_ErrorScreen)); } Result Service::ThrowFatal(Result result, const sf::ClientProcessId &client_pid) { - return g_context.ThrowFatal(result, client_pid.GetValue()); + R_RETURN(g_context.ThrowFatal(result, client_pid.GetValue())); } Result Service::ThrowFatalWithPolicy(Result result, const sf::ClientProcessId &client_pid, FatalPolicy policy) { - return g_context.ThrowFatalWithPolicy(result, client_pid.GetValue(), policy); + R_RETURN(g_context.ThrowFatalWithPolicy(result, client_pid.GetValue(), policy)); } Result Service::ThrowFatalWithCpuContext(Result result, const sf::ClientProcessId &client_pid, FatalPolicy policy, const CpuContext &cpu_ctx) { - return g_context.ThrowFatalWithCpuContext(result, client_pid.GetValue(), policy, cpu_ctx); + R_RETURN(g_context.ThrowFatalWithCpuContext(result, client_pid.GetValue(), policy, cpu_ctx)); } Result Service::GetFatalEvent(sf::OutCopyHandle out_h) { const os::SystemEventType *event; R_TRY(g_context.GetEvent(std::addressof(event))); out_h.SetValue(os::GetReadableHandleOfSystemEvent(event), false); - return ResultSuccess(); + R_SUCCEED(); + } + + Result Service::GetFatalContext(sf::Out out_error, sf::Out out_program_id, sf::Out out_policy, sf::Out out_ctx) { + R_RETURN(g_context.GetThrowContext(out_error.GetPointer(), out_program_id.GetPointer(), out_policy.GetPointer(), out_ctx.GetPointer())); } } \ No newline at end of file diff --git a/stratosphere/fatal/source/fatal_service.hpp b/stratosphere/fatal/source/fatal_service.hpp index d5033d2ea..99e7d8d69 100644 --- a/stratosphere/fatal/source/fatal_service.hpp +++ b/stratosphere/fatal/source/fatal_service.hpp @@ -24,6 +24,7 @@ namespace ams::fatal::srv { Result ThrowFatalWithPolicy(Result error, const sf::ClientProcessId &client_pid, FatalPolicy policy); Result ThrowFatalWithCpuContext(Result error, const sf::ClientProcessId &client_pid, FatalPolicy policy, const CpuContext &cpu_ctx); Result GetFatalEvent(sf::OutCopyHandle out_h); + Result GetFatalContext(sf::Out out_error, sf::Out out_program_id, sf::Out out_policy, sf::Out out_ctx); }; static_assert(fatal::impl::IsIService); static_assert(fatal::impl::IsIPrivateService);