diff --git a/Source/Core/Common/GekkoDisassembler.cpp b/Source/Core/Common/GekkoDisassembler.cpp
index 59ea32f170..46905c8773 100644
--- a/Source/Core/Common/GekkoDisassembler.cpp
+++ b/Source/Core/Common/GekkoDisassembler.cpp
@@ -153,7 +153,6 @@ u32* GekkoDisassembler::m_instr = nullptr;
 u32* GekkoDisassembler::m_iaddr = nullptr;
 std::string GekkoDisassembler::m_opcode;
 std::string GekkoDisassembler::m_operands;
-unsigned char GekkoDisassembler::m_flags = PPCF_ILLEGAL;
 
 static u32 HelperRotateMask(int r, int mb, int me)
 {
@@ -368,8 +367,6 @@ void GekkoDisassembler::ill(u32 in)
     m_opcode = "(ill)";
     m_operands = fmt::format("{:08x}", in);
   }
-
-  m_flags |= PPCF_ILLEGAL;
 }
 
 // Generate immediate instruction operand.
@@ -387,10 +384,6 @@ std::string GekkoDisassembler::imm(u32 in, int uimm, int type, bool hex)
     if (i > 0x7fff)
       i -= 0x10000;
   }
-  else
-  {
-    m_flags |= PPCF_UNSIGNED;
-  }
 
   switch (type)
   {
@@ -454,7 +447,6 @@ void GekkoDisassembler::trapi(u32 in, unsigned char dmode)
 {
   const char* cnd = trap_condition[PPCGETD(in)];
 
-  m_flags |= dmode;
   if (cnd != nullptr)
   {
     m_opcode = fmt::format("t{}{}", dmode ? 'd' : 'w', cnd);
@@ -473,9 +465,6 @@ void GekkoDisassembler::cmpi(u32 in, int uimm)
 
   if (i < 2)
   {
-    if (i != 0)
-      m_flags |= PPCF_64;
-
     m_opcode = fmt::format("{}i", cmpname[uimm * 2 + i]);
 
     i = (int)PPCGETCRD(in);
@@ -630,7 +619,7 @@ void GekkoDisassembler::crop(u32 in, std::string_view n1, std::string_view n2)
   }
 }
 
-void GekkoDisassembler::nooper(u32 in, std::string_view name, unsigned char dmode)
+void GekkoDisassembler::nooper(u32 in, std::string_view name)
 {
   if (in & (PPCDMASK | PPCAMASK | PPCBMASK | 1))
   {
@@ -638,7 +627,6 @@ void GekkoDisassembler::nooper(u32 in, std::string_view name, unsigned char dmod
   }
   else
   {
-    m_flags |= dmode;
     m_opcode = name;
   }
 }
@@ -669,7 +657,6 @@ void GekkoDisassembler::rld(u32 in, std::string_view name, int i)
   int bsh = i ? (int)PPCGETB(in) : (int)(((in & 2) << 4) + PPCGETB(in));
   int m = (int)(in & 0x7e0) >> 5;
 
-  m_flags |= PPCF_64;
   m_opcode = fmt::format("rld{}{}", name, (in & 1) ? "." : "");
   m_operands = fmt::format("{}, {}, {}{}, {}", regnames[a], regnames[s], regsel[i], bsh, m);
 }
@@ -680,9 +667,6 @@ void GekkoDisassembler::cmp(u32 in)
 
   if (i < 2)
   {
-    if (i != 0)
-      m_flags |= PPCF_64;
-
     m_opcode = cmpname[((in & PPCIDX2MASK) ? 2 : 0) + i];
 
     i = (int)PPCGETCRD(in);
@@ -704,7 +688,6 @@ void GekkoDisassembler::trap(u32 in, unsigned char dmode)
 
   if (cnd != nullptr)
   {
-    m_flags |= dmode;
     m_opcode = fmt::format("t{}{}", dmode ? 'd' : 'w', cnd);
     m_operands = ra_rb(in);
   }
@@ -714,7 +697,6 @@ void GekkoDisassembler::trap(u32 in, unsigned char dmode)
     {
       if (dmode)
       {
-        m_flags |= dmode;
         m_opcode = "td";
         m_operands = "31,0,0";
       }
@@ -732,7 +714,7 @@ void GekkoDisassembler::trap(u32 in, unsigned char dmode)
 
 // Standard instruction: xxxx rD,rA,rB
 void GekkoDisassembler::dab(u32 in, std::string_view name, int mask, int smode, int chkoe,
-                            int chkrc, unsigned char dmode)
+                            int chkrc)
 {
   if (chkrc >= 0 && ((in & 1) != (unsigned int)chkrc))
   {
@@ -740,8 +722,6 @@ void GekkoDisassembler::dab(u32 in, std::string_view name, int mask, int smode,
   }
   else
   {
-    m_flags |= dmode;
-
     // rA,rS,rB
     if (smode)
       in = swapda(in);
@@ -753,8 +733,7 @@ void GekkoDisassembler::dab(u32 in, std::string_view name, int mask, int smode,
 }
 
 // Last operand is no register: xxxx rD,rA,NB
-void GekkoDisassembler::rrn(u32 in, std::string_view name, int smode, int chkoe, int chkrc,
-                            unsigned char dmode)
+void GekkoDisassembler::rrn(u32 in, std::string_view name, int smode, int chkoe, int chkrc)
 {
   if (chkrc >= 0 && ((in & 1) != (unsigned int)chkrc))
   {
@@ -762,8 +741,6 @@ void GekkoDisassembler::rrn(u32 in, std::string_view name, int smode, int chkoe,
   }
   else
   {
-    m_flags |= dmode;
-
     // rA,rS,NB
     if (smode)
       in = swapda(in);
@@ -806,7 +783,6 @@ void GekkoDisassembler::msr(u32 in, int smode)
   }
   else
   {
-    m_flags |= PPCF_SUPER;
     m_opcode = fmt::format("m{}sr", smode ? 't' : 'f');
 
     if (smode)
@@ -828,9 +804,6 @@ void GekkoDisassembler::mspr(u32 in, int smode)
   }
   else
   {
-    if (spr != 1 && spr != 8 && spr != 9)
-      m_flags |= PPCF_SUPER;
-
     const char* x;
     switch (spr)
     {
@@ -893,7 +866,6 @@ void GekkoDisassembler::mtb(u32 in)
       break;
 
     default:
-      m_flags |= PPCF_SUPER;
       m_operands += fmt::format(",{}", tbr);
       break;
     }
@@ -908,18 +880,16 @@ void GekkoDisassembler::sradi(u32 in)
   int a = (int)PPCGETA(in);
   int bsh = (int)(((in & 2) << 4) + PPCGETB(in));
 
-  m_flags |= PPCF_64;
   m_opcode = fmt::format("sradi{}", (in & 1) ? "." : "");
   m_operands = fmt::format("{}, {}, {}", regnames[a], regnames[s], bsh);
 }
 
-void GekkoDisassembler::ldst(u32 in, std::string_view name, char reg, unsigned char dmode)
+void GekkoDisassembler::ldst(u32 in, std::string_view name, char reg)
 {
   int s = (int)PPCGETD(in);
   int a = (int)PPCGETA(in);
   int d = (u32)(in & 0xffff);
 
-  m_flags |= dmode;
   m_opcode = name;
 
   if (reg == 'r')
@@ -933,11 +903,10 @@ void GekkoDisassembler::ldst(u32 in, std::string_view name, char reg, unsigned c
 }
 
 // Standard floating point instruction: xxxx fD,fA,fC,fB
-void GekkoDisassembler::fdabc(u32 in, std::string_view name, int mask, unsigned char dmode)
+void GekkoDisassembler::fdabc(u32 in, std::string_view name, int mask)
 {
   int err = 0;
 
-  m_flags |= dmode;
   m_opcode = fmt::format("f{}{}", name, rcsel[in & 1]);
   m_operands += fmt::format("f{}", PPCGETD(in));
 
@@ -1210,7 +1179,7 @@ void GekkoDisassembler::ps(u32 inst)
     if (inst & PPCDMASK)
       ill(inst);
     else
-      dab(inst, "dcbz_l", 3, 0, 0, 0, 0);
+      dab(inst, "dcbz_l", 3, 0, 0, 0);
     return;
   }
 
@@ -1259,7 +1228,6 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
 
   m_opcode.clear();
   m_operands.clear();
-  m_flags = 0;
 
   switch (PPCGETIDX(in))
   {
@@ -1347,7 +1315,7 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
       break;
 
     case 50:
-      nooper(in, "rfi", PPCF_SUPER);
+      nooper(in, "rfi");
       break;
 
     case 129:
@@ -1355,7 +1323,7 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
       break;
 
     case 150:
-      nooper(in, "isync", 0);
+      nooper(in, "isync");
       break;
 
     case 193:
@@ -1475,89 +1443,89 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
 
     case 8:
     case (PPCOE >> 1) + 8:
-      dab(swapab(in), "subc", 7, 0, 1, -1, 0);
+      dab(swapab(in), "subc", 7, 0, 1, -1);
       break;
 
     case 9:
-      dab(in, "mulhdu", 7, 0, 0, -1, PPCF_64);
+      dab(in, "mulhdu", 7, 0, 0, -1);
       break;
 
     case 10:
     case (PPCOE >> 1) + 10:
-      dab(in, "addc", 7, 0, 1, -1, 0);
+      dab(in, "addc", 7, 0, 1, -1);
       break;
 
     case 11:
-      dab(in, "mulhwu", 7, 0, 0, -1, 0);
+      dab(in, "mulhwu", 7, 0, 0, -1);
       break;
 
     case 19:
       if (in & (PPCAMASK | PPCBMASK))
         ill(in);
       else
-        dab(in, "mfcr", 4, 0, 0, 0, 0);
+        dab(in, "mfcr", 4, 0, 0, 0);
       break;
 
     case 20:
-      dab(in, "lwarx", 7, 0, 0, 0, 0);
+      dab(in, "lwarx", 7, 0, 0, 0);
       break;
 
     case 21:
-      dab(in, "ldx", 7, 0, 0, 0, PPCF_64);
+      dab(in, "ldx", 7, 0, 0, 0);
       break;
 
     case 23:
-      dab(in, "lwzx", 7, 0, 0, 0, 0);
+      dab(in, "lwzx", 7, 0, 0, 0);
       break;
 
     case 24:
-      dab(in, "slw", 7, 1, 0, -1, 0);
+      dab(in, "slw", 7, 1, 0, -1);
       break;
 
     case 26:
       if (in & PPCBMASK)
         ill(in);
       else
-        dab(in, "cntlzw", 6, 1, 0, -1, 0);
+        dab(in, "cntlzw", 6, 1, 0, -1);
       break;
 
     case 27:
-      dab(in, "sld", 7, 1, 0, -1, PPCF_64);
+      dab(in, "sld", 7, 1, 0, -1);
       break;
 
     case 28:
-      dab(in, "and", 7, 1, 0, -1, 0);
+      dab(in, "and", 7, 1, 0, -1);
       break;
 
     case 40:
     case (PPCOE >> 1) + 40:
-      dab(swapab(in), "sub", 7, 0, 1, -1, 0);
+      dab(swapab(in), "sub", 7, 0, 1, -1);
       break;
 
     case 53:
-      dab(in, "ldux", 7, 0, 0, 0, PPCF_64);
+      dab(in, "ldux", 7, 0, 0, 0);
       break;
 
     case 54:
       if (in & PPCDMASK)
         ill(in);
       else
-        dab(in, "dcbst", 3, 0, 0, 0, 0);
+        dab(in, "dcbst", 3, 0, 0, 0);
       break;
 
     case 55:
-      dab(in, "lwzux", 7, 0, 0, 0, 0);
+      dab(in, "lwzux", 7, 0, 0, 0);
       break;
 
     case 58:
       if (in & PPCBMASK)
         ill(in);
       else
-        dab(in, "cntlzd", 6, 1, 0, -1, PPCF_64);
+        dab(in, "cntlzd", 6, 1, 0, -1);
       break;
 
     case 60:
-      dab(in, "andc", 7, 1, 0, -1, 0);
+      dab(in, "andc", 7, 1, 0, -1);
       break;
 
     case 68:
@@ -1565,33 +1533,33 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
       break;
 
     case 73:
-      dab(in, "mulhd", 7, 0, 0, -1, PPCF_64);
+      dab(in, "mulhd", 7, 0, 0, -1);
       break;
 
     case 75:
-      dab(in, "mulhw", 7, 0, 0, -1, 0);
+      dab(in, "mulhw", 7, 0, 0, -1);
       break;
 
     case 83:
       if (in & (PPCAMASK | PPCBMASK))
         ill(in);
       else
-        dab(in, "mfmsr", 4, 0, 0, 0, PPCF_SUPER);
+        dab(in, "mfmsr", 4, 0, 0, 0);
       break;
 
     case 84:
-      dab(in, "ldarx", 7, 0, 0, 0, PPCF_64);
+      dab(in, "ldarx", 7, 0, 0, 0);
       break;
 
     case 86:
       if (in & PPCDMASK)
         ill(in);
       else
-        dab(in, "dcbf", 3, 0, 0, 0, 0);
+        dab(in, "dcbf", 3, 0, 0, 0);
       break;
 
     case 87:
-      dab(in, "lbzx", 7, 0, 0, 0, 0);
+      dab(in, "lbzx", 7, 0, 0, 0);
       break;
 
     case 104:
@@ -1599,28 +1567,28 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
       if (in & PPCBMASK)
         ill(in);
       else
-        dab(in, "neg", 6, 0, 1, -1, 0);
+        dab(in, "neg", 6, 0, 1, -1);
       break;
 
     case 119:
-      dab(in, "lbzux", 7, 0, 0, 0, 0);
+      dab(in, "lbzux", 7, 0, 0, 0);
       break;
 
     case 124:
       if (PPCGETD(in) == PPCGETB(in))
-        dab(in, "not", 6, 1, 0, -1, 0);
+        dab(in, "not", 6, 1, 0, -1);
       else
-        dab(in, "nor", 7, 1, 0, -1, 0);
+        dab(in, "nor", 7, 1, 0, -1);
       break;
 
     case 136:
     case (PPCOE >> 1) + 136:
-      dab(in, "subfe", 7, 0, 1, -1, 0);
+      dab(in, "subfe", 7, 0, 1, -1);
       break;
 
     case 138:
     case (PPCOE >> 1) + 138:
-      dab(in, "adde", 7, 0, 1, -1, 0);
+      dab(in, "adde", 7, 0, 1, -1);
       break;
 
     case 144:
@@ -1631,27 +1599,27 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
       if (in & (PPCAMASK | PPCBMASK))
         ill(in);
       else
-        dab(in, "mtmsr", 4, 0, 0, 0, PPCF_SUPER);
+        dab(in, "mtmsr", 4, 0, 0, 0);
       break;
 
     case 149:
-      dab(in, "stdx", 7, 0, 0, 0, PPCF_64);
+      dab(in, "stdx", 7, 0, 0, 0);
       break;
 
     case 150:
-      dab(in, "stwcx.", 7, 0, 0, 1, 0);
+      dab(in, "stwcx.", 7, 0, 0, 1);
       break;
 
     case 151:
-      dab(in, "stwx", 7, 0, 0, 0, 0);
+      dab(in, "stwx", 7, 0, 0, 0);
       break;
 
     case 181:
-      dab(in, "stdux", 7, 0, 0, 0, PPCF_64);
+      dab(in, "stdux", 7, 0, 0, 0);
       break;
 
     case 183:
-      dab(in, "stwux", 7, 0, 0, 0, 0);
+      dab(in, "stwux", 7, 0, 0, 0);
       break;
 
     case 200:
@@ -1659,7 +1627,7 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
       if (in & PPCBMASK)
         ill(in);
       else
-        dab(in, "subfze", 6, 0, 1, -1, 0);
+        dab(in, "subfze", 6, 0, 1, -1);
       break;
 
     case 202:
@@ -1667,7 +1635,7 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
       if (in & PPCBMASK)
         ill(in);
       else
-        dab(in, "addze", 6, 0, 1, -1, 0);
+        dab(in, "addze", 6, 0, 1, -1);
       break;
 
     case 210:
@@ -1675,11 +1643,11 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
       break;
 
     case 214:
-      dab(in, "stdcx.", 7, 0, 0, 1, PPCF_64);
+      dab(in, "stdcx.", 7, 0, 0, 1);
       break;
 
     case 215:
-      dab(in, "stbx", 7, 0, 0, 0, 0);
+      dab(in, "stbx", 7, 0, 0, 0);
       break;
 
     case 232:
@@ -1687,12 +1655,12 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
       if (in & PPCBMASK)
         ill(in);
       else
-        dab(in, "subfme", 6, 0, 1, -1, 0);
+        dab(in, "subfme", 6, 0, 1, -1);
       break;
 
     case 233:
     case (PPCOE >> 1) + 233:
-      dab(in, "mulld", 7, 0, 1, -1, PPCF_64);
+      dab(in, "mulld", 7, 0, 1, -1);
       break;
 
     case 234:
@@ -1700,69 +1668,69 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
       if (in & PPCBMASK)
         ill(in);
       else
-        dab(in, "addme", 6, 0, 1, -1, 0);
+        dab(in, "addme", 6, 0, 1, -1);
       break;
 
     case 235:
     case (PPCOE >> 1) + 235:
-      dab(in, "mullw", 7, 0, 1, -1, 0);
+      dab(in, "mullw", 7, 0, 1, -1);
       break;
 
     case 242:
       if (in & PPCAMASK)
         ill(in);
       else
-        dab(in, "mtsrin", 5, 0, 0, 0, PPCF_SUPER);
+        dab(in, "mtsrin", 5, 0, 0, 0);
       break;
 
     case 246:
       if (in & PPCDMASK)
         ill(in);
       else
-        dab(in, "dcbtst", 3, 0, 0, 0, 0);
+        dab(in, "dcbtst", 3, 0, 0, 0);
       break;
 
     case 247:
-      dab(in, "stbux", 7, 0, 0, 0, 0);
+      dab(in, "stbux", 7, 0, 0, 0);
       break;
 
     case 266:
     case (PPCOE >> 1) + 266:
-      dab(in, "add", 7, 0, 1, -1, 0);
+      dab(in, "add", 7, 0, 1, -1);
       break;
 
     case 278:
       if (in & PPCDMASK)
         ill(in);
       else
-        dab(in, "dcbt", 3, 0, 0, 0, 0);
+        dab(in, "dcbt", 3, 0, 0, 0);
       break;
 
     case 279:
-      dab(in, "lhzx", 7, 0, 0, 0, 0);
+      dab(in, "lhzx", 7, 0, 0, 0);
       break;
 
     case 284:
-      dab(in, "eqv", 7, 1, 0, -1, 0);
+      dab(in, "eqv", 7, 1, 0, -1);
       break;
 
     case 306:
       if (in & (PPCDMASK | PPCAMASK))
         ill(in);
       else
-        dab(in, "tlbie", 1, 0, 0, 0, PPCF_SUPER);
+        dab(in, "tlbie", 1, 0, 0, 0);
       break;
 
     case 310:
-      dab(in, "eciwx", 7, 0, 0, 0, 0);
+      dab(in, "eciwx", 7, 0, 0, 0);
       break;
 
     case 311:
-      dab(in, "lhzux", 7, 0, 0, 0, 0);
+      dab(in, "lhzux", 7, 0, 0, 0);
       break;
 
     case 316:
-      dab(in, "xor", 7, 1, 0, -1, 0);
+      dab(in, "xor", 7, 1, 0, -1);
       break;
 
     case 339:
@@ -1770,15 +1738,15 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
       break;
 
     case 341:
-      dab(in, "lwax", 7, 0, 0, 0, PPCF_64);
+      dab(in, "lwax", 7, 0, 0, 0);
       break;
 
     case 343:
-      dab(in, "lhax", 7, 0, 0, 0, 0);
+      dab(in, "lhax", 7, 0, 0, 0);
       break;
 
     case 370:
-      nooper(in, "tlbia", PPCF_SUPER);
+      nooper(in, "tlbia");
       break;
 
     case 371:
@@ -1786,19 +1754,19 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
       break;
 
     case 373:
-      dab(in, "lwaux", 7, 0, 0, 0, PPCF_64);
+      dab(in, "lwaux", 7, 0, 0, 0);
       break;
 
     case 375:
-      dab(in, "lhaux", 7, 0, 0, 0, 0);
+      dab(in, "lhaux", 7, 0, 0, 0);
       break;
 
     case 407:
-      dab(in, "sthx", 7, 0, 0, 0, 0);
+      dab(in, "sthx", 7, 0, 0, 0);
       break;
 
     case 412:
-      dab(in, "orc", 7, 1, 0, -1, 0);
+      dab(in, "orc", 7, 1, 0, -1);
       break;
 
     case 413:
@@ -1809,32 +1777,32 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
       if (in & (PPCDMASK | PPCAMASK))
         ill(in);
       else
-        dab(in, "slbie", 1, 0, 0, 0, PPCF_SUPER | PPCF_64);
+        dab(in, "slbie", 1, 0, 0, 0);
       break;
 
     case 438:
-      dab(in, "ecowx", 7, 0, 0, 0, 0);
+      dab(in, "ecowx", 7, 0, 0, 0);
       break;
 
     case 439:
-      dab(in, "sthux", 7, 0, 0, 0, 0);
+      dab(in, "sthux", 7, 0, 0, 0);
       break;
 
     case 444:
       if (PPCGETD(in) == PPCGETB(in))
-        dab(in, "mr", 6, 1, 0, -1, 0);
+        dab(in, "mr", 6, 1, 0, -1);
       else
-        dab(in, "or", 7, 1, 0, -1, 0);
+        dab(in, "or", 7, 1, 0, -1);
       break;
 
     case 457:
     case (PPCOE >> 1) + 457:
-      dab(in, "divdu", 7, 0, 1, -1, PPCF_64);
+      dab(in, "divdu", 7, 0, 1, -1);
       break;
 
     case 459:
     case (PPCOE >> 1) + 459:
-      dab(in, "divwu", 7, 0, 1, -1, 0);
+      dab(in, "divwu", 7, 0, 1, -1);
       break;
 
     case 467:
@@ -1845,25 +1813,25 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
       if (in & PPCDMASK)
         ill(in);
       else
-        dab(in, "dcbi", 3, 0, 0, 0, 0);
+        dab(in, "dcbi", 3, 0, 0, 0);
       break;
 
     case 476:
-      dab(in, "nand", 7, 1, 0, -1, 0);
+      dab(in, "nand", 7, 1, 0, -1);
       break;
 
     case 489:
     case (PPCOE >> 1) + 489:
-      dab(in, "divd", 7, 0, 1, -1, PPCF_64);
+      dab(in, "divd", 7, 0, 1, -1);
       break;
 
     case 491:
     case (PPCOE >> 1) + 491:
-      dab(in, "divw", 7, 0, 1, -1, 0);
+      dab(in, "divw", 7, 0, 1, -1);
       break;
 
     case 498:
-      nooper(in, "slbia", PPCF_SUPER | PPCF_64);
+      nooper(in, "slbia");
       break;
 
     case 512:
@@ -1879,11 +1847,11 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
       break;
 
     case 533:
-      dab(in, "lswx", 7, 0, 0, 0, 0);
+      dab(in, "lswx", 7, 0, 0, 0);
       break;
 
     case 534:
-      dab(in, "lwbrx", 7, 0, 0, 0, 0);
+      dab(in, "lwbrx", 7, 0, 0, 0);
       break;
 
     case 535:
@@ -1891,15 +1859,15 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
       break;
 
     case 536:
-      dab(in, "srw", 7, 1, 0, -1, 0);
+      dab(in, "srw", 7, 1, 0, -1);
       break;
 
     case 539:
-      dab(in, "srd", 7, 1, 0, -1, PPCF_64);
+      dab(in, "srd", 7, 1, 0, -1);
       break;
 
     case 566:
-      nooper(in, "tlbsync", PPCF_SUPER);
+      nooper(in, "tlbsync");
       break;
 
     case 567:
@@ -1911,11 +1879,11 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
       break;
 
     case 597:
-      rrn(in, "lswi", 0, 0, 0, 0);
+      rrn(in, "lswi", 0, 0, 0);
       break;
 
     case 598:
-      nooper(in, "sync", PPCF_SUPER);
+      nooper(in, "sync");
       break;
 
     case 599:
@@ -1930,15 +1898,15 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
       if (in & PPCAMASK)
         ill(in);
       else
-        dab(in, "mfsrin", 5, 0, 0, 0, PPCF_SUPER);
+        dab(in, "mfsrin", 5, 0, 0, 0);
       break;
 
     case 661:
-      dab(in, "stswx", 7, 0, 0, 0, 0);
+      dab(in, "stswx", 7, 0, 0, 0);
       break;
 
     case 662:
-      dab(in, "stwbrx", 7, 0, 0, 0, 0);
+      dab(in, "stwbrx", 7, 0, 0, 0);
       break;
 
     case 663:
@@ -1950,7 +1918,7 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
       break;
 
     case 725:
-      rrn(in, "stswi", 0, 0, 0, 0);
+      rrn(in, "stswi", 0, 0, 0);
       break;
 
     case 727:
@@ -1962,48 +1930,48 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
       break;
 
     case 790:
-      dab(in, "lhbrx", 7, 0, 0, 0, 0);
+      dab(in, "lhbrx", 7, 0, 0, 0);
       break;
 
     case 792:
-      dab(in, "sraw", 7, 1, 0, -1, 0);
+      dab(in, "sraw", 7, 1, 0, -1);
       break;
 
     case 794:
-      dab(in, "srad", 7, 1, 0, -1, PPCF_64);
+      dab(in, "srad", 7, 1, 0, -1);
       break;
 
     case 824:
-      rrn(in, "srawi", 1, 0, -1, 0);
+      rrn(in, "srawi", 1, 0, -1);
       break;
 
     case 854:
-      nooper(in, "eieio", PPCF_SUPER);
+      nooper(in, "eieio");
       break;
 
     case 918:
-      dab(in, "sthbrx", 7, 0, 0, 0, 0);
+      dab(in, "sthbrx", 7, 0, 0, 0);
       break;
 
     case 922:
       if (in & PPCBMASK)
         ill(in);
       else
-        dab(in, "extsh", 6, 1, 0, -1, 0);
+        dab(in, "extsh", 6, 1, 0, -1);
       break;
 
     case 954:
       if (in & PPCBMASK)
         ill(in);
       else
-        dab(in, "extsb", 6, 1, 0, -1, 0);
+        dab(in, "extsb", 6, 1, 0, -1);
       break;
 
     case 982:
       if (in & PPCDMASK)
         ill(in);
       else
-        dab(in, "icbi", 3, 0, 0, 0, 0);
+        dab(in, "icbi", 3, 0, 0, 0);
       break;
 
     case 983:
@@ -2014,14 +1982,14 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
       if (in & PPCBMASK)
         ill(in);
       else
-        dab(in, "extsw", 6, 1, 0, -1, PPCF_64);
+        dab(in, "extsw", 6, 1, 0, -1);
       break;
 
     case 1014:
       if (in & PPCDMASK)
         ill(in);
       else
-        dab(in, "dcbz", 3, 0, 0, 0, 0);
+        dab(in, "dcbz", 3, 0, 0, 0);
       break;
 
     default:
@@ -2046,7 +2014,7 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
   case 45:
   case 46:
   case 47:
-    ldst(in, ldstnames[PPCGETIDX(in) - 32], 'r', 0);
+    ldst(in, ldstnames[PPCGETIDX(in) - 32], 'r');
     break;
 
   case 48:
@@ -2057,20 +2025,20 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
   case 53:
   case 54:
   case 55:
-    ldst(in, ldstnames[PPCGETIDX(in) - 32], 'f', 0);
+    ldst(in, ldstnames[PPCGETIDX(in) - 32], 'f');
     break;
 
   case 58:
     switch (in & 3)
     {
     case 0:
-      ldst(in & ~3, "ld", 'r', PPCF_64);
+      ldst(in & ~3, "ld", 'r');
       break;
     case 1:
-      ldst(in & ~3, "ldu", 'r', PPCF_64);
+      ldst(in & ~3, "ldu", 'r');
       break;
     case 2:
-      ldst(in & ~3, "lwa", 'r', PPCF_64);
+      ldst(in & ~3, "lwa", 'r');
       break;
     default:
       ill(in);
@@ -2082,43 +2050,43 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
     switch (in & 0x3e)
     {
     case 36:
-      fdabc(in, "divs", 5, 0);
+      fdabc(in, "divs", 5);
       break;
 
     case 40:
-      fdabc(in, "subs", 5, 0);
+      fdabc(in, "subs", 5);
       break;
 
     case 42:
-      fdabc(in, "adds", 5, 0);
+      fdabc(in, "adds", 5);
       break;
 
     case 44:
-      fdabc(in, "sqrts", 1, 0);
+      fdabc(in, "sqrts", 1);
       break;
 
     case 48:
-      fdabc(in, "res", 1, 0);
+      fdabc(in, "res", 1);
       break;
 
     case 50:
-      fdabc(in, "muls", 6, 0);
+      fdabc(in, "muls", 6);
       break;
 
     case 56:
-      fdabc(in, "msubs", 7, 0);
+      fdabc(in, "msubs", 7);
       break;
 
     case 58:
-      fdabc(in, "madds", 7, 0);
+      fdabc(in, "madds", 7);
       break;
 
     case 60:
-      fdabc(in, "nmsubs", 7, 0);
+      fdabc(in, "nmsubs", 7);
       break;
 
     case 62:
-      fdabc(in, "nmadds", 7, 0);
+      fdabc(in, "nmadds", 7);
       break;
 
     default:
@@ -2131,10 +2099,10 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
     switch (in & 3)
     {
     case 0:
-      ldst(in & ~3, "std", 'r', PPCF_64);
+      ldst(in & ~3, "std", 'r');
       break;
     case 1:
-      ldst(in & ~3, "stdu", 'r', PPCF_64);
+      ldst(in & ~3, "stdu", 'r');
       break;
     default:
       ill(in);
@@ -2148,47 +2116,47 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
       switch (in & 0x1e)
       {
       case 4:
-        fdabc(in, "div", 5, 0);
+        fdabc(in, "div", 5);
         break;
 
       case 8:
-        fdabc(in, "sub", 5, 0);
+        fdabc(in, "sub", 5);
         break;
 
       case 10:
-        fdabc(in, "add", 5, 0);
+        fdabc(in, "add", 5);
         break;
 
       case 12:
-        fdabc(in, "sqrt", 1, 0);
+        fdabc(in, "sqrt", 1);
         break;
 
       case 14:
-        fdabc(in, "sel", 7, 0);
+        fdabc(in, "sel", 7);
         break;
 
       case 18:
-        fdabc(in, "mul", 6, 0);
+        fdabc(in, "mul", 6);
         break;
 
       case 20:
-        fdabc(in, "rsqrte", 1, 0);
+        fdabc(in, "rsqrte", 1);
         break;
 
       case 24:
-        fdabc(in, "msub", 7, 0);
+        fdabc(in, "msub", 7);
         break;
 
       case 26:
-        fdabc(in, "madd", 7, 0);
+        fdabc(in, "madd", 7);
         break;
 
       case 28:
-        fdabc(in, "nmsub", 7, 0);
+        fdabc(in, "nmsub", 7);
         break;
 
       case 30:
-        fdabc(in, "nmadd", 7, 0);
+        fdabc(in, "nmadd", 7);
         break;
 
       default:
@@ -2205,15 +2173,15 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
         break;
 
       case 12:
-        fdabc(in, "rsp", 1, 0);
+        fdabc(in, "rsp", 1);
         break;
 
       case 14:
-        fdabc(in, "ctiw", 1, 0);
+        fdabc(in, "ctiw", 1);
         break;
 
       case 15:
-        fdabc(in, "ctiwz", 1, 0);
+        fdabc(in, "ctiwz", 1);
         break;
 
       case 32:
@@ -2225,7 +2193,7 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
         break;
 
       case 40:
-        fdabc(in, "neg", 9, 0);
+        fdabc(in, "neg", 9);
         break;
 
       case 64:
@@ -2253,18 +2221,18 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
         break;
 
       case 136:
-        fdabc(in, "nabs", 9, 0);
+        fdabc(in, "nabs", 9);
         break;
 
       case 264:
-        fdabc(in, "abs", 9, 0);
+        fdabc(in, "abs", 9);
         break;
 
       case 583:
         if (in & (PPCAMASK | PPCBMASK))
           ill(in);
         else
-          dab(in, "mffs", 4, 0, 0, -1, 0);
+          dab(in, "mffs", 4, 0, 0, -1);
         break;
 
       case 711:
@@ -2280,15 +2248,15 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
         break;
 
       case 814:
-        fdabc(in, "fctid", 9, PPCF_64);
+        fdabc(in, "fctid", 9);
         break;
 
       case 815:
-        fdabc(in, "fctidz", 9, PPCF_64);
+        fdabc(in, "fctidz", 9);
         break;
 
       case 846:
-        fdabc(in, "fcfid", 9, PPCF_64);
+        fdabc(in, "fcfid", 9);
         break;
 
       default:
diff --git a/Source/Core/Common/GekkoDisassembler.h b/Source/Core/Common/GekkoDisassembler.h
index e18fd584f9..a40323abf6 100644
--- a/Source/Core/Common/GekkoDisassembler.h
+++ b/Source/Core/Common/GekkoDisassembler.h
@@ -66,23 +66,21 @@ private:
   static void bli(u32 in);
   static void mcrf(u32 in, std::string_view suffix);
   static void crop(u32 in, std::string_view n1, std::string_view n2);
-  static void nooper(u32 in, std::string_view name, unsigned char dmode);
+  static void nooper(u32 in, std::string_view name);
   static void rlw(u32 in, std::string_view name, int i);
   static void ori(u32 in, std::string_view name);
   static void rld(u32 in, std::string_view name, int i);
   static void cmp(u32 in);
   static void trap(u32 in, unsigned char dmode);
-  static void dab(u32 in, std::string_view name, int mask, int smode, int chkoe, int chkrc,
-                  unsigned char dmode);
-  static void rrn(u32 in, std::string_view name, int smode, int chkoe, int chkrc,
-                  unsigned char dmode);
+  static void dab(u32 in, std::string_view name, int mask, int smode, int chkoe, int chkrc);
+  static void rrn(u32 in, std::string_view name, int smode, int chkoe, int chkrc);
   static void mtcr(u32 in);
   static void msr(u32 in, int smode);
   static void mspr(u32 in, int smode);
   static void mtb(u32 in);
   static void sradi(u32 in);
-  static void ldst(u32 in, std::string_view name, char reg, unsigned char dmode);
-  static void fdabc(u32 in, std::string_view name, int mask, unsigned char dmode);
+  static void ldst(u32 in, std::string_view name, char reg);
+  static void fdabc(u32 in, std::string_view name, int mask);
   static void fmr(u32 in);
   static void fdab(u32 in, std::string_view name);
   static void fcmp(u32 in, char c);
@@ -104,6 +102,5 @@ private:
   static u32* m_iaddr;            // Instruction.address., usually the same as instr
   static std::string m_opcode;    // Buffer for opcode, min. 10 chars.
   static std::string m_operands;  // Operand buffer, min. 24 chars.
-  static unsigned char m_flags;   // Additional flags
 };
 }  // namespace Common