diff --git a/libstratosphere/include/stratosphere/fatal/fatal_types.hpp b/libstratosphere/include/stratosphere/fatal/fatal_types.hpp index 1df55cb1..68ce1032 100644 --- a/libstratosphere/include/stratosphere/fatal/fatal_types.hpp +++ b/libstratosphere/include/stratosphere/fatal/fatal_types.hpp @@ -24,7 +24,7 @@ namespace ams::fatal { enum FatalPolicy : u32 { FatalPolicy_ErrorReportAndErrorScreen = 0, FatalPolicy_ErrorReport = 1, - FatalPolicy_ErrorScreen = 2 + FatalPolicy_ErrorScreen = 2, }; #if defined(ATMOSPHERE_ARCH_ARM64) @@ -470,6 +470,14 @@ namespace ams::fatal { #endif static_assert(util::is_pod::value && sizeof(CpuContext) == 0x250, "CpuContext definition!"); + struct HashedTraceContext { + u8 data[0x20]; + u32 data_count; + }; + static_assert(util::is_pod::value); + static_assert(sizeof(HashedTraceContext) == 0x24); + static_assert(alignof(HashedTraceContext) == 0x4); + namespace srv { struct ThrowContext { @@ -480,6 +488,7 @@ namespace ams::fatal { char proc_name[0xD]; bool is_creport; CpuContext cpu_ctx; + HashedTraceContext hashed_trace_ctx; bool generate_error_report; os::Event *erpt_event; os::Event *battery_event; @@ -490,7 +499,7 @@ namespace ams::fatal { u8 tls_dump[0x100]; ThrowContext(os::Event *erpt, os::Event *bat) - : result(ResultSuccess()), policy(), program_id(), throw_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(), hashed_trace_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_service.hpp b/libstratosphere/include/stratosphere/fatal/impl/fatal_i_service.hpp index afa10984..6288c536 100644 --- a/libstratosphere/include/stratosphere/fatal/impl/fatal_i_service.hpp +++ b/libstratosphere/include/stratosphere/fatal/impl/fatal_i_service.hpp @@ -19,9 +19,10 @@ #include #include -#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)) +#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)) \ + AMS_SF_METHOD_INFO(C, H, 3, Result, ThrowFatalWithHashedTraceContext, (Result error, const sf::ClientProcessId &client_pid, ncm::ProgramId program_id, const fatal::HashedTraceContext &htc), (error, client_pid, program_id, htc)) AMS_SF_DEFINE_INTERFACE(ams::fatal::impl, IService, AMS_FATAL_I_SERVICE_INTERFACE_INFO, 0x91328766)