diff options
Diffstat (limited to 'src/core/arm')
| -rw-r--r-- | src/core/arm/arm_interface.cpp | 2 | ||||
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic_32.cpp | 6 | ||||
| -rw-r--r-- | src/core/arm/dynarmic/arm_dynarmic_64.cpp | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/core/arm/arm_interface.cpp b/src/core/arm/arm_interface.cpp index be3f55cd2..d30914b7a 100644 --- a/src/core/arm/arm_interface.cpp +++ b/src/core/arm/arm_interface.cpp | |||
| @@ -44,7 +44,7 @@ void ARM_Interface::SymbolicateBacktrace(Core::System& system, std::vector<Backt | |||
| 44 | std::map<std::string, Symbols::Symbols> symbols; | 44 | std::map<std::string, Symbols::Symbols> symbols; |
| 45 | for (const auto& module : modules) { | 45 | for (const auto& module : modules) { |
| 46 | symbols.insert_or_assign( | 46 | symbols.insert_or_assign( |
| 47 | module.second, Symbols::GetSymbols(module.first, system.Memory(), | 47 | module.second, Symbols::GetSymbols(module.first, system.ApplicationMemory(), |
| 48 | system.ApplicationProcess()->Is64BitProcess())); | 48 | system.ApplicationProcess()->Is64BitProcess())); |
| 49 | } | 49 | } |
| 50 | 50 | ||
diff --git a/src/core/arm/dynarmic/arm_dynarmic_32.cpp b/src/core/arm/dynarmic/arm_dynarmic_32.cpp index aa92d3fc3..cab21a88e 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_32.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_32.cpp | |||
| @@ -28,8 +28,8 @@ using namespace Common::Literals; | |||
| 28 | class DynarmicCallbacks32 : public Dynarmic::A32::UserCallbacks { | 28 | class DynarmicCallbacks32 : public Dynarmic::A32::UserCallbacks { |
| 29 | public: | 29 | public: |
| 30 | explicit DynarmicCallbacks32(ARM_Dynarmic_32& parent_) | 30 | explicit DynarmicCallbacks32(ARM_Dynarmic_32& parent_) |
| 31 | : parent{parent_}, | 31 | : parent{parent_}, memory(parent.system.ApplicationMemory()), |
| 32 | memory(parent.system.Memory()), debugger_enabled{parent.system.DebuggerEnabled()}, | 32 | debugger_enabled{parent.system.DebuggerEnabled()}, |
| 33 | check_memory_access{debugger_enabled || | 33 | check_memory_access{debugger_enabled || |
| 34 | !Settings::values.cpuopt_ignore_memory_aborts.GetValue()} {} | 34 | !Settings::values.cpuopt_ignore_memory_aborts.GetValue()} {} |
| 35 | 35 | ||
| @@ -468,7 +468,7 @@ void ARM_Dynarmic_32::PageTableChanged(Common::PageTable& page_table, | |||
| 468 | std::vector<ARM_Interface::BacktraceEntry> ARM_Dynarmic_32::GetBacktrace(Core::System& system, | 468 | std::vector<ARM_Interface::BacktraceEntry> ARM_Dynarmic_32::GetBacktrace(Core::System& system, |
| 469 | u64 fp, u64 lr, u64 pc) { | 469 | u64 fp, u64 lr, u64 pc) { |
| 470 | std::vector<BacktraceEntry> out; | 470 | std::vector<BacktraceEntry> out; |
| 471 | auto& memory = system.Memory(); | 471 | auto& memory = system.ApplicationMemory(); |
| 472 | 472 | ||
| 473 | out.push_back({"", 0, pc, 0, ""}); | 473 | out.push_back({"", 0, pc, 0, ""}); |
| 474 | 474 | ||
diff --git a/src/core/arm/dynarmic/arm_dynarmic_64.cpp b/src/core/arm/dynarmic/arm_dynarmic_64.cpp index 67073c84d..bbbcb4f9d 100644 --- a/src/core/arm/dynarmic/arm_dynarmic_64.cpp +++ b/src/core/arm/dynarmic/arm_dynarmic_64.cpp | |||
| @@ -28,8 +28,8 @@ using namespace Common::Literals; | |||
| 28 | class DynarmicCallbacks64 : public Dynarmic::A64::UserCallbacks { | 28 | class DynarmicCallbacks64 : public Dynarmic::A64::UserCallbacks { |
| 29 | public: | 29 | public: |
| 30 | explicit DynarmicCallbacks64(ARM_Dynarmic_64& parent_) | 30 | explicit DynarmicCallbacks64(ARM_Dynarmic_64& parent_) |
| 31 | : parent{parent_}, | 31 | : parent{parent_}, memory(parent.system.ApplicationMemory()), |
| 32 | memory(parent.system.Memory()), debugger_enabled{parent.system.DebuggerEnabled()}, | 32 | debugger_enabled{parent.system.DebuggerEnabled()}, |
| 33 | check_memory_access{debugger_enabled || | 33 | check_memory_access{debugger_enabled || |
| 34 | !Settings::values.cpuopt_ignore_memory_aborts.GetValue()} {} | 34 | !Settings::values.cpuopt_ignore_memory_aborts.GetValue()} {} |
| 35 | 35 | ||
| @@ -529,7 +529,7 @@ void ARM_Dynarmic_64::PageTableChanged(Common::PageTable& page_table, | |||
| 529 | std::vector<ARM_Interface::BacktraceEntry> ARM_Dynarmic_64::GetBacktrace(Core::System& system, | 529 | std::vector<ARM_Interface::BacktraceEntry> ARM_Dynarmic_64::GetBacktrace(Core::System& system, |
| 530 | u64 fp, u64 lr, u64 pc) { | 530 | u64 fp, u64 lr, u64 pc) { |
| 531 | std::vector<BacktraceEntry> out; | 531 | std::vector<BacktraceEntry> out; |
| 532 | auto& memory = system.Memory(); | 532 | auto& memory = system.ApplicationMemory(); |
| 533 | 533 | ||
| 534 | out.push_back({"", 0, pc, 0, ""}); | 534 | out.push_back({"", 0, pc, 0, ""}); |
| 535 | 535 | ||