diff options
| author | 2019-05-30 16:57:23 -0400 | |
|---|---|---|
| committer | 2019-06-20 19:22:04 -0400 | |
| commit | c9983ad9a71c9462319d27c3791e13fae9d73e46 (patch) | |
| tree | ec416c75834377e975fe4485f06854663db29463 /src/core/memory/freezer.cpp | |
| parent | memory: Add class to manage and enforce memory freezing (diff) | |
| download | yuzu-c9983ad9a71c9462319d27c3791e13fae9d73e46.tar.gz yuzu-c9983ad9a71c9462319d27c3791e13fae9d73e46.tar.xz yuzu-c9983ad9a71c9462319d27c3791e13fae9d73e46.zip | |
freezer: Add documentation for methods
Diffstat (limited to 'src/core/memory/freezer.cpp')
| -rw-r--r-- | src/core/memory/freezer.cpp | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/src/core/memory/freezer.cpp b/src/core/memory/freezer.cpp index 1d0ccf328..6b20e8388 100644 --- a/src/core/memory/freezer.cpp +++ b/src/core/memory/freezer.cpp | |||
| @@ -3,18 +3,20 @@ | |||
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #include "common/assert.h" | 5 | #include "common/assert.h" |
| 6 | #include "common/logging/log.h" | ||
| 6 | #include "core/core.h" | 7 | #include "core/core.h" |
| 8 | #include "core/core_timing.h" | ||
| 7 | #include "core/core_timing_util.h" | 9 | #include "core/core_timing_util.h" |
| 8 | #include "core/memory.h" | 10 | #include "core/memory.h" |
| 9 | #include "core/memory/freezer.h" | 11 | #include "core/memory/freezer.h" |
| 10 | 12 | ||
| 11 | namespace Memory { | 13 | namespace Memory { |
| 12 | 14 | ||
| 13 | constexpr s64 MEMORY_FREEZER_TICKS = static_cast<s64>(Core::Timing::BASE_CLOCK_RATE / 60); | ||
| 14 | |||
| 15 | namespace { | 15 | namespace { |
| 16 | 16 | ||
| 17 | u64 MemoryReadWidth(u8 width, VAddr addr) { | 17 | constexpr s64 MEMORY_FREEZER_TICKS = static_cast<s64>(Core::Timing::BASE_CLOCK_RATE / 60); |
| 18 | |||
| 19 | u64 MemoryReadWidth(u32 width, VAddr addr) { | ||
| 18 | switch (width) { | 20 | switch (width) { |
| 19 | case 1: | 21 | case 1: |
| 20 | return Read8(addr); | 22 | return Read8(addr); |
| @@ -30,7 +32,7 @@ u64 MemoryReadWidth(u8 width, VAddr addr) { | |||
| 30 | } | 32 | } |
| 31 | } | 33 | } |
| 32 | 34 | ||
| 33 | void MemoryWriteWidth(u8 width, VAddr addr, u64 value) { | 35 | void MemoryWriteWidth(u32 width, VAddr addr, u64 value) { |
| 34 | switch (width) { | 36 | switch (width) { |
| 35 | case 1: | 37 | case 1: |
| 36 | Write8(addr, static_cast<u8>(value)); | 38 | Write8(addr, static_cast<u8>(value)); |
| @@ -73,19 +75,19 @@ void Freezer::SetActive(bool active) { | |||
| 73 | } | 75 | } |
| 74 | 76 | ||
| 75 | bool Freezer::IsActive() const { | 77 | bool Freezer::IsActive() const { |
| 76 | return active.load(); | 78 | return active.load(std::memory_order_relaxed); |
| 77 | } | 79 | } |
| 78 | 80 | ||
| 79 | void Freezer::Clear() { | 81 | void Freezer::Clear() { |
| 80 | std::lock_guard<std::recursive_mutex> lock(entries_mutex); | 82 | std::lock_guard lock{entries_mutex}; |
| 81 | 83 | ||
| 82 | LOG_DEBUG(Common_Memory, "Clearing all frozen memory values."); | 84 | LOG_DEBUG(Common_Memory, "Clearing all frozen memory values."); |
| 83 | 85 | ||
| 84 | entries.clear(); | 86 | entries.clear(); |
| 85 | } | 87 | } |
| 86 | 88 | ||
| 87 | u64 Freezer::Freeze(VAddr address, u8 width) { | 89 | u64 Freezer::Freeze(VAddr address, u32 width) { |
| 88 | std::lock_guard<std::recursive_mutex> lock(entries_mutex); | 90 | std::lock_guard lock{entries_mutex}; |
| 89 | 91 | ||
| 90 | const auto current_value = MemoryReadWidth(width, address); | 92 | const auto current_value = MemoryReadWidth(width, address); |
| 91 | entries.push_back({address, width, current_value}); | 93 | entries.push_back({address, width, current_value}); |
| @@ -98,7 +100,7 @@ u64 Freezer::Freeze(VAddr address, u8 width) { | |||
| 98 | } | 100 | } |
| 99 | 101 | ||
| 100 | void Freezer::Unfreeze(VAddr address) { | 102 | void Freezer::Unfreeze(VAddr address) { |
| 101 | std::lock_guard<std::recursive_mutex> lock(entries_mutex); | 103 | std::lock_guard lock{entries_mutex}; |
| 102 | 104 | ||
| 103 | LOG_DEBUG(Common_Memory, "Unfreezing memory for address={:016X}", address); | 105 | LOG_DEBUG(Common_Memory, "Unfreezing memory for address={:016X}", address); |
| 104 | 106 | ||
| @@ -108,8 +110,8 @@ void Freezer::Unfreeze(VAddr address) { | |||
| 108 | entries.end()); | 110 | entries.end()); |
| 109 | } | 111 | } |
| 110 | 112 | ||
| 111 | bool Freezer::IsFrozen(VAddr address) { | 113 | bool Freezer::IsFrozen(VAddr address) const { |
| 112 | std::lock_guard<std::recursive_mutex> lock(entries_mutex); | 114 | std::lock_guard lock{entries_mutex}; |
| 113 | 115 | ||
| 114 | return std::find_if(entries.begin(), entries.end(), [&address](const Entry& entry) { | 116 | return std::find_if(entries.begin(), entries.end(), [&address](const Entry& entry) { |
| 115 | return entry.address == address; | 117 | return entry.address == address; |
| @@ -117,7 +119,7 @@ bool Freezer::IsFrozen(VAddr address) { | |||
| 117 | } | 119 | } |
| 118 | 120 | ||
| 119 | void Freezer::SetFrozenValue(VAddr address, u64 value) { | 121 | void Freezer::SetFrozenValue(VAddr address, u64 value) { |
| 120 | std::lock_guard<std::recursive_mutex> lock(entries_mutex); | 122 | std::lock_guard lock{entries_mutex}; |
| 121 | 123 | ||
| 122 | const auto iter = std::find_if(entries.begin(), entries.end(), [&address](const Entry& entry) { | 124 | const auto iter = std::find_if(entries.begin(), entries.end(), [&address](const Entry& entry) { |
| 123 | return entry.address == address; | 125 | return entry.address == address; |
| @@ -135,8 +137,8 @@ void Freezer::SetFrozenValue(VAddr address, u64 value) { | |||
| 135 | iter->value = value; | 137 | iter->value = value; |
| 136 | } | 138 | } |
| 137 | 139 | ||
| 138 | std::optional<Freezer::Entry> Freezer::GetEntry(VAddr address) { | 140 | std::optional<Freezer::Entry> Freezer::GetEntry(VAddr address) const { |
| 139 | std::lock_guard<std::recursive_mutex> lock(entries_mutex); | 141 | std::lock_guard lock{entries_mutex}; |
| 140 | 142 | ||
| 141 | const auto iter = std::find_if(entries.begin(), entries.end(), [&address](const Entry& entry) { | 143 | const auto iter = std::find_if(entries.begin(), entries.end(), [&address](const Entry& entry) { |
| 142 | return entry.address == address; | 144 | return entry.address == address; |
| @@ -149,19 +151,19 @@ std::optional<Freezer::Entry> Freezer::GetEntry(VAddr address) { | |||
| 149 | return *iter; | 151 | return *iter; |
| 150 | } | 152 | } |
| 151 | 153 | ||
| 152 | std::vector<Freezer::Entry> Freezer::GetEntries() { | 154 | std::vector<Freezer::Entry> Freezer::GetEntries() const { |
| 153 | std::lock_guard<std::recursive_mutex> lock(entries_mutex); | 155 | std::lock_guard lock{entries_mutex}; |
| 154 | 156 | ||
| 155 | return entries; | 157 | return entries; |
| 156 | } | 158 | } |
| 157 | 159 | ||
| 158 | void Freezer::FrameCallback(u64 userdata, s64 cycles_late) { | 160 | void Freezer::FrameCallback(u64 userdata, s64 cycles_late) { |
| 159 | if (!active.load()) { | 161 | if (!IsActive()) { |
| 160 | LOG_DEBUG(Common_Memory, "Memory freezer has been deactivated, ending callback events."); | 162 | LOG_DEBUG(Common_Memory, "Memory freezer has been deactivated, ending callback events."); |
| 161 | return; | 163 | return; |
| 162 | } | 164 | } |
| 163 | 165 | ||
| 164 | std::lock_guard<std::recursive_mutex> lock(entries_mutex); | 166 | std::lock_guard lock{entries_mutex}; |
| 165 | 167 | ||
| 166 | for (const auto& entry : entries) { | 168 | for (const auto& entry : entries) { |
| 167 | LOG_DEBUG(Common_Memory, | 169 | LOG_DEBUG(Common_Memory, |
| @@ -174,7 +176,7 @@ void Freezer::FrameCallback(u64 userdata, s64 cycles_late) { | |||
| 174 | } | 176 | } |
| 175 | 177 | ||
| 176 | void Freezer::FillEntryReads() { | 178 | void Freezer::FillEntryReads() { |
| 177 | std::lock_guard<std::recursive_mutex> lock(entries_mutex); | 179 | std::lock_guard lock{entries_mutex}; |
| 178 | 180 | ||
| 179 | LOG_DEBUG(Common_Memory, "Updating memory freeze entries to current values."); | 181 | LOG_DEBUG(Common_Memory, "Updating memory freeze entries to current values."); |
| 180 | 182 | ||