From 0200933ddd1312956612b8dc0504dff2a75eb6c3 Mon Sep 17 00:00:00 2001 From: TellowKrinkle Date: Sat, 28 Aug 2021 17:02:24 -0500 Subject: [PATCH] GS: Don't catch code generation exceptions If codegen throws an exception, it ends up just crashing when you jump to the incompletely-generated code which is kind of useless --- .../SW/GSDrawScanlineCodeGenerator.cpp | 9 +-------- .../Renderers/SW/GSSetupPrimCodeGenerator.cpp | 17 +++++------------ 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/pcsx2/GS/Renderers/SW/GSDrawScanlineCodeGenerator.cpp b/pcsx2/GS/Renderers/SW/GSDrawScanlineCodeGenerator.cpp index ba1ad03230..e95954c07f 100644 --- a/pcsx2/GS/Renderers/SW/GSDrawScanlineCodeGenerator.cpp +++ b/pcsx2/GS/Renderers/SW/GSDrawScanlineCodeGenerator.cpp @@ -37,14 +37,7 @@ GSDrawScanlineCodeGenerator::GSDrawScanlineCodeGenerator(void* param, uint64 key if (m_sel.breakpoint) db(0xCC); - try - { - Generate(); - } - catch (std::exception& e) - { - fprintf(stderr, "ERR:GSDrawScanlineCodeGenerator %s\n", e.what()); - } + Generate(); } void GSDrawScanlineCodeGenerator::modulate16(const Xmm& a, const Operand& f, uint8 shift) diff --git a/pcsx2/GS/Renderers/SW/GSSetupPrimCodeGenerator.cpp b/pcsx2/GS/Renderers/SW/GSSetupPrimCodeGenerator.cpp index f8d1137ee0..f001fcb782 100644 --- a/pcsx2/GS/Renderers/SW/GSSetupPrimCodeGenerator.cpp +++ b/pcsx2/GS/Renderers/SW/GSSetupPrimCodeGenerator.cpp @@ -30,19 +30,12 @@ GSSetupPrimCodeGenerator::GSSetupPrimCodeGenerator(void* param, uint64 key, void m_en.t = m_sel.fb && m_sel.tfx != TFX_NONE ? 1 : 0; m_en.c = m_sel.fb && !(m_sel.tfx == TFX_DECAL && m_sel.tcc) ? 1 : 0; - try - { #if _M_SSE >= 0x501 - Generate_AVX2(); + Generate_AVX2(); #else - if (m_cpu.has(util::Cpu::tAVX)) - Generate_AVX(); - else - Generate_SSE(); + if (m_cpu.has(util::Cpu::tAVX)) + Generate_AVX(); + else + Generate_SSE(); #endif - } - catch (std::exception& e) - { - fprintf(stderr, "ERR:GSSetupPrimCodeGenerator %s\n", e.what()); - } }