mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-02 07:22:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor improvements

Browse Source
This commit is contained in:
Fire Cube 2025-04-21 11:09:16 +02:00
parent b005ddd426
commit 3dbb658a2e
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/shader_recompiler/frontend/control_flow_graph.cpp
View File

@ -5,6 +5,7 @@
#include <unordered_map> #include <unordered_map>
#include "common/assert.h" #include "common/assert.h"
#include "shader_recompiler/frontend/control_flow_graph.h" #include "shader_recompiler/frontend/control_flow_graph.h"
#include "common/logging/log.h"
namespace Shader::Gcn { namespace Shader::Gcn {
@ -81,24 +82,22 @@ static std::optional<u32> ResolveSetPcTarget(std::span<const GcnInst> list, u32
setpc.opcode != Opcode::S_SETPC_B64) setpc.opcode != Opcode::S_SETPC_B64)
return std::nullopt; return std::nullopt;
// Register‑Paar prüfen
if (getpc.dst[0].code != setpc.src[0].code || arith.dst[0].code != setpc.src[0].code) if (getpc.dst[0].code != setpc.src[0].code || arith.dst[0].code != setpc.src[0].code)
return std::nullopt; return std::nullopt;
// Sofortwert holen
if (arith.src_count < 2 || arith.src[1].field != OperandField::LiteralConst) if (arith.src_count < 2 || arith.src[1].field != OperandField::LiteralConst)
return std::nullopt; return std::nullopt;
const u32 imm = arith.src[1].code; const u32 imm = arith.src[1].code;
// Vorzeichenbehafteter Offset
const s32 signed_offset = const s32 signed_offset =
(arith.opcode == Opcode::S_ADD_U32) ? static_cast<s32>(imm) : -static_cast<s32>(imm); (arith.opcode == Opcode::S_ADD_U32) ? static_cast<s32>(imm) : -static_cast<s32>(imm);
const u32 base_pc = pc_map[setpc_index - 3] + getpc.length; const u32 base_pc = pc_map[setpc_index - 3] + getpc.length;
const u32 result_pc = static_cast<u32>(static_cast<s32>(base_pc) + signed_offset); const u32 result_pc = static_cast<u32>(static_cast<s32>(base_pc) + signed_offset);
return result_pc & ~0x3u; // DWORD-aligned PC LOG_INFO(Render_Recompiler, "SetPC target: {} + {} = {}", base_pc, signed_offset, result_pc);
return result_pc & ~0x3u;
} }
@ -130,8 +129,8 @@ void CFG::EmitLabels() {
if (auto t = ResolveSetPcTarget(inst_list, i, index_to_pc)) if (auto t = ResolveSetPcTarget(inst_list, i, index_to_pc))
target = *t; target = *t;
} }
AddLabel(target); // Ziel AddLabel(target);
AddLabel(pc + inst.length); // Fall‑through‑Label AddLabel(pc + inst.length);
} else if (inst.IsConditionalBranch()) { } else if (inst.IsConditionalBranch()) {
const u32 true_label = inst.BranchTarget(pc); const u32 true_label = inst.BranchTarget(pc);
const u32 false_label = pc + inst.length; const u32 false_label = pc + inst.length;
@ -323,8 +322,8 @@ void CFG::LinkBlocks() {
if (end_inst.opcode == Opcode::S_SETPC_B64) { if (end_inst.opcode == Opcode::S_SETPC_B64) {
auto tgt = ResolveSetPcTarget(inst_list, block.end_index, index_to_pc); auto tgt = ResolveSetPcTarget(inst_list, block.end_index, index_to_pc);
ASSERT_MSG(tgt, ASSERT_MSG(tgt,
"S_SETPC_B64 ohne auflösbaren Offset bei PC {:#x} (Index {}): Beteiligte " "S_SETPC_B64 without a resolvable offset at PC {:#x} (Index {}): Involved "
"Instruktionen nicht erkannt oder ungültiges Muster", "instructions not recognized or invalid pattern",
branch_pc, block.end_index); branch_pc, block.end_index);
target_pc = *tgt; target_pc = *tgt;
} else { } else {