summaryrefslogtreecommitdiffstats
path: root/src/shader_recompiler/frontend/maxwell
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2021-05-27 22:51:00 +0200
committerameerj <52414509+ameerj@users.noreply.github.com>2021-07-23 03:51:34 +0200
commitb7764c3a796e53ac74009bc7d7cd153c64b6d743 (patch)
tree592a8be7cd43349cbabfc3d84693b443ddc0b5d8 /src/shader_recompiler/frontend/maxwell
parentglasm: Use integer lod for TXQ (diff)
downloadyuzu-b7764c3a796e53ac74009bc7d7cd153c64b6d743.tar
yuzu-b7764c3a796e53ac74009bc7d7cd153c64b6d743.tar.gz
yuzu-b7764c3a796e53ac74009bc7d7cd153c64b6d743.tar.bz2
yuzu-b7764c3a796e53ac74009bc7d7cd153c64b6d743.tar.lz
yuzu-b7764c3a796e53ac74009bc7d7cd153c64b6d743.tar.xz
yuzu-b7764c3a796e53ac74009bc7d7cd153c64b6d743.tar.zst
yuzu-b7764c3a796e53ac74009bc7d7cd153c64b6d743.zip
Diffstat (limited to 'src/shader_recompiler/frontend/maxwell')
-rw-r--r--src/shader_recompiler/frontend/maxwell/opcodes.cpp2
-rw-r--r--src/shader_recompiler/frontend/maxwell/program.cpp1
-rw-r--r--src/shader_recompiler/frontend/maxwell/translate/translate.cpp13
3 files changed, 11 insertions, 5 deletions
diff --git a/src/shader_recompiler/frontend/maxwell/opcodes.cpp b/src/shader_recompiler/frontend/maxwell/opcodes.cpp
index 12ddf2ac9..ccc40c20c 100644
--- a/src/shader_recompiler/frontend/maxwell/opcodes.cpp
+++ b/src/shader_recompiler/frontend/maxwell/opcodes.cpp
@@ -10,7 +10,7 @@
namespace Shader::Maxwell {
namespace {
constexpr std::array NAME_TABLE{
-#define INST(name, cute, encode) #cute,
+#define INST(name, cute, encode) cute,
#include "maxwell.inc"
#undef INST
};
diff --git a/src/shader_recompiler/frontend/maxwell/program.cpp b/src/shader_recompiler/frontend/maxwell/program.cpp
index ccdab1dad..900fc7ab1 100644
--- a/src/shader_recompiler/frontend/maxwell/program.cpp
+++ b/src/shader_recompiler/frontend/maxwell/program.cpp
@@ -7,6 +7,7 @@
#include <ranges>
#include <vector>
+#include "shader_recompiler/exception.h"
#include "shader_recompiler/frontend/ir/basic_block.h"
#include "shader_recompiler/frontend/ir/post_order.h"
#include "shader_recompiler/frontend/maxwell/program.h"
diff --git a/src/shader_recompiler/frontend/maxwell/translate/translate.cpp b/src/shader_recompiler/frontend/maxwell/translate/translate.cpp
index 0f4e7a251..8e3c4c5d5 100644
--- a/src/shader_recompiler/frontend/maxwell/translate/translate.cpp
+++ b/src/shader_recompiler/frontend/maxwell/translate/translate.cpp
@@ -30,16 +30,21 @@ void Translate(Environment& env, IR::Block* block, u32 location_begin, u32 locat
TranslatorVisitor visitor{env, *block};
for (Location pc = location_begin; pc != location_end; ++pc) {
const u64 insn{env.ReadInstruction(pc.Offset())};
- const Opcode opcode{Decode(insn)};
- switch (opcode) {
+ try {
+ const Opcode opcode{Decode(insn)};
+ switch (opcode) {
#define INST(name, cute, mask) \
case Opcode::name: \
Invoke<&TranslatorVisitor::name>(visitor, pc, insn); \
break;
#include "shader_recompiler/frontend/maxwell/maxwell.inc"
#undef OPCODE
- default:
- throw LogicError("Invalid opcode {}", opcode);
+ default:
+ throw LogicError("Invalid opcode {}", opcode);
+ }
+ } catch (Exception& exception) {
+ exception.Prepend(fmt::format("Translate {}: ", Decode(insn)));
+ throw;
}
}
}