nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-09-19 22:59:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address comment

Browse source
This commit is contained in:
Thomas Guillemard 2019-05-28 00:26:56 +02:00
parent a33ace8996
commit bbcb3757bd
No known key found for this signature in database
GPG key ID: 0CD291558FAFDBC6
2 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
stratosphere/creport/source/creport_debug_types.hpp
View file

@ -17,14 +17,15 @@
#pragma once #pragma once
#include <switch.h> #include <switch.h>
struct StackFrame64 { union StackFrame {
u64 fp; struct {
u64 lr; u64 fp;
}; u64 lr;
} frame_64;
struct StackFrame32 { struct {
u32 fp; u32 fp;
u32 lr; u32 lr;
} frame_32;
}; };
struct AttachProcessInfo { struct AttachProcessInfo {

16
stratosphere/creport/source/creport_thread_info.cpp
View file

@ -115,14 +115,14 @@ bool ThreadInfo::ReadFromProcess(std::map<u64, u64> &tls_map, Handle debug_handl
} }
/* Read a new frame. */ /* Read a new frame. */
StackFrame64 cur_frame; StackFrame cur_frame;
if (R_FAILED(svcReadDebugProcessMemory(&cur_frame, debug_handle, cur_fp, sizeof(StackFrame64)))) { if (R_FAILED(svcReadDebugProcessMemory(&cur_frame, debug_handle, cur_fp, sizeof(cur_frame.frame_64)))) {
break; break;
} }
/* Advance to the next frame. */ /* Advance to the next frame. */
this->stack_trace[this->stack_trace_size++] = cur_frame.lr; this->stack_trace[this->stack_trace_size++] = cur_frame.frame_64.lr;
cur_fp = cur_frame.fp; cur_fp = cur_frame.frame_64.fp;
} }
} else { } else {
for (unsigned int i = 0; i < sizeof(this->stack_trace)/sizeof(u64); i++) { for (unsigned int i = 0; i < sizeof(this->stack_trace)/sizeof(u64); i++) {
@ -132,14 +132,14 @@ bool ThreadInfo::ReadFromProcess(std::map<u64, u64> &tls_map, Handle debug_handl
} }
/* Read a new frame. */ /* Read a new frame. */
StackFrame32 cur_frame; StackFrame cur_frame;
if (R_FAILED(svcReadDebugProcessMemory(&cur_frame, debug_handle, cur_fp, sizeof(StackFrame32)))) { if (R_FAILED(svcReadDebugProcessMemory(&cur_frame, debug_handle, cur_fp, sizeof(cur_frame.frame_32)))) {
break; break;
} }
/* Advance to the next frame. */ /* Advance to the next frame. */
this->stack_trace[this->stack_trace_size++] = cur_frame.lr; this->stack_trace[this->stack_trace_size++] = cur_frame.frame_32.lr;
cur_fp = cur_frame.fp; cur_fp = cur_frame.frame_32.fp;
} }
} }