mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-01-25 07:21:14 +01:00
GekkoDisassembler: Remove unread variable m_flags
Writes to m_flags are pointless as it's never read.
This commit is contained in:
parent
17fa9dfc4e
commit
317bb629b9
@ -153,7 +153,6 @@ u32* GekkoDisassembler::m_instr = nullptr;
|
|||||||
u32* GekkoDisassembler::m_iaddr = nullptr;
|
u32* GekkoDisassembler::m_iaddr = nullptr;
|
||||||
std::string GekkoDisassembler::m_opcode;
|
std::string GekkoDisassembler::m_opcode;
|
||||||
std::string GekkoDisassembler::m_operands;
|
std::string GekkoDisassembler::m_operands;
|
||||||
unsigned char GekkoDisassembler::m_flags = PPCF_ILLEGAL;
|
|
||||||
|
|
||||||
static u32 HelperRotateMask(int r, int mb, int me)
|
static u32 HelperRotateMask(int r, int mb, int me)
|
||||||
{
|
{
|
||||||
@ -368,8 +367,6 @@ void GekkoDisassembler::ill(u32 in)
|
|||||||
m_opcode = "(ill)";
|
m_opcode = "(ill)";
|
||||||
m_operands = fmt::format("{:08x}", in);
|
m_operands = fmt::format("{:08x}", in);
|
||||||
}
|
}
|
||||||
|
|
||||||
m_flags |= PPCF_ILLEGAL;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Generate immediate instruction operand.
|
// Generate immediate instruction operand.
|
||||||
@ -387,10 +384,6 @@ std::string GekkoDisassembler::imm(u32 in, int uimm, int type, bool hex)
|
|||||||
if (i > 0x7fff)
|
if (i > 0x7fff)
|
||||||
i -= 0x10000;
|
i -= 0x10000;
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
m_flags |= PPCF_UNSIGNED;
|
|
||||||
}
|
|
||||||
|
|
||||||
switch (type)
|
switch (type)
|
||||||
{
|
{
|
||||||
@ -454,7 +447,6 @@ void GekkoDisassembler::trapi(u32 in, unsigned char dmode)
|
|||||||
{
|
{
|
||||||
const char* cnd = trap_condition[PPCGETD(in)];
|
const char* cnd = trap_condition[PPCGETD(in)];
|
||||||
|
|
||||||
m_flags |= dmode;
|
|
||||||
if (cnd != nullptr)
|
if (cnd != nullptr)
|
||||||
{
|
{
|
||||||
m_opcode = fmt::format("t{}{}", dmode ? 'd' : 'w', cnd);
|
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 < 2)
|
||||||
{
|
{
|
||||||
if (i != 0)
|
|
||||||
m_flags |= PPCF_64;
|
|
||||||
|
|
||||||
m_opcode = fmt::format("{}i", cmpname[uimm * 2 + i]);
|
m_opcode = fmt::format("{}i", cmpname[uimm * 2 + i]);
|
||||||
|
|
||||||
i = (int)PPCGETCRD(in);
|
i = (int)PPCGETCRD(in);
|
||||||
@ -638,7 +627,6 @@ void GekkoDisassembler::nooper(u32 in, std::string_view name, unsigned char dmod
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_flags |= dmode;
|
|
||||||
m_opcode = name;
|
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 bsh = i ? (int)PPCGETB(in) : (int)(((in & 2) << 4) + PPCGETB(in));
|
||||||
int m = (int)(in & 0x7e0) >> 5;
|
int m = (int)(in & 0x7e0) >> 5;
|
||||||
|
|
||||||
m_flags |= PPCF_64;
|
|
||||||
m_opcode = fmt::format("rld{}{}", name, (in & 1) ? "." : "");
|
m_opcode = fmt::format("rld{}{}", name, (in & 1) ? "." : "");
|
||||||
m_operands = fmt::format("{}, {}, {}{}, {}", regnames[a], regnames[s], regsel[i], bsh, m);
|
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 < 2)
|
||||||
{
|
{
|
||||||
if (i != 0)
|
|
||||||
m_flags |= PPCF_64;
|
|
||||||
|
|
||||||
m_opcode = cmpname[((in & PPCIDX2MASK) ? 2 : 0) + i];
|
m_opcode = cmpname[((in & PPCIDX2MASK) ? 2 : 0) + i];
|
||||||
|
|
||||||
i = (int)PPCGETCRD(in);
|
i = (int)PPCGETCRD(in);
|
||||||
@ -704,7 +688,6 @@ void GekkoDisassembler::trap(u32 in, unsigned char dmode)
|
|||||||
|
|
||||||
if (cnd != nullptr)
|
if (cnd != nullptr)
|
||||||
{
|
{
|
||||||
m_flags |= dmode;
|
|
||||||
m_opcode = fmt::format("t{}{}", dmode ? 'd' : 'w', cnd);
|
m_opcode = fmt::format("t{}{}", dmode ? 'd' : 'w', cnd);
|
||||||
m_operands = ra_rb(in);
|
m_operands = ra_rb(in);
|
||||||
}
|
}
|
||||||
@ -714,7 +697,6 @@ void GekkoDisassembler::trap(u32 in, unsigned char dmode)
|
|||||||
{
|
{
|
||||||
if (dmode)
|
if (dmode)
|
||||||
{
|
{
|
||||||
m_flags |= dmode;
|
|
||||||
m_opcode = "td";
|
m_opcode = "td";
|
||||||
m_operands = "31,0,0";
|
m_operands = "31,0,0";
|
||||||
}
|
}
|
||||||
@ -740,8 +722,6 @@ void GekkoDisassembler::dab(u32 in, std::string_view name, int mask, int smode,
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_flags |= dmode;
|
|
||||||
|
|
||||||
// rA,rS,rB
|
// rA,rS,rB
|
||||||
if (smode)
|
if (smode)
|
||||||
in = swapda(in);
|
in = swapda(in);
|
||||||
@ -762,8 +742,6 @@ void GekkoDisassembler::rrn(u32 in, std::string_view name, int smode, int chkoe,
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_flags |= dmode;
|
|
||||||
|
|
||||||
// rA,rS,NB
|
// rA,rS,NB
|
||||||
if (smode)
|
if (smode)
|
||||||
in = swapda(in);
|
in = swapda(in);
|
||||||
@ -806,7 +784,6 @@ void GekkoDisassembler::msr(u32 in, int smode)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_flags |= PPCF_SUPER;
|
|
||||||
m_opcode = fmt::format("m{}sr", smode ? 't' : 'f');
|
m_opcode = fmt::format("m{}sr", smode ? 't' : 'f');
|
||||||
|
|
||||||
if (smode)
|
if (smode)
|
||||||
@ -828,9 +805,6 @@ void GekkoDisassembler::mspr(u32 in, int smode)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (spr != 1 && spr != 8 && spr != 9)
|
|
||||||
m_flags |= PPCF_SUPER;
|
|
||||||
|
|
||||||
const char* x;
|
const char* x;
|
||||||
switch (spr)
|
switch (spr)
|
||||||
{
|
{
|
||||||
@ -893,7 +867,6 @@ void GekkoDisassembler::mtb(u32 in)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
m_flags |= PPCF_SUPER;
|
|
||||||
m_operands += fmt::format(",{}", tbr);
|
m_operands += fmt::format(",{}", tbr);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -908,7 +881,6 @@ void GekkoDisassembler::sradi(u32 in)
|
|||||||
int a = (int)PPCGETA(in);
|
int a = (int)PPCGETA(in);
|
||||||
int bsh = (int)(((in & 2) << 4) + PPCGETB(in));
|
int bsh = (int)(((in & 2) << 4) + PPCGETB(in));
|
||||||
|
|
||||||
m_flags |= PPCF_64;
|
|
||||||
m_opcode = fmt::format("sradi{}", (in & 1) ? "." : "");
|
m_opcode = fmt::format("sradi{}", (in & 1) ? "." : "");
|
||||||
m_operands = fmt::format("{}, {}, {}", regnames[a], regnames[s], bsh);
|
m_operands = fmt::format("{}, {}, {}", regnames[a], regnames[s], bsh);
|
||||||
}
|
}
|
||||||
@ -919,7 +891,6 @@ void GekkoDisassembler::ldst(u32 in, std::string_view name, char reg, unsigned c
|
|||||||
int a = (int)PPCGETA(in);
|
int a = (int)PPCGETA(in);
|
||||||
int d = (u32)(in & 0xffff);
|
int d = (u32)(in & 0xffff);
|
||||||
|
|
||||||
m_flags |= dmode;
|
|
||||||
m_opcode = name;
|
m_opcode = name;
|
||||||
|
|
||||||
if (reg == 'r')
|
if (reg == 'r')
|
||||||
@ -937,7 +908,6 @@ void GekkoDisassembler::fdabc(u32 in, std::string_view name, int mask, unsigned
|
|||||||
{
|
{
|
||||||
int err = 0;
|
int err = 0;
|
||||||
|
|
||||||
m_flags |= dmode;
|
|
||||||
m_opcode = fmt::format("f{}{}", name, rcsel[in & 1]);
|
m_opcode = fmt::format("f{}{}", name, rcsel[in & 1]);
|
||||||
m_operands += fmt::format("f{}", PPCGETD(in));
|
m_operands += fmt::format("f{}", PPCGETD(in));
|
||||||
|
|
||||||
@ -1259,7 +1229,6 @@ u32* GekkoDisassembler::DoDisassembly(bool big_endian)
|
|||||||
|
|
||||||
m_opcode.clear();
|
m_opcode.clear();
|
||||||
m_operands.clear();
|
m_operands.clear();
|
||||||
m_flags = 0;
|
|
||||||
|
|
||||||
switch (PPCGETIDX(in))
|
switch (PPCGETIDX(in))
|
||||||
{
|
{
|
||||||
|
@ -104,6 +104,5 @@ private:
|
|||||||
static u32* m_iaddr; // Instruction.address., usually the same as instr
|
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_opcode; // Buffer for opcode, min. 10 chars.
|
||||||
static std::string m_operands; // Operand buffer, min. 24 chars.
|
static std::string m_operands; // Operand buffer, min. 24 chars.
|
||||||
static unsigned char m_flags; // Additional flags
|
|
||||||
};
|
};
|
||||||
} // namespace Common
|
} // namespace Common
|
||||||
|
Loading…
x
Reference in New Issue
Block a user