ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1543 from shygoo2/opinfo-improvements 

[Debugger] Improve OpInfo::ReadsGPR/WritesGPR
This commit is contained in:
zilmar 2019-01-06 14:26:07 +10:30 committed by GitHub
parent bb89b9b633 7ef9b19dc9
commit e5540a1428
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 89 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

171
Source/Project64/UserInterface/Debugger/OpInfo.h
View File

@ -179,64 +179,83 @@ public:
{ {
uint32_t op = m_OpCode.op; uint32_t op = m_OpCode.op;
if (op >= R4300i_LDL && op <= R4300i_LWU ||
op >= R4300i_ADDI && op <= R4300i_XORI ||
op == R4300i_LD ||
op == R4300i_BGTZ || op == R4300i_BGTZL ||
op == R4300i_BLEZ || op == R4300i_BLEZL)
{
if (m_OpCode.rs == nReg)
{
return true;
}
}
if (op >= R4300i_SB && op <= R4300i_SWR ||
op >= R4300i_SC && op <= R4300i_SD ||
op == R4300i_BEQ || op == R4300i_BEQL ||
op == R4300i_BNE || op == R4300i_BNEL)
{
// stores read value and index
if (m_OpCode.rs == nReg || m_OpCode.rt == nReg)
{
return true;
}
}
if (op == R4300i_SPECIAL) if (op == R4300i_SPECIAL)
{ {
uint32_t fn = m_OpCode.funct; uint32_t fn = m_OpCode.funct;
switch (fn) if (m_OpCode.rs == nReg || m_OpCode.rt == nReg)
{ {
case R4300i_SPECIAL_MTLO: if (fn >= R4300i_SPECIAL_SLLV && fn <= R4300i_SPECIAL_SRAV ||
case R4300i_SPECIAL_MTHI: fn >= R4300i_SPECIAL_DSLLV && fn <= R4300i_SPECIAL_DSRAV ||
case R4300i_SPECIAL_JR: fn >= R4300i_SPECIAL_MULT && fn <= R4300i_SPECIAL_TNE)
case R4300i_SPECIAL_JALR: {
return true;
}
if (m_OpCode.rs == nReg) if (m_OpCode.rs == nReg)
{ {
return true; if (fn == R4300i_SPECIAL_MTLO || fn == R4300i_SPECIAL_MTHI ||
fn == R4300i_SPECIAL_JR || fn == R4300i_SPECIAL_JALR)
{
return true;
}
} }
break;
case R4300i_SPECIAL_SLL:
case R4300i_SPECIAL_SRL:
case R4300i_SPECIAL_SRA:
if (m_OpCode.rt == nReg) if (m_OpCode.rt == nReg)
{ {
return true; if (fn >= R4300i_SPECIAL_SLL && fn <= R4300i_SPECIAL_SRA ||
fn >= R4300i_SPECIAL_DSLL && fn <= R4300i_SPECIAL_DSRA32)
{
return true;
}
} }
break;
} }
}
if (fn >= R4300i_SPECIAL_SLLV && fn <= R4300i_SPECIAL_SRAV || else
fn >= R4300i_SPECIAL_DSLLV && fn <= R4300i_SPECIAL_DSRAV || {
fn >= R4300i_SPECIAL_DIVU && fn <= R4300i_SPECIAL_DSUBU) if (m_OpCode.rs == nReg || m_OpCode.rt == nReg)
{ {
// two register operands if (op >= R4300i_SB && op <= R4300i_SWR ||
if (m_OpCode.rt == nReg || m_OpCode.rs == nReg) op >= R4300i_SC && op <= R4300i_SD ||
op == R4300i_BEQ || op == R4300i_BEQL ||
op == R4300i_BNE || op == R4300i_BNEL)
{ {
return true; return true;
} }
if (m_OpCode.rs == nReg)
{
if (op == R4300i_REGIMM)
{
return true;
}
if (op >= R4300i_BLEZL && op <= R4300i_LWU ||
op >= R4300i_BLEZ && op <= R4300i_XORI ||
op >= R4300i_CACHE && op <= R4300i_LD ||
op == R4300i_SWC1 || op == R4300i_SDC1)
{
return true;
}
}
if (m_OpCode.rt == nReg)
{
if (op == R4300i_CP0 && m_OpCode.fmt == R4300i_COP0_MT)
{
return true;
}
if (op == R4300i_CP1)
{
if (m_OpCode.fmt == R4300i_COP1_MT ||
m_OpCode.fmt == R4300i_COP1_DMT ||
m_OpCode.fmt == R4300i_COP1_CT)
{
return true;
}
}
}
} }
} }
@ -247,55 +266,43 @@ public:
{ {
uint32_t op = m_OpCode.op; uint32_t op = m_OpCode.op;
if (op >= R4300i_LDL && op <= R4300i_LWU ||
op >= R4300i_ADDI && op <= R4300i_XORI ||
op == R4300i_LUI || op == R4300i_LD)
{
// loads write value
if (m_OpCode.rt == nReg)
{
return true;
}
}
if (op == R4300i_JAL)
{
if (nReg == 31) // RA
{
return true;
}
}
if (op == R4300i_SPECIAL) if (op == R4300i_SPECIAL)
{ {
uint32_t fn = m_OpCode.funct; if (m_OpCode.rd == nReg)
switch (fn)
{ {
case R4300i_SPECIAL_MFLO: uint32_t fn = m_OpCode.funct;
case R4300i_SPECIAL_MFHI:
case R4300i_SPECIAL_SLL:
case R4300i_SPECIAL_SRL:
case R4300i_SPECIAL_SRA:
if (m_OpCode.rd == nReg)
{
return true;
}
break;
}
if (fn >= R4300i_SPECIAL_SLLV && fn <= R4300i_SPECIAL_SRAV || if (fn >= R4300i_SPECIAL_SLL && fn <= R4300i_SPECIAL_SRAV ||
fn >= R4300i_SPECIAL_DSLLV && fn <= R4300i_SPECIAL_DSRAV || fn >= R4300i_SPECIAL_DSLLV && fn <= R4300i_SPECIAL_DSRAV ||
fn >= R4300i_SPECIAL_DIVU && fn <= R4300i_SPECIAL_DSUBU || fn >= R4300i_SPECIAL_DIVU && fn <= R4300i_SPECIAL_DSUBU ||
fn == R4300i_SPECIAL_JALR) fn >= R4300i_SPECIAL_DSLL && fn <= R4300i_SPECIAL_DSRA32 ||
{ fn == R4300i_SPECIAL_JALR || fn == R4300i_SPECIAL_MFLO ||
// result register fn == R4300i_SPECIAL_MFHI)
if (m_OpCode.rd == nReg)
{ {
return true; return true;
} }
} }
} }
else
{
if (m_OpCode.rt == nReg)
{
if (op >= R4300i_DADDI && op <= R4300i_LWU ||
op >= R4300i_ADDI && op <= R4300i_LUI ||
op == R4300i_LL || op == R4300i_LD ||
(op == R4300i_CP0 && m_OpCode.fmt == R4300i_COP0_MF) ||
(op == R4300i_CP1 && m_OpCode.fmt == R4300i_COP1_MF) ||
(op == R4300i_CP1 && m_OpCode.fmt == R4300i_COP1_CF))
{
return true;
}
}
}
if (op == R4300i_JAL && nReg == 31) // nReg == RA
{
return true;
}
return false; return false;
} }