1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2024-11-26 22:02:15 +00:00

creport: Parse info for crashed thread

This commit is contained in:
Michael Scire 2018-06-25 03:04:17 -06:00
parent 7cd44e8980
commit e6b7793916
5 changed files with 104 additions and 1 deletions

View file

@ -113,7 +113,8 @@ void CrashReport::HandleException(DebugEventInfo &d) {
default: default:
return; return;
} }
/* TODO: Parse crashing thread info. */ /* Parse crashing thread info. */
this->crashed_thread_info.ReadFromProcess(this->debug_handle, d.thread_id, Is64Bit());
} }
bool CrashReport::IsAddressReadable(u64 address, u64 size, MemoryInfo *o_mi) { bool CrashReport::IsAddressReadable(u64 address, u64 size, MemoryInfo *o_mi) {

View file

@ -3,6 +3,7 @@
#include <switch.h> #include <switch.h>
#include "creport_debug_types.hpp" #include "creport_debug_types.hpp"
#include "creport_thread_info.hpp"
enum class CrashReportResult : Result { enum class CrashReportResult : Result {
UndefinedInstruction = 0x00A8, UndefinedInstruction = 0x00A8,
@ -31,6 +32,7 @@ class CrashReport {
/* Exception Info. */ /* Exception Info. */
ExceptionInfo exception_info; ExceptionInfo exception_info;
ThreadInfo crashed_thread_info;
public: public:
CrashReport() : debug_handle(INVALID_HANDLE), result((Result)CrashReportResult::IncompleteReport), process_info({}), exception_info({}) { } CrashReport() : debug_handle(INVALID_HANDLE), result((Result)CrashReportResult::IncompleteReport), process_info({}), exception_info({}) { }

View file

@ -1,6 +1,11 @@
#pragma once #pragma once
#include <switch.h> #include <switch.h>
struct StackFrame {
u64 fp;
u64 lr;
};
struct AttachProcessInfo { struct AttachProcessInfo {
u64 title_id; u64 title_id;
u64 process_id; u64 process_id;

View file

@ -0,0 +1,50 @@
#include <switch.h>
#include "creport_thread_info.hpp"
bool ThreadInfo::ReadFromProcess(Handle debug_handle, u64 thread_id, bool is_64_bit) {
this->thread_id = thread_id;
/* Verify that the thread is running or waiting. */
{
u64 _;
u32 thread_state;
if (R_FAILED(svcGetDebugThreadParam(&_, &thread_state, debug_handle, this->thread_id, DebugThreadParam_State))) {
return false;
}
if (thread_state > 1) {
return false;
}
}
/* Get the thread context. */
if (R_FAILED(svcGetDebugThreadContext((u8 *)&this->context, debug_handle, this->thread_id, 0xF))) {
return false;
}
/* Don't try to parse stack frames if 32-bit. */
if (!is_64_bit) {
return true;
}
u64 cur_fp = this->context.fp;
for (unsigned int i = 0; i < sizeof(this->stack_trace)/sizeof(u64); i++) {
/* Validate the current frame. */
if (cur_fp == 0 || (cur_fp & 0xF)) {
break;
}
/* Read a new frame. */
StackFrame cur_frame;
if (R_FAILED(svcReadDebugProcessMemory(&cur_frame, debug_handle, cur_fp, sizeof(StackFrame)))) {
break;
}
/* Advance to the next frame. */
this->stack_trace[this->stack_trace_size++] = cur_frame.lr;
cur_fp = cur_frame.lr;
}
return true;
}

View file

@ -0,0 +1,45 @@
#pragma once
#include <switch.h>
#include "creport_debug_types.hpp"
struct FpuReg {
u64 _[2]; /* TODO: uint128? */
};
struct DebugThreadContext {
union {
u64 x[0x20];
struct {
u64 _x[29];
u64 fp;
u64 lr;
u64 sp;
};
};
u64 pc;
u32 psr;
/* 32-bits of padding. */
FpuReg fpu_reg[0x20];
u32 fpcr;
u32 fpsr;
u64 tpidr;
};
static_assert(sizeof(DebugThreadContext) == 0x320, "Incorrect DebugThreadContext Definition!");
class ThreadInfo {
private:
DebugThreadContext context;
u64 thread_id;
u64 stack_top;
u64 stack_bottom;
u64 stack_trace[0x20];
u32 stack_trace_size;
public:
ThreadInfo() {
(*this) = {};
}
bool ReadFromProcess(Handle debug_handle, u64 thread_id, bool is_64_bit);
};