summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/core/reporter.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/core/reporter.cpp b/src/core/reporter.cpp
index c1592256d..558cbe6d7 100644
--- a/src/core/reporter.cpp
+++ b/src/core/reporter.cpp
@@ -16,9 +16,11 @@
16#include "core/arm/arm_interface.h" 16#include "core/arm/arm_interface.h"
17#include "core/core.h" 17#include "core/core.h"
18#include "core/hle/kernel/hle_ipc.h" 18#include "core/hle/kernel/hle_ipc.h"
19#include "core/hle/kernel/memory/page_table.h"
19#include "core/hle/kernel/process.h" 20#include "core/hle/kernel/process.h"
20#include "core/hle/result.h" 21#include "core/hle/result.h"
21#include "core/hle/service/lm/manager.h" 22#include "core/hle/service/lm/manager.h"
23#include "core/memory.h"
22#include "core/reporter.h" 24#include "core/reporter.h"
23#include "core/settings.h" 25#include "core/settings.h"
24 26
@@ -108,14 +110,13 @@ json GetProcessorStateData(const std::string& architecture, u64 entry_point, u64
108 110
109json GetProcessorStateDataAuto(Core::System& system) { 111json GetProcessorStateDataAuto(Core::System& system) {
110 const auto* process{system.CurrentProcess()}; 112 const auto* process{system.CurrentProcess()};
111 const auto& vm_manager{process->VMManager()};
112 auto& arm{system.CurrentArmInterface()}; 113 auto& arm{system.CurrentArmInterface()};
113 114
114 Core::ARM_Interface::ThreadContext64 context{}; 115 Core::ARM_Interface::ThreadContext64 context{};
115 arm.SaveContext(context); 116 arm.SaveContext(context);
116 117
117 return GetProcessorStateData(process->Is64BitProcess() ? "AArch64" : "AArch32", 118 return GetProcessorStateData(process->Is64BitProcess() ? "AArch64" : "AArch32",
118 vm_manager.GetCodeRegionBaseAddress(), context.sp, context.pc, 119 process->PageTable().GetCodeRegionStart(), context.sp, context.pc,
119 context.pstate, context.cpu_registers); 120 context.pstate, context.cpu_registers);
120} 121}
121 122
@@ -147,7 +148,8 @@ json GetFullDataAuto(const std::string& timestamp, u64 title_id, Core::System& s
147} 148}
148 149
149template <bool read_value, typename DescriptorType> 150template <bool read_value, typename DescriptorType>
150json GetHLEBufferDescriptorData(const std::vector<DescriptorType>& buffer, Core::Memory::Memory& memory) { 151json GetHLEBufferDescriptorData(const std::vector<DescriptorType>& buffer,
152 Core::Memory::Memory& memory) {
151 auto buffer_out = json::array(); 153 auto buffer_out = json::array();
152 for (const auto& desc : buffer) { 154 for (const auto& desc : buffer) {
153 auto entry = json{ 155 auto entry = json{