Skip to content

Commit a781f7e

Browse files
committed
Run clang-format
1 parent 9730953 commit a781f7e

File tree

2 files changed

+23
-46
lines changed

2 files changed

+23
-46
lines changed

src/gui/widgets/memory_observer.cc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ void PCSX::Widgets::MemoryObserver::draw(const char* title) {
4646
const auto stride = static_cast<uint8_t>(m_scanAlignment);
4747

4848
if (m_addressValuePairs.empty() && ImGui::Button("First scan")) {
49-
5049
int memValue = 0;
5150

5251
for (uint32_t i = 0; i < memSize; ++i) {
@@ -89,8 +88,8 @@ void PCSX::Widgets::MemoryObserver::draw(const char* title) {
8988
}
9089

9190
if (!m_addressValuePairs.empty() && ImGui::Button("Next scan")) {
92-
auto doesntMatchCriterion = [this, memData, memSize, memBase, stride](
93-
const AddressValuePair& addressValuePair) {
91+
auto doesntMatchCriterion = [this, memData, memSize, memBase,
92+
stride](const AddressValuePair& addressValuePair) {
9493
const uint32_t address = addressValuePair.address;
9594
const int memValue = getMemValue(address, memData, memSize, memBase, stride);
9695

src/gui/widgets/memory_observer.h

Lines changed: 21 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,22 @@
2121

2222
#include <stdint.h>
2323

24+
#include <array>
2425
#include <vector>
2526

2627
#include "imgui.h"
27-
28-
#include <array>
2928
#include "immintrin.h"
3029

3130
namespace PCSX {
3231

3332
namespace Widgets {
3433

3534
class MemoryObserver {
36-
public:
35+
public:
3736
void draw(const char* title);
3837
bool m_show = false;
3938

40-
private:
39+
private:
4140
static int getMemValue(uint32_t absoluteAddress, const uint8_t* memData, uint32_t memSize, uint32_t memBase,
4241
uint8_t stride);
4342

@@ -56,11 +55,7 @@ class MemoryObserver {
5655
UnknownInitialValue
5756
};
5857

59-
enum class ScanAlignment : uint8_t {
60-
OneByte = 1,
61-
TwoBytes = 2,
62-
FourBytes = 4
63-
};
58+
enum class ScanAlignment : uint8_t { OneByte = 1, TwoBytes = 2, FourBytes = 4 };
6459

6560
struct AddressValuePair {
6661
uint32_t address = 0;
@@ -89,44 +84,29 @@ class MemoryObserver {
8984

9085
switch (mask) {
9186
case 0: {
92-
const auto firstShuffleMask = _mm256_set_epi8(
93-
3, 2, 1, 0, 7, 6, 5, 4,
94-
2, 1, 0, 7, 6, 5, 4, 3,
95-
1, 0, 7, 6, 5, 4, 3, 2,
96-
0, 7, 6, 5, 4, 3, 2, 1
97-
);
87+
const auto firstShuffleMask = _mm256_set_epi8(3, 2, 1, 0, 7, 6, 5, 4, 2, 1, 0, 7, 6, 5, 4, 3, 1, 0, 7,
88+
6, 5, 4, 3, 2, 0, 7, 6, 5, 4, 3, 2, 1);
9889
const auto firstShuffle = _mm256_shuffle_epi8(twoCopies, firstShuffleMask);
9990
return _mm256_cmpeq_epi8(twoCopies, firstShuffle);
10091
}
10192
case 1: {
102-
const auto secondShuffleMask = _mm256_set_epi8(
103-
7, 6, 5, 4, 3, 2, 1, 0,
104-
6, 5, 4, 3, 2, 1, 0, 7,
105-
5, 4, 3, 2, 1, 0, 7, 6,
106-
4, 3, 2, 1, 0, 7, 6, 5
107-
);
93+
const auto secondShuffleMask = _mm256_set_epi8(7, 6, 5, 4, 3, 2, 1, 0, 6, 5, 4, 3, 2, 1, 0, 7, 5, 4, 3,
94+
2, 1, 0, 7, 6, 4, 3, 2, 1, 0, 7, 6, 5);
10895
const auto secondShuffle = _mm256_shuffle_epi8(twoCopies, secondShuffleMask);
10996
return _mm256_cmpeq_epi8(twoCopies, secondShuffle);
11097
}
11198
case 2: {
11299
assert(bufferSize == 16);
113-
const auto thirdShuffleMask = _mm256_set_epi8(
114-
11, 10, 9, 8, 7, 6, 5, 4,
115-
10, 9, 8, 7, 6, 5, 4, 3,
116-
9, 8, 7, 6, 5, 4, 3, 2,
117-
8, 7, 6, 5, 4, 3, 2, 1
118-
);
100+
const auto thirdShuffleMask = _mm256_set_epi8(11, 10, 9, 8, 7, 6, 5, 4, 10, 9, 8, 7, 6, 5, 4, 3, 9, 8,
101+
7, 6, 5, 4, 3, 2, 8, 7, 6, 5, 4, 3, 2, 1);
119102
const auto thirdShuffle = _mm256_shuffle_epi8(twoCopies, thirdShuffleMask);
120103
return _mm256_cmpeq_epi8(twoCopies, thirdShuffle);
121104
}
122105
case 3: {
123106
assert(bufferSize == 16);
124-
const auto fourthShuffleMask = _mm256_set_epi8(
125-
15, 14, 13, 12, 11, 10, 9, 8,
126-
14, 13, 12, 11, 10, 9, 8, 7,
127-
13, 12, 11, 10, 9, 8, 7, 6,
128-
12, 11, 10, 9, 8, 7, 6, 5
129-
);
107+
const auto fourthShuffleMask =
108+
_mm256_set_epi8(15, 14, 13, 12, 11, 10, 9, 8, 14, 13, 12, 11, 10, 9, 8, 7, 13, 12, 11, 10, 9, 8, 7,
109+
6, 12, 11, 10, 9, 8, 7, 6, 5);
130110
const auto fourthShuffle = _mm256_shuffle_epi8(twoCopies, fourthShuffleMask);
131111
return _mm256_cmpeq_epi8(twoCopies, fourthShuffle);
132112
}
@@ -139,15 +119,13 @@ class MemoryObserver {
139119
void avx2_populateAddressList(const uint8_t* memData, uint32_t memBase, uint32_t memSize) {
140120
static_assert(bufferSize == 8 || bufferSize == 16);
141121

142-
alignas (32) auto buffer = std::array<uint8_t, bufferSize>{};
143-
alignas (32) auto extendedBuffer = std::array<uint8_t, 32>{};
122+
alignas(32) auto buffer = std::array<uint8_t, bufferSize>{};
123+
alignas(32) auto extendedBuffer = std::array<uint8_t, 32>{};
144124

145125
const auto sequenceSize = m_sequenceSize;
146126
std::copy_n(m_sequence, sequenceSize, buffer.data());
147-
auto patternShuffleResults = std::vector<__m256i>{
148-
avx2_getShuffleResultsFor(buffer, extendedBuffer, 0),
149-
avx2_getShuffleResultsFor(buffer, extendedBuffer, 1)
150-
};
127+
auto patternShuffleResults = std::vector<__m256i>{avx2_getShuffleResultsFor(buffer, extendedBuffer, 0),
128+
avx2_getShuffleResultsFor(buffer, extendedBuffer, 1)};
151129
if constexpr (bufferSize == 16) {
152130
patternShuffleResults.push_back(avx2_getShuffleResultsFor(buffer, extendedBuffer, 2));
153131
patternShuffleResults.push_back(avx2_getShuffleResultsFor(buffer, extendedBuffer, 3));
@@ -160,8 +138,8 @@ class MemoryObserver {
160138

161139
bool bAllEqual = true;
162140
for (auto j = 0u; j < patternShuffleResults.size(); ++j) {
163-
bAllEqual = all_equal(_mm256_cmpeq_epi8(patternShuffleResults[j],
164-
avx2_getShuffleResultsFor(buffer, extendedBuffer, j)));
141+
bAllEqual = all_equal(
142+
_mm256_cmpeq_epi8(patternShuffleResults[j], avx2_getShuffleResultsFor(buffer, extendedBuffer, j)));
165143
if (!bAllEqual) {
166144
break;
167145
}
@@ -184,6 +162,6 @@ class MemoryObserver {
184162
std::vector<uint32_t> m_addresses;
185163
};
186164

187-
}
165+
} // namespace Widgets
188166

189-
}
167+
} // namespace PCSX

0 commit comments

Comments
 (0)