diff options
| author | 2019-05-30 08:52:20 -0400 | |
|---|---|---|
| committer | 2019-06-20 19:22:04 -0400 | |
| commit | 1b7d619914c8d132dbffb8b6a5bb3a1aab686f9d (patch) | |
| tree | 2ced924df90e1a8c0cbd41ef251733a84b48301e /src | |
| parent | Merge pull request #2596 from FernandoS27/revert-2590 (diff) | |
| download | yuzu-1b7d619914c8d132dbffb8b6a5bb3a1aab686f9d.tar.gz yuzu-1b7d619914c8d132dbffb8b6a5bb3a1aab686f9d.tar.xz yuzu-1b7d619914c8d132dbffb8b6a5bb3a1aab686f9d.zip | |
memory: Add class to manage and enforce memory freezing
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/core/core.cpp | 2 | ||||
| -rw-r--r-- | src/core/memory/freezer.cpp | 186 | ||||
| -rw-r--r-- | src/core/memory/freezer.h | 58 |
4 files changed, 248 insertions, 0 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 4204ace2b..c17528134 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt | |||
| @@ -454,6 +454,8 @@ add_library(core STATIC | |||
| 454 | loader/nsp.h | 454 | loader/nsp.h |
| 455 | loader/xci.cpp | 455 | loader/xci.cpp |
| 456 | loader/xci.h | 456 | loader/xci.h |
| 457 | memory/freezer.cpp | ||
| 458 | memory/freezer.h | ||
| 457 | memory.cpp | 459 | memory.cpp |
| 458 | memory.h | 460 | memory.h |
| 459 | memory_setup.h | 461 | memory_setup.h |
diff --git a/src/core/core.cpp b/src/core/core.cpp index ff0721079..94ebe0995 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include "core/hle/service/service.h" | 28 | #include "core/hle/service/service.h" |
| 29 | #include "core/hle/service/sm/sm.h" | 29 | #include "core/hle/service/sm/sm.h" |
| 30 | #include "core/loader/loader.h" | 30 | #include "core/loader/loader.h" |
| 31 | #include "core/memory/freezer.h" | ||
| 31 | #include "core/perf_stats.h" | 32 | #include "core/perf_stats.h" |
| 32 | #include "core/settings.h" | 33 | #include "core/settings.h" |
| 33 | #include "core/telemetry_session.h" | 34 | #include "core/telemetry_session.h" |
| @@ -243,6 +244,7 @@ struct System::Impl { | |||
| 243 | bool is_powered_on = false; | 244 | bool is_powered_on = false; |
| 244 | 245 | ||
| 245 | std::unique_ptr<FileSys::CheatEngine> cheat_engine; | 246 | std::unique_ptr<FileSys::CheatEngine> cheat_engine; |
| 247 | std::unique_ptr<Memory::Freezer> memory_freezer; | ||
| 246 | 248 | ||
| 247 | /// Frontend applets | 249 | /// Frontend applets |
| 248 | Service::AM::Applets::AppletManager applet_manager; | 250 | Service::AM::Applets::AppletManager applet_manager; |
diff --git a/src/core/memory/freezer.cpp b/src/core/memory/freezer.cpp new file mode 100644 index 000000000..1d0ccf328 --- /dev/null +++ b/src/core/memory/freezer.cpp | |||
| @@ -0,0 +1,186 @@ | |||
| 1 | // Copyright 2019 yuzu Emulator Project | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 5 | #include "common/assert.h" | ||
| 6 | #include "core/core.h" | ||
| 7 | #include "core/core_timing_util.h" | ||
| 8 | #include "core/memory.h" | ||
| 9 | #include "core/memory/freezer.h" | ||
| 10 | |||
| 11 | namespace Memory { | ||
| 12 | |||
| 13 | constexpr s64 MEMORY_FREEZER_TICKS = static_cast<s64>(Core::Timing::BASE_CLOCK_RATE / 60); | ||
| 14 | |||
| 15 | namespace { | ||
| 16 | |||
| 17 | u64 MemoryReadWidth(u8 width, VAddr addr) { | ||
| 18 | switch (width) { | ||
| 19 | case 1: | ||
| 20 | return Read8(addr); | ||
| 21 | case 2: | ||
| 22 | return Read16(addr); | ||
| 23 | case 4: | ||
| 24 | return Read32(addr); | ||
| 25 | case 8: | ||
| 26 | return Read64(addr); | ||
| 27 | default: | ||
| 28 | UNREACHABLE(); | ||
| 29 | return 0; | ||
| 30 | } | ||
| 31 | } | ||
| 32 | |||
| 33 | void MemoryWriteWidth(u8 width, VAddr addr, u64 value) { | ||
| 34 | switch (width) { | ||
| 35 | case 1: | ||
| 36 | Write8(addr, static_cast<u8>(value)); | ||
| 37 | break; | ||
| 38 | case 2: | ||
| 39 | Write16(addr, static_cast<u16>(value)); | ||
| 40 | break; | ||
| 41 | case 4: | ||
| 42 | Write32(addr, static_cast<u32>(value)); | ||
| 43 | break; | ||
| 44 | case 8: | ||
| 45 | Write64(addr, value); | ||
| 46 | break; | ||
| 47 | default: | ||
| 48 | UNREACHABLE(); | ||
| 49 | } | ||
| 50 | } | ||
| 51 | |||
| 52 | } // Anonymous namespace | ||
| 53 | |||
| 54 | Freezer::Freezer(Core::Timing::CoreTiming& core_timing) : core_timing(core_timing) { | ||
| 55 | event = core_timing.RegisterEvent( | ||
| 56 | "MemoryFreezer::FrameCallback", | ||
| 57 | [this](u64 userdata, s64 cycles_late) { FrameCallback(userdata, cycles_late); }); | ||
| 58 | core_timing.ScheduleEvent(MEMORY_FREEZER_TICKS, event); | ||
| 59 | } | ||
| 60 | |||
| 61 | Freezer::~Freezer() { | ||
| 62 | core_timing.UnscheduleEvent(event, 0); | ||
| 63 | } | ||
| 64 | |||
| 65 | void Freezer::SetActive(bool active) { | ||
| 66 | if (!this->active.exchange(active)) { | ||
| 67 | FillEntryReads(); | ||
| 68 | core_timing.ScheduleEvent(MEMORY_FREEZER_TICKS, event); | ||
| 69 | LOG_DEBUG(Common_Memory, "Memory freezer activated!"); | ||
| 70 | } else { | ||
| 71 | LOG_DEBUG(Common_Memory, "Memory freezer deactivated!"); | ||
| 72 | } | ||
| 73 | } | ||
| 74 | |||
| 75 | bool Freezer::IsActive() const { | ||
| 76 | return active.load(); | ||
| 77 | } | ||
| 78 | |||
| 79 | void Freezer::Clear() { | ||
| 80 | std::lock_guard<std::recursive_mutex> lock(entries_mutex); | ||
| 81 | |||
| 82 | LOG_DEBUG(Common_Memory, "Clearing all frozen memory values."); | ||
| 83 | |||
| 84 | entries.clear(); | ||
| 85 | } | ||
| 86 | |||
| 87 | u64 Freezer::Freeze(VAddr address, u8 width) { | ||
| 88 | std::lock_guard<std::recursive_mutex> lock(entries_mutex); | ||
| 89 | |||
| 90 | const auto current_value = MemoryReadWidth(width, address); | ||
| 91 | entries.push_back({address, width, current_value}); | ||
| 92 | |||
| 93 | LOG_DEBUG(Common_Memory, | ||
| 94 | "Freezing memory for address={:016X}, width={:02X}, current_value={:016X}", address, | ||
| 95 | width, current_value); | ||
| 96 | |||
| 97 | return current_value; | ||
| 98 | } | ||
| 99 | |||
| 100 | void Freezer::Unfreeze(VAddr address) { | ||
| 101 | std::lock_guard<std::recursive_mutex> lock(entries_mutex); | ||
| 102 | |||
| 103 | LOG_DEBUG(Common_Memory, "Unfreezing memory for address={:016X}", address); | ||
| 104 | |||
| 105 | entries.erase( | ||
| 106 | std::remove_if(entries.begin(), entries.end(), | ||
| 107 | [&address](const Entry& entry) { return entry.address == address; }), | ||
| 108 | entries.end()); | ||
| 109 | } | ||
| 110 | |||
| 111 | bool Freezer::IsFrozen(VAddr address) { | ||
| 112 | std::lock_guard<std::recursive_mutex> lock(entries_mutex); | ||
| 113 | |||
| 114 | return std::find_if(entries.begin(), entries.end(), [&address](const Entry& entry) { | ||
| 115 | return entry.address == address; | ||
| 116 | }) != entries.end(); | ||
| 117 | } | ||
| 118 | |||
| 119 | void Freezer::SetFrozenValue(VAddr address, u64 value) { | ||
| 120 | std::lock_guard<std::recursive_mutex> lock(entries_mutex); | ||
| 121 | |||
| 122 | const auto iter = std::find_if(entries.begin(), entries.end(), [&address](const Entry& entry) { | ||
| 123 | return entry.address == address; | ||
| 124 | }); | ||
| 125 | |||
| 126 | if (iter == entries.end()) { | ||
| 127 | LOG_ERROR(Common_Memory, | ||
| 128 | "Tried to set freeze value for address={:016X} that is not frozen!", address); | ||
| 129 | return; | ||
| 130 | } | ||
| 131 | |||
| 132 | LOG_DEBUG(Common_Memory, | ||
| 133 | "Manually overridden freeze value for address={:016X}, width={:02X} to value={:016X}", | ||
| 134 | iter->address, iter->width, value); | ||
| 135 | iter->value = value; | ||
| 136 | } | ||
| 137 | |||
| 138 | std::optional<Freezer::Entry> Freezer::GetEntry(VAddr address) { | ||
| 139 | std::lock_guard<std::recursive_mutex> lock(entries_mutex); | ||
| 140 | |||
| 141 | const auto iter = std::find_if(entries.begin(), entries.end(), [&address](const Entry& entry) { | ||
| 142 | return entry.address == address; | ||
| 143 | }); | ||
| 144 | |||
| 145 | if (iter == entries.end()) { | ||
| 146 | return std::nullopt; | ||
| 147 | } | ||
| 148 | |||
| 149 | return *iter; | ||
| 150 | } | ||
| 151 | |||
| 152 | std::vector<Freezer::Entry> Freezer::GetEntries() { | ||
| 153 | std::lock_guard<std::recursive_mutex> lock(entries_mutex); | ||
| 154 | |||
| 155 | return entries; | ||
| 156 | } | ||
| 157 | |||
| 158 | void Freezer::FrameCallback(u64 userdata, s64 cycles_late) { | ||
| 159 | if (!active.load()) { | ||
| 160 | LOG_DEBUG(Common_Memory, "Memory freezer has been deactivated, ending callback events."); | ||
| 161 | return; | ||
| 162 | } | ||
| 163 | |||
| 164 | std::lock_guard<std::recursive_mutex> lock(entries_mutex); | ||
| 165 | |||
| 166 | for (const auto& entry : entries) { | ||
| 167 | LOG_DEBUG(Common_Memory, | ||
| 168 | "Enforcing memory freeze at address={:016X}, value={:016X}, width={:02X}", | ||
| 169 | entry.address, entry.value, entry.width); | ||
| 170 | MemoryWriteWidth(entry.width, entry.address, entry.value); | ||
| 171 | } | ||
| 172 | |||
| 173 | core_timing.ScheduleEvent(MEMORY_FREEZER_TICKS - cycles_late, event); | ||
| 174 | } | ||
| 175 | |||
| 176 | void Freezer::FillEntryReads() { | ||
| 177 | std::lock_guard<std::recursive_mutex> lock(entries_mutex); | ||
| 178 | |||
| 179 | LOG_DEBUG(Common_Memory, "Updating memory freeze entries to current values."); | ||
| 180 | |||
| 181 | for (auto& entry : entries) { | ||
| 182 | entry.value = MemoryReadWidth(entry.width, entry.address); | ||
| 183 | } | ||
| 184 | } | ||
| 185 | |||
| 186 | } // namespace Memory | ||
diff --git a/src/core/memory/freezer.h b/src/core/memory/freezer.h new file mode 100644 index 000000000..3e271793e --- /dev/null +++ b/src/core/memory/freezer.h | |||
| @@ -0,0 +1,58 @@ | |||
| 1 | // Copyright 2019 yuzu Emulator Project | ||
| 2 | // Licensed under GPLv2 or any later version | ||
| 3 | // Refer to the license.txt file included. | ||
| 4 | |||
| 5 | #pragma once | ||
| 6 | |||
| 7 | #include <optional> | ||
| 8 | #include <vector> | ||
| 9 | #include "common/common_types.h" | ||
| 10 | #include "core/core_timing.h" | ||
| 11 | |||
| 12 | namespace Core { | ||
| 13 | class System; | ||
| 14 | } // namespace Core | ||
| 15 | |||
| 16 | namespace Memory { | ||
| 17 | |||
| 18 | // A class that will effectively freeze memory values. | ||
| 19 | class Freezer { | ||
| 20 | public: | ||
| 21 | struct Entry { | ||
| 22 | VAddr address; | ||
| 23 | u8 width; | ||
| 24 | u64 value; | ||
| 25 | }; | ||
| 26 | |||
| 27 | Freezer(Core::Timing::CoreTiming& core_timing); | ||
| 28 | ~Freezer(); | ||
| 29 | |||
| 30 | void SetActive(bool active); | ||
| 31 | bool IsActive() const; | ||
| 32 | |||
| 33 | void Clear(); | ||
| 34 | |||
| 35 | u64 Freeze(VAddr address, u8 width); | ||
| 36 | void Unfreeze(VAddr address); | ||
| 37 | |||
| 38 | bool IsFrozen(VAddr address); | ||
| 39 | void SetFrozenValue(VAddr address, u64 value); | ||
| 40 | |||
| 41 | std::optional<Entry> GetEntry(VAddr address); | ||
| 42 | |||
| 43 | std::vector<Entry> GetEntries(); | ||
| 44 | |||
| 45 | private: | ||
| 46 | void FrameCallback(u64 userdata, s64 cycles_late); | ||
| 47 | void FillEntryReads(); | ||
| 48 | |||
| 49 | std::atomic_bool active{false}; | ||
| 50 | |||
| 51 | std::recursive_mutex entries_mutex; | ||
| 52 | std::vector<Entry> entries; | ||
| 53 | |||
| 54 | Core::Timing::EventType* event; | ||
| 55 | Core::Timing::CoreTiming& core_timing; | ||
| 56 | }; | ||
| 57 | |||
| 58 | } // namespace Memory | ||