nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-22 20:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

fatal: update for new 14.0.0 command

Browse source
This commit is contained in:
Michael Scire 2022-03-22 00:51:41 -07:00
parent fa330deeba
commit b2413b7464
5 changed files with 40 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/libstratosphere/include/stratosphere/fatal/fatal_types.hpp
View file

@ -21,7 +21,7 @@
namespace ams::fatal { namespace ams::fatal {
enum FatalPolicy { enum FatalPolicy : u32 {
FatalPolicy_ErrorReportAndErrorScreen = 0, FatalPolicy_ErrorReportAndErrorScreen = 0,
FatalPolicy_ErrorReport = 1, FatalPolicy_ErrorReport = 1,
FatalPolicy_ErrorScreen = 2 FatalPolicy_ErrorScreen = 2
@ -474,7 +474,9 @@ namespace ams::fatal {
struct ThrowContext { struct ThrowContext {
Result result; Result result;
FatalPolicy policy;
ncm::ProgramId program_id; ncm::ProgramId program_id;
ncm::ProgramId throw_program_id;
char proc_name[0xD]; char proc_name[0xD];
bool is_creport; bool is_creport;
CpuContext cpu_ctx; CpuContext cpu_ctx;
@ -488,7 +490,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()), 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), 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()
{ {

5
libraries/libstratosphere/include/stratosphere/fatal/impl/fatal_i_private_service.hpp
View file

@ -19,7 +19,8 @@
#include <stratosphere/fatal/fatal_types.hpp> #include <stratosphere/fatal/fatal_types.hpp>
#include <stratosphere/sf.hpp> #include <stratosphere/sf.hpp>
#define AMS_FATAL_I_PRIVATE_SERVICE_INTERFACE_INFO(C, 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, 0, Result, GetFatalEvent, (sf::OutCopyHandle out_h), (out_h)) \
AMS_SF_METHOD_INFO(C, H, 10, 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), (out_error, out_program_id, out_policy, out_ctx))
AMS_SF_DEFINE_INTERFACE(ams::fatal::impl, IPrivateService, AMS_FATAL_I_PRIVATE_SERVICE_INTERFACE_INFO) AMS_SF_DEFINE_INTERFACE(ams::fatal::impl, IPrivateService, AMS_FATAL_I_PRIVATE_SERVICE_INTERFACE_INFO)

2
libraries/libstratosphere/include/stratosphere/fatal/impl/fatal_i_service.hpp
View file

@ -19,7 +19,7 @@
#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))

44
stratosphere/fatal/source/fatal_service.cpp
View file

@ -37,7 +37,7 @@ namespace ams::fatal::srv {
Result TrySetHasThrown() { Result TrySetHasThrown() {
R_UNLESS(!m_has_thrown, fatal::ResultAlreadyThrown()); R_UNLESS(!m_has_thrown, fatal::ResultAlreadyThrown());
m_has_thrown = true; m_has_thrown = true;
return ResultSuccess(); R_SUCCEED();
} }
public: public:
ServiceContext() ServiceContext()
@ -48,15 +48,25 @@ namespace ams::fatal::srv {
} }
Result GetEvent(const os::SystemEventType **out) { 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) { 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) { 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); 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()); 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;
/* 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) {
@ -85,10 +96,13 @@ namespace ams::fatal::srv {
} }
/* Get program id. */ /* Get program id. */
pm::info::GetProgramId(std::addressof(m_context.program_id), process_id); pm::info::GetProgramId(std::addressof(m_context.throw_program_id), process_id);
m_context.is_creport = (m_context.program_id == ncm::SystemProgramId::Creport); m_context.is_creport = (m_context.throw_program_id == ncm::SystemProgramId::Creport);
if (!m_context.is_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. */ /* On firmware version 2.0.0, use debugging SVCs to collect information. */
if (hos::GetVersion() >= hos::Version_2_0_0) { if (hos::GetVersion() >= hos::Version_2_0_0) {
fatal::srv::TryCollectDebugInformation(std::addressof(m_context), process_id); fatal::srv::TryCollectDebugInformation(std::addressof(m_context), process_id);
@ -124,32 +138,36 @@ namespace ams::fatal::srv {
AMS_UNREACHABLE_DEFAULT_CASE(); AMS_UNREACHABLE_DEFAULT_CASE();
} }
return ResultSuccess(); R_SUCCEED();
} }
} }
Result ThrowFatalForSelf(Result result) { 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) { 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) { 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) { 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) { 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)));
out_h.SetValue(os::GetReadableHandleOfSystemEvent(event), false); out_h.SetValue(os::GetReadableHandleOfSystemEvent(event), false);
return ResultSuccess(); R_SUCCEED();
}
Result Service::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) {
R_RETURN(g_context.GetThrowContext(out_error.GetPointer(), out_program_id.GetPointer(), out_policy.GetPointer(), out_ctx.GetPointer()));
} }
} }

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

@ -24,6 +24,7 @@ namespace ams::fatal::srv {
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 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);
}; };
static_assert(fatal::impl::IsIService<Service>); static_assert(fatal::impl::IsIService<Service>);
static_assert(fatal::impl::IsIPrivateService<Service>); static_assert(fatal::impl::IsIPrivateService<Service>);