summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorameerj <52414509+ameerj@users.noreply.github.com>2021-05-09 01:21:32 +0200
committerameerj <52414509+ameerj@users.noreply.github.com>2021-07-23 03:51:30 +0200
commit934d3002462e27bcc289c1edb4959896cb23beb0 (patch)
treec28a4192fc0968f2197e9cfdbca6f4864679c56d /src
parentglasm: Implement more logical ops (diff)
downloadyuzu-934d3002462e27bcc289c1edb4959896cb23beb0.tar
yuzu-934d3002462e27bcc289c1edb4959896cb23beb0.tar.gz
yuzu-934d3002462e27bcc289c1edb4959896cb23beb0.tar.bz2
yuzu-934d3002462e27bcc289c1edb4959896cb23beb0.tar.lz
yuzu-934d3002462e27bcc289c1edb4959896cb23beb0.tar.xz
yuzu-934d3002462e27bcc289c1edb4959896cb23beb0.tar.zst
yuzu-934d3002462e27bcc289c1edb4959896cb23beb0.zip
Diffstat (limited to 'src')
-rw-r--r--src/shader_recompiler/backend/glasm/emit_glasm_instructions.h4
-rw-r--r--src/shader_recompiler/backend/glasm/emit_glasm_integer.cpp4
-rw-r--r--src/shader_recompiler/backend/glasm/emit_glasm_select.cpp12
3 files changed, 8 insertions, 12 deletions
diff --git a/src/shader_recompiler/backend/glasm/emit_glasm_instructions.h b/src/shader_recompiler/backend/glasm/emit_glasm_instructions.h
index 13f47b253..222285021 100644
--- a/src/shader_recompiler/backend/glasm/emit_glasm_instructions.h
+++ b/src/shader_recompiler/backend/glasm/emit_glasm_instructions.h
@@ -214,8 +214,8 @@ void EmitSelectU64(EmitContext& ctx, std::string_view cond, std::string_view tru
std::string_view false_value);
void EmitSelectF16(EmitContext& ctx, std::string_view cond, std::string_view true_value,
std::string_view false_value);
-void EmitSelectF32(EmitContext& ctx, std::string_view cond, std::string_view true_value,
- std::string_view false_value);
+void EmitSelectF32(EmitContext& ctx, IR::Inst& inst, std::string_view cond,
+ std::string_view true_value, std::string_view false_value);
void EmitSelectF64(EmitContext& ctx, std::string_view cond, std::string_view true_value,
std::string_view false_value);
void EmitBitCastU16F16(EmitContext& ctx, IR::Inst& inst, const IR::Value& value);
diff --git a/src/shader_recompiler/backend/glasm/emit_glasm_integer.cpp b/src/shader_recompiler/backend/glasm/emit_glasm_integer.cpp
index 1289d950f..579806c38 100644
--- a/src/shader_recompiler/backend/glasm/emit_glasm_integer.cpp
+++ b/src/shader_recompiler/backend/glasm/emit_glasm_integer.cpp
@@ -12,7 +12,7 @@ namespace Shader::Backend::GLASM {
void EmitIAdd32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
[[maybe_unused]] std::string_view a, [[maybe_unused]] std::string_view b) {
- ctx.Add("ADD {},{},{};", inst, a, b);
+ ctx.Add("ADD.U {},{},{};", inst, a, b);
}
void EmitIAdd64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
@@ -22,7 +22,7 @@ void EmitIAdd64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& in
void EmitISub32([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
[[maybe_unused]] std::string_view a, [[maybe_unused]] std::string_view b) {
- ctx.Add("SUB {},{},{};", inst, a, b);
+ ctx.Add("SUB.U {},{},{};", inst, a, b);
}
void EmitISub64([[maybe_unused]] EmitContext& ctx, [[maybe_unused]] IR::Inst& inst,
diff --git a/src/shader_recompiler/backend/glasm/emit_glasm_select.cpp b/src/shader_recompiler/backend/glasm/emit_glasm_select.cpp
index 636cbe8a0..16f6c33f3 100644
--- a/src/shader_recompiler/backend/glasm/emit_glasm_select.cpp
+++ b/src/shader_recompiler/backend/glasm/emit_glasm_select.cpp
@@ -24,12 +24,7 @@ void EmitSelectU16(EmitContext&, std::string_view, std::string_view, std::string
void EmitSelectU32(EmitContext& ctx, IR::Inst& inst, std::string_view cond,
std::string_view true_value, std::string_view false_value) {
- ctx.Add("MOV.U.CC RC,{};", cond);
- ctx.Add("IF NE.x;");
- ctx.Add("MOV.U {},{};", inst, true_value);
- ctx.Add("ELSE;");
- ctx.Add("MOV.U {},{};", inst, false_value);
- ctx.Add("ENDIF;");
+ ctx.Add("CMP.S {},{},{},{};", inst, cond, true_value, false_value);
}
void EmitSelectU64(EmitContext&, std::string_view, std::string_view, std::string_view) {
@@ -40,8 +35,9 @@ void EmitSelectF16(EmitContext&, std::string_view, std::string_view, std::string
throw NotImplementedException("GLASM instruction");
}
-void EmitSelectF32(EmitContext&, std::string_view, std::string_view, std::string_view) {
- throw NotImplementedException("GLASM instruction");
+void EmitSelectF32(EmitContext& ctx, IR::Inst& inst, std::string_view cond,
+ std::string_view true_value, std::string_view false_value) {
+ ctx.Add("CMP.S {},{},{},{};", inst, cond, true_value, false_value);
}
void EmitSelectF64(EmitContext&, std::string_view, std::string_view, std::string_view) {