summaryrefslogtreecommitdiff
path: root/src/shader_recompiler/frontend
diff options
context:
space:
mode:
Diffstat (limited to 'src/shader_recompiler/frontend')
-rw-r--r--src/shader_recompiler/frontend/ir/opcodes.cpp2
-rw-r--r--src/shader_recompiler/frontend/maxwell/control_flow.cpp4
-rw-r--r--src/shader_recompiler/frontend/maxwell/control_flow.h16
-rw-r--r--src/shader_recompiler/frontend/maxwell/decode.cpp2
-rw-r--r--src/shader_recompiler/frontend/maxwell/translate/impl/common_funcs.cpp5
-rw-r--r--src/shader_recompiler/frontend/maxwell/translate/impl/not_implemented.cpp1
6 files changed, 15 insertions, 15 deletions
diff --git a/src/shader_recompiler/frontend/ir/opcodes.cpp b/src/shader_recompiler/frontend/ir/opcodes.cpp
index 002dbf94e..7d3e0b2ab 100644
--- a/src/shader_recompiler/frontend/ir/opcodes.cpp
+++ b/src/shader_recompiler/frontend/ir/opcodes.cpp
@@ -49,7 +49,7 @@ constexpr std::array META_TABLE{
49#define OPCODE(name_token, type_token, ...) \ 49#define OPCODE(name_token, type_token, ...) \
50 OpcodeMeta{ \ 50 OpcodeMeta{ \
51 .name{#name_token}, \ 51 .name{#name_token}, \
52 .type = type_token, \ 52 .type = type_token, \
53 .arg_types{__VA_ARGS__}, \ 53 .arg_types{__VA_ARGS__}, \
54 }, 54 },
55#include "opcodes.inc" 55#include "opcodes.inc"
diff --git a/src/shader_recompiler/frontend/maxwell/control_flow.cpp b/src/shader_recompiler/frontend/maxwell/control_flow.cpp
index cb8ec7eaa..9811183f1 100644
--- a/src/shader_recompiler/frontend/maxwell/control_flow.cpp
+++ b/src/shader_recompiler/frontend/maxwell/control_flow.cpp
@@ -44,7 +44,7 @@ void Split(Block* old_block, Block* new_block, Location pc) {
44 *new_block = Block{}; 44 *new_block = Block{};
45 new_block->begin = pc; 45 new_block->begin = pc;
46 new_block->end = old_block->end; 46 new_block->end = old_block->end;
47 new_block->end_class = old_block->end_class, 47 new_block->end_class = old_block->end_class;
48 new_block->cond = old_block->cond; 48 new_block->cond = old_block->cond;
49 new_block->stack = old_block->stack; 49 new_block->stack = old_block->stack;
50 new_block->branch_true = old_block->branch_true; 50 new_block->branch_true = old_block->branch_true;
@@ -428,7 +428,7 @@ CFG::AnalysisState CFG::AnalyzeBRX(Block* block, Location pc, Instruction inst,
428 if (!is_absolute) { 428 if (!is_absolute) {
429 target += pc.Offset(); 429 target += pc.Offset();
430 } 430 }
431 target += static_cast<unsigned int>(brx_table->branch_offset); 431 target += static_cast<u32>(brx_table->branch_offset);
432 target += 8; 432 target += 8;
433 targets.push_back(target); 433 targets.push_back(target);
434 } 434 }
diff --git a/src/shader_recompiler/frontend/maxwell/control_flow.h b/src/shader_recompiler/frontend/maxwell/control_flow.h
index 9f570fbb5..89966b16a 100644
--- a/src/shader_recompiler/frontend/maxwell/control_flow.h
+++ b/src/shader_recompiler/frontend/maxwell/control_flow.h
@@ -78,15 +78,15 @@ struct Block : boost::intrusive::set_base_hook<
78 78
79 Location begin; 79 Location begin;
80 Location end; 80 Location end;
81 EndClass end_class; 81 EndClass end_class{};
82 IR::Condition cond; 82 IR::Condition cond{};
83 Stack stack; 83 Stack stack;
84 Block* branch_true; 84 Block* branch_true{};
85 Block* branch_false; 85 Block* branch_false{};
86 FunctionId function_call; 86 FunctionId function_call{};
87 Block* return_block; 87 Block* return_block{};
88 IR::Reg branch_reg; 88 IR::Reg branch_reg{};
89 s32 branch_offset; 89 s32 branch_offset{};
90 std::vector<IndirectBranch> indirect_branches; 90 std::vector<IndirectBranch> indirect_branches;
91}; 91};
92 92
diff --git a/src/shader_recompiler/frontend/maxwell/decode.cpp b/src/shader_recompiler/frontend/maxwell/decode.cpp
index 932d19c1d..972f677dc 100644
--- a/src/shader_recompiler/frontend/maxwell/decode.cpp
+++ b/src/shader_recompiler/frontend/maxwell/decode.cpp
@@ -56,7 +56,7 @@ constexpr std::array UNORDERED_ENCODINGS{
56#define INST(name, cute, encode) \ 56#define INST(name, cute, encode) \
57 InstEncoding{ \ 57 InstEncoding{ \
58 .mask_value{MaskValueFromEncoding(encode)}, \ 58 .mask_value{MaskValueFromEncoding(encode)}, \
59 .opcode = Opcode::name, \ 59 .opcode = Opcode::name, \
60 }, 60 },
61#include "maxwell.inc" 61#include "maxwell.inc"
62#undef INST 62#undef INST
diff --git a/src/shader_recompiler/frontend/maxwell/translate/impl/common_funcs.cpp b/src/shader_recompiler/frontend/maxwell/translate/impl/common_funcs.cpp
index d30e82b10..10bb01d99 100644
--- a/src/shader_recompiler/frontend/maxwell/translate/impl/common_funcs.cpp
+++ b/src/shader_recompiler/frontend/maxwell/translate/impl/common_funcs.cpp
@@ -72,8 +72,9 @@ bool IsCompareOpOrdered(FPCompareOp op) {
72 } 72 }
73} 73}
74 74
75IR::U1 FloatingPointCompare(IR::IREmitter& ir, const IR::F16F32F64& operand_1, const IR::F16F32F64& operand_2, 75IR::U1 FloatingPointCompare(IR::IREmitter& ir, const IR::F16F32F64& operand_1,
76 FPCompareOp compare_op, IR::FpControl control) { 76 const IR::F16F32F64& operand_2, FPCompareOp compare_op,
77 IR::FpControl control) {
77 const bool ordered{IsCompareOpOrdered(compare_op)}; 78 const bool ordered{IsCompareOpOrdered(compare_op)};
78 switch (compare_op) { 79 switch (compare_op) {
79 case FPCompareOp::F: 80 case FPCompareOp::F:
diff --git a/src/shader_recompiler/frontend/maxwell/translate/impl/not_implemented.cpp b/src/shader_recompiler/frontend/maxwell/translate/impl/not_implemented.cpp
index ba0cfa673..c23901052 100644
--- a/src/shader_recompiler/frontend/maxwell/translate/impl/not_implemented.cpp
+++ b/src/shader_recompiler/frontend/maxwell/translate/impl/not_implemented.cpp
@@ -65,7 +65,6 @@ void TranslatorVisitor::CS2R(u64) {
65 ThrowNotImplemented(Opcode::CS2R); 65 ThrowNotImplemented(Opcode::CS2R);
66} 66}
67 67
68
69void TranslatorVisitor::FCHK_reg(u64) { 68void TranslatorVisitor::FCHK_reg(u64) {
70 ThrowNotImplemented(Opcode::FCHK_reg); 69 ThrowNotImplemented(Opcode::FCHK_reg);
71} 70}