From a1aea1cb4803d50a3fafd20f0133dc61f69d9cff 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 --- libstratosphere/include/stratosphere/fatal/fatal_types.hpp | 6 ++++-- .../stratosphere/fatal/impl/fatal_i_private_service.hpp | 5 +++-- .../include/stratosphere/fatal/impl/fatal_i_service.hpp | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/libstratosphere/include/stratosphere/fatal/fatal_types.hpp b/libstratosphere/include/stratosphere/fatal/fatal_types.hpp index 67d464ca..1df55cb1 100644 --- a/libstratosphere/include/stratosphere/fatal/fatal_types.hpp +++ b/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/libstratosphere/include/stratosphere/fatal/impl/fatal_i_private_service.hpp b/libstratosphere/include/stratosphere/fatal/impl/fatal_i_private_service.hpp index 29f4071f..3b051875 100644 --- a/libstratosphere/include/stratosphere/fatal/impl/fatal_i_private_service.hpp +++ b/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/libstratosphere/include/stratosphere/fatal/impl/fatal_i_service.hpp b/libstratosphere/include/stratosphere/fatal/impl/fatal_i_service.hpp index c8406fe2..f3649856 100644 --- a/libstratosphere/include/stratosphere/fatal/impl/fatal_i_service.hpp +++ b/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))