Mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-05-18 01:14:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed return strict const iterator, replace to range-based loop C++17 and code refactor (#548)

Browse source 
Signed-off-by: Herman Semenov <GermanAizek@yandex.ru>
Co-authored-by: georgemoralis <giorgosmrls@gmail.com>
This commit is contained in:
Herman Semenoff 2024-10-18 08:06:11 +00:00 • committed by GitHub
parent 9814a1b788
commit 96ea686eb6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 31 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/shader_recompiler/frontend/control_flow_graph.cpp
View file

@ -163,10 +163,10 @@ void CFG::EmitDivergenceLabels() {
}
void CFG::EmitBlocks() {
for (auto it = labels.begin(); it != labels.end(); it++) {
for (auto it = labels.cbegin(); it != labels.cend(); ++it) {
const Label start = *it;
const auto next_it = std::next(it);
const bool is_last = next_it == labels.end();
const bool is_last = (next_it == labels.cend());
if (is_last) {
// Last label is special.
return;
@ -193,7 +193,7 @@ void CFG::EmitBlocks() {
void CFG::LinkBlocks() {
const auto get_block = [this](u32 address) {
auto it = blocks.find(address, Compare{});
ASSERT_MSG(it != blocks.end() && it->begin == address);
ASSERT_MSG(it != blocks.cend() && it->begin == address);
return &*it;
};

30
src/shader_recompiler/frontend/structured_control_flow.cpp
View file

@ -144,32 +144,32 @@ std::string DumpExpr(const Statement* stmt) {
[[maybe_unused]] std::string DumpTree(const Tree& tree, u32 indentation = 0) {
std::string ret;
std::string indent(indentation, ' ');
for (auto stmt = tree.begin(); stmt != tree.end(); ++stmt) {
switch (stmt->type) {
for (const auto& stmt : tree) {
switch (stmt.type) {
case StatementType::Code:
ret += fmt::format("{} Block {:04x} -> {:04x} (0x{:016x});\n", indent,
stmt->block->begin, stmt->block->end,
reinterpret_cast<uintptr_t>(stmt->block));
stmt.block->begin, stmt.block->end,
reinterpret_cast<uintptr_t>(stmt.block));
break;
case StatementType::Goto:
ret += fmt::format("{} if ({}) goto L{};\n", indent, DumpExpr(stmt->cond),
stmt->label->id);
ret += fmt::format("{} if ({}) goto L{};\n", indent, DumpExpr(stmt.cond),
stmt.label->id);
break;
case StatementType::Label:
ret += fmt::format("{}L{}:\n", indent, stmt->id);
ret += fmt::format("{}L{}:\n", indent, stmt.id);
break;
case StatementType::If:
ret += fmt::format("{} if ({}) {{\n", indent, DumpExpr(stmt->cond));
ret += DumpTree(stmt->children, indentation + 4);
ret += fmt::format("{} if ({}) {{\n", indent, DumpExpr(stmt.cond));
ret += DumpTree(stmt.children, indentation + 4);
ret += fmt::format("{} }}\n", indent);
break;
case StatementType::Loop:
ret += fmt::format("{} do {{\n", indent);
ret += DumpTree(stmt->children, indentation + 4);
ret += fmt::format("{} }} while ({});\n", indent, DumpExpr(stmt->cond));
ret += DumpTree(stmt.children, indentation + 4);
ret += fmt::format("{} }} while ({});\n", indent, DumpExpr(stmt.cond));
break;
case StatementType::Break:
ret += fmt::format("{} if ({}) break;\n", indent, DumpExpr(stmt->cond));
ret += fmt::format("{} if ({}) break;\n", indent, DumpExpr(stmt.cond));
break;
case StatementType::Return:
ret += fmt::format("{} return;\n", indent);
@ -181,7 +181,7 @@ std::string DumpExpr(const Statement* stmt) {
ret += fmt::format("{} unreachable;\n", indent);
break;
case StatementType::SetVariable:
ret += fmt::format("{} goto_L{} = {};\n", indent, stmt->id, DumpExpr(stmt->op));
ret += fmt::format("{} goto_L{} = {};\n", indent, stmt.id, DumpExpr(stmt.op));
break;
case StatementType::Function:
case StatementType::Identity:
@ -625,8 +625,8 @@ private:
node.data.block = current_block;
}};
Tree& tree{parent.children};
for (auto it = tree.begin(); it != tree.end(); ++it) {
Statement& stmt{*it};
for (auto& child : tree) {
Statement& stmt{child};
switch (stmt.type) {
case StatementType::Label:
// Labels can be ignored