From 34cffa86a47b42dcd21e1ae034c69f37b822da70 Mon Sep 17 00:00:00 2001
From: MerryMage <MerryMage@users.noreply.github.com>
Date: Tue, 23 Aug 2016 13:12:14 +0100
Subject: [PATCH] dead_code_elimination_pass: Update to use
 IR::Inst::MayHaveSideEffects

---
 src/ir_opt/dead_code_elimination_pass.cpp | 48 +----------------------
 1 file changed, 1 insertion(+), 47 deletions(-)

diff --git a/src/ir_opt/dead_code_elimination_pass.cpp b/src/ir_opt/dead_code_elimination_pass.cpp
index 592195a9..3a6711ea 100644
--- a/src/ir_opt/dead_code_elimination_pass.cpp
+++ b/src/ir_opt/dead_code_elimination_pass.cpp
@@ -13,52 +13,6 @@ namespace Dynarmic {
 namespace Optimization {
 
 void DeadCodeElimination(IR::Block& block) {
-    const auto is_side_effect_free = [](IR::Opcode op) -> bool {
-        switch (op) {
-        case IR::Opcode::Breakpoint:
-        case IR::Opcode::SetRegister:
-        case IR::Opcode::SetExtendedRegister32:
-        case IR::Opcode::SetExtendedRegister64:
-        case IR::Opcode::SetCpsr:
-        case IR::Opcode::SetNFlag:
-        case IR::Opcode::SetZFlag:
-        case IR::Opcode::SetCFlag:
-        case IR::Opcode::SetVFlag:
-        case IR::Opcode::OrQFlag:
-        case IR::Opcode::BXWritePC:
-        case IR::Opcode::CallSupervisor:
-        case IR::Opcode::PushRSB:
-        case IR::Opcode::FPAbs32:
-        case IR::Opcode::FPAbs64:
-        case IR::Opcode::FPAdd32:
-        case IR::Opcode::FPAdd64:
-        case IR::Opcode::FPDiv32:
-        case IR::Opcode::FPDiv64:
-        case IR::Opcode::FPMul32:
-        case IR::Opcode::FPMul64:
-        case IR::Opcode::FPNeg32:
-        case IR::Opcode::FPNeg64:
-        case IR::Opcode::FPSqrt32:
-        case IR::Opcode::FPSqrt64:
-        case IR::Opcode::FPSub32:
-        case IR::Opcode::FPSub64:
-        case IR::Opcode::ClearExclusive:
-        case IR::Opcode::SetExclusive:
-        case IR::Opcode::WriteMemory8:
-        case IR::Opcode::WriteMemory16:
-        case IR::Opcode::WriteMemory32:
-        case IR::Opcode::WriteMemory64:
-        case IR::Opcode::ExclusiveWriteMemory8:
-        case IR::Opcode::ExclusiveWriteMemory16:
-        case IR::Opcode::ExclusiveWriteMemory32:
-        case IR::Opcode::ExclusiveWriteMemory64:
-            return false;
-        default:
-            ASSERT(IR::GetTypeOf(op) != IR::Type::Void);
-            return true;
-        }
-    };
-
     // We iterate over the instructions in reverse order.
     // This is because removing an instruction reduces the number of uses for earlier instructions.
 
@@ -69,7 +23,7 @@ void DeadCodeElimination(IR::Block& block) {
     auto iter = block.end();
     do {
         --iter;
-        if (!iter->HasUses() && is_side_effect_free(iter->GetOpcode())) {
+        if (!iter->HasUses() && !iter->MayHaveSideEffects()) {
             iter->Invalidate();
             iter = block.instructions.erase(iter);
         }