mika/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-11-18 18:11:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

fatal: add new HashedTraceContext command

Browse Source
This commit is contained in:
Michael Scire 2025-11-12 14:38:28 -07:00 committed by SciresM
parent 94c36a3255
commit 4201bbff63
4 changed files with 43 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/libstratosphere/include/stratosphere/fatal/fatal_types.hpp
View File

@ -24,7 +24,7 @@ namespace ams::fatal {
enum FatalPolicy : u32 { enum FatalPolicy : u32 {
FatalPolicy_ErrorReportAndErrorScreen = 0, FatalPolicy_ErrorReportAndErrorScreen = 0,
FatalPolicy_ErrorReport = 1, FatalPolicy_ErrorReport = 1,
FatalPolicy_ErrorScreen = 2 FatalPolicy_ErrorScreen = 2,
}; };
#if defined(ATMOSPHERE_ARCH_ARM64) #if defined(ATMOSPHERE_ARCH_ARM64)
@ -470,6 +470,14 @@ namespace ams::fatal {
#endif #endif
static_assert(util::is_pod<CpuContext>::value && sizeof(CpuContext) == 0x250, "CpuContext definition!"); static_assert(util::is_pod<CpuContext>::value && sizeof(CpuContext) == 0x250, "CpuContext definition!");
struct HashedTraceContext {
u8 data[0x20];
u32 data_count;
};
static_assert(util::is_pod<HashedTraceContext>::value);
static_assert(sizeof(HashedTraceContext) == 0x24);
static_assert(alignof(HashedTraceContext) == 0x4);
namespace srv { namespace srv {
struct ThrowContext { struct ThrowContext {
@ -480,6 +488,7 @@ namespace ams::fatal {
char proc_name[0xD]; char proc_name[0xD];
bool is_creport; bool is_creport;
CpuContext cpu_ctx; CpuContext cpu_ctx;
HashedTraceContext hashed_trace_ctx;
bool generate_error_report; bool generate_error_report;
os::Event *erpt_event; os::Event *erpt_event;
os::Event *battery_event; os::Event *battery_event;
@ -490,7 +499,7 @@ namespace ams::fatal {
u8 tls_dump[0x100]; u8 tls_dump[0x100];
ThrowContext(os::Event *erpt, os::Event *bat) 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), erpt_event(erpt), battery_event(bat),
stack_dump_size(), stack_dump_base(), stack_dump(), tls_address(), tls_dump() stack_dump_size(), stack_dump_base(), stack_dump(), tls_address(), tls_dump()
{ {

9
libraries/libstratosphere/include/stratosphere/fatal/impl/fatal_i_service.hpp
View File

@ -19,9 +19,10 @@
#include <stratosphere/fatal/fatal_types.hpp> #include <stratosphere/fatal/fatal_types.hpp>
#include <stratosphere/sf.hpp> #include <stratosphere/sf.hpp>
#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, 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, 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, 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) AMS_SF_DEFINE_INTERFACE(ams::fatal::impl, IService, AMS_FATAL_I_SERVICE_INTERFACE_INFO, 0x91328766)

32
stratosphere/fatal/source/fatal_service.cpp
View File

@ -69,14 +69,22 @@ namespace ams::fatal::srv {
R_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); Result ThrowFatalWithCpuContext(Result result, os::ProcessId process_id, FatalPolicy policy, const CpuContext &cpu_ctx) {
R_RETURN(this->ThrowFatalWithAllContext(result, process_id, ncm::InvalidProgramId, policy, cpu_ctx, {}));
}
Result ThrowFatalWithHashedTraceContext(Result result, os::ProcessId process_id, ncm::ProgramId program_id, const HashedTraceContext &htc) {
R_RETURN(this->ThrowFatalWithAllContext(result, process_id, program_id, FatalPolicy_ErrorScreen, {}, htc));
}
Result ThrowFatalWithAllContext(Result result, os::ProcessId process_id, ncm::ProgramId program_id, FatalPolicy policy, const CpuContext &cpu_ctx, const HashedTraceContext &htc);
}; };
/* Context global. */ /* Context global. */
ServiceContext g_context; ServiceContext g_context;
/* Throw implementation. */ /* Throw implementation. */
Result ServiceContext::ThrowFatalWithCpuContext(Result result, os::ProcessId process_id, FatalPolicy policy, const CpuContext &cpu_ctx) { Result ServiceContext::ThrowFatalWithAllContext(Result result, os::ProcessId process_id, ncm::ProgramId program_id, FatalPolicy policy, const CpuContext &cpu_ctx, const HashedTraceContext &htc) {
/* We don't support Error-Report-only fatals. */ /* We don't support Error-Report-only fatals. */
R_SUCCEED_IF(policy == FatalPolicy_ErrorReport); R_SUCCEED_IF(policy == FatalPolicy_ErrorReport);
@ -84,9 +92,10 @@ namespace ams::fatal::srv {
R_TRY(this->TrySetHasThrown()); R_TRY(this->TrySetHasThrown());
/* At this point we have exclusive access to m_context. */ /* 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.cpu_ctx = cpu_ctx;
m_context.policy = policy; m_context.policy = policy;
m_context.hashed_trace_ctx = htc;
/* Cap the stack trace to a sane limit. */ /* Cap the stack trace to a sane limit. */
if (cpu_ctx.architecture == CpuContext::Architecture_Aarch64) { if (cpu_ctx.architecture == CpuContext::Architecture_Aarch64) {
@ -96,7 +105,14 @@ namespace ams::fatal::srv {
} }
/* Get program id. */ /* Get program id. */
pm::info::GetProgramId(std::addressof(m_context.throw_program_id), process_id); if (program_id != ncm::InvalidProgramId) {
m_context.throw_program_id = program_id;
} else {
if (R_FAILED(pm::info::GetProgramId(std::addressof(m_context.throw_program_id), process_id))) {
m_context.throw_program_id = ncm::InvalidProgramId;
}
}
m_context.is_creport = (m_context.throw_program_id == ncm::SystemProgramId::Creport); m_context.is_creport = (m_context.throw_program_id == ncm::SystemProgramId::Creport);
@ -159,6 +175,10 @@ namespace ams::fatal::srv {
R_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::ThrowFatalWithHashedTraceContext(Result result, const sf::ClientProcessId &client_pid, ncm::ProgramId program_id, const HashedTraceContext &htc) {
R_RETURN(g_context.ThrowFatalWithHashedTraceContext(result, client_pid.GetValue(), program_id, htc));
}
Result Service::GetFatalEvent(sf::OutCopyHandle out_h) { Result Service::GetFatalEvent(sf::OutCopyHandle out_h) {
const os::SystemEventType *event; const os::SystemEventType *event;
R_TRY(g_context.GetEvent(std::addressof(event))); R_TRY(g_context.GetEvent(std::addressof(event)));

1
stratosphere/fatal/source/fatal_service.hpp
View File

@ -23,6 +23,7 @@ namespace ams::fatal::srv {
Result ThrowFatal(Result error, const sf::ClientProcessId &client_pid); Result ThrowFatal(Result error, const sf::ClientProcessId &client_pid);
Result ThrowFatalWithPolicy(Result error, const sf::ClientProcessId &client_pid, FatalPolicy policy); 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 ThrowFatalWithCpuContext(Result error, const sf::ClientProcessId &client_pid, FatalPolicy policy, const CpuContext &cpu_ctx);
Result ThrowFatalWithHashedTraceContext(Result error, const sf::ClientProcessId &client_pid, ncm::ProgramId program_id, const fatal::HashedTraceContext &htc);
Result GetFatalEvent(sf::OutCopyHandle out_h); Result GetFatalEvent(sf::OutCopyHandle out_h);
Result GetFatalContext(sf::Out<Result> out_error, sf::Out<ncm::ProgramId> out_program_id, sf::Out<fatal::FatalPolicy> out_policy, sf::Out<fatal::CpuContext> out_ctx); Result GetFatalContext(sf::Out<Result> out_error, sf::Out<ncm::ProgramId> out_program_id, sf::Out<fatal::FatalPolicy> out_policy, sf::Out<fatal::CpuContext> out_ctx);
}; };