Merge pull request #12020 from Dentomologist/gekkodisassembler_remove…

…_unread_variables GekkoDisassembler: Remove unread variables
dolphin-emu · Jul 9, 2023 · 90b1f5c · 90b1f5c
2 parents 80c44ea + c8e276c
commit 90b1f5c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 13 deletions.
diff --git a/Source/Core/Common/GekkoDisassembler.cpp b/Source/Core/Common/GekkoDisassembler.cpp
@@ -154,8 +154,6 @@ u32* GekkoDisassembler::m_iaddr = nullptr;
 std::string GekkoDisassembler::m_opcode;
 std::string GekkoDisassembler::m_operands;
 unsigned char GekkoDisassembler::m_flags = PPCF_ILLEGAL;
-unsigned short GekkoDisassembler::m_sreg = 0;
-u32 GekkoDisassembler::m_displacement = 0;
 
 static u32 HelperRotateMask(int r, int mb, int me)
 {
@@ -393,7 +391,6 @@ std::string GekkoDisassembler::imm(u32 in, int uimm, int type, bool hex)
   {
     m_flags |= PPCF_UNSIGNED;
   }
-  m_displacement = i;
 
   switch (type)
   {
@@ -583,8 +580,6 @@ void GekkoDisassembler::bc(u32 in)
     m_operands = fmt::format("{} ->0x{:08X}", m_operands, d);
   else
     m_operands = fmt::format("{} ->0x{:08X}", m_operands, *m_iaddr + d);
-
-  m_displacement = d;
 }
 
 void GekkoDisassembler::bli(u32 in)
@@ -600,8 +595,6 @@ void GekkoDisassembler::bli(u32 in)
     m_operands = fmt::format("->0x{:08X}", d);
   else
     m_operands = fmt::format("->0x{:08X}", *m_iaddr + d);
-
-  m_displacement = d;
 }
 
 void GekkoDisassembler::mcrf(u32 in, std::string_view suffix)
@@ -927,10 +920,6 @@ void GekkoDisassembler::ldst(u32 in, std::string_view name, char reg, unsigned c
   int d = (u32)(in & 0xffff);
 
   m_flags |= dmode;
-  m_sreg = (short)a;
-  //  if (d >= 0x8000)
-  //    d -= 0x10000;
-  m_displacement = (u32)d;
   m_opcode = name;
 
   if (reg == 'r')

diff --git a/Source/Core/Common/GekkoDisassembler.h b/Source/Core/Common/GekkoDisassembler.h
@@ -105,7 +105,5 @@ class GekkoDisassembler final
   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
-  static unsigned short m_sreg;   // Register in load/store instructions
-  static u32 m_displacement;      // Branch- or load/store displacement
 };
 }  // namespace Common