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

Use flags for breakpoints and memchecks in the recompiler

This commit is contained in:
Kingcom 2014-08-17 09:45:13 +02:00
parent 9fde236512
commit 430c617a95
1 changed files with 21 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
pcsx2/x86/ix86-32/iR5900-32.cpp
View File

@ -1359,45 +1359,9 @@ void recMemcheck(u32 op, u32 bits, bool store)
inline bool isBranchOrJump(u32 addr) inline bool isBranchOrJump(u32 addr)
{ {
u32 op = memRead32(addr); u32 op = memRead32(addr);
const OPCODE& opcode = GetInstruction(op);
switch (op >> 26) return (opcode.flags & IS_BRANCH) != 0;
{
case 0x02: // j
case 0x03: // jal
case 0x04: // beq
case 0x05: // bne
case 0x06: // blez
case 0x07: // bgtz
case 0x14: // beql
case 0x15: // bnel
case 0x16: // blezl
case 0x17: // bgtzl
return true;
case 0x00: // special
switch (op & 0x3F)
{
case 0x08: // jr
case 0x09: // jalr
return true;
}
break;
case 0x01: // regimm
switch ((op >> 16) & 0x1F)
{
case 0x00: // bltz
case 0x01: // bgez
case 0x02: // bltzl
case 0x03: // bgezl
case 0x10: // bltzal
case 0x11: // bgezal
case 0x12: // bltzall
case 0x13: // bgezall
return true;
}
break;
}
return false;
} }
// The next two functions return 0 if no breakpoint is needed, // The next two functions return 0 if no breakpoint is needed,
@ -1419,39 +1383,18 @@ int isMemcheckNeeded(u32 pc)
{ {
if (CBreakPoints::GetMemChecks().size() == 0) if (CBreakPoints::GetMemChecks().size() == 0)
return 0; return 0;
u32 addr = pc; u32 addr = pc;
if (isBranchOrJump(addr)) if (isBranchOrJump(addr))
addr += 4; addr += 4;
u32 op = memRead32(addr); u32 op = memRead32(addr);
const OPCODE& opcode = GetInstruction(op);
switch (op >> 26) if ((opcode.flags & IS_MEMORY) && (opcode.flags & MEMTYPE_MASK) != 0)
{
case 0x20: // lb
case 0x21: // lh
case 0x22: // lwl
case 0x23: // lw
case 0x24: // lbu
case 0x25: // lhu
case 0x26: // lwr
case 0x28: // sb
case 0x29: // sh
case 0x2A: // swl
case 0x2B: // sw
case 0x2E: // swr
case 0x37: // ld
case 0x1B: // ldr
case 0x3F: // sd
case 0x3D: // sdr
case 0x1A: // ldl
case 0x2C: // sdl
case 0x1E: // lq
case 0x1F: // sq
return addr == pc ? 1 : 2; return addr == pc ? 1 : 2;
default:
return 0; return 0;
}
} }
void encodeBreakpoint() void encodeBreakpoint()
@ -1470,50 +1413,27 @@ void encodeMemcheck()
return; return;
u32 op = memRead32(needed == 2 ? pc+4 : pc); u32 op = memRead32(needed == 2 ? pc+4 : pc);
switch (cpuRegs.code >> 26) const OPCODE& opcode = GetInstruction(op);
bool store = (opcode.flags & IS_STORE) != 0;
switch (opcode.flags & MEMTYPE_MASK)
{ {
case 0x20: // lb case MEMTYPE_BYTE:
case 0x24: // lbu recMemcheck(op,8,store);
recMemcheck(op,8,false);
break; break;
case 0x28: // sb case MEMTYPE_HALF:
recMemcheck(op,8,true); recMemcheck(op,16,store);
break; break;
case 0x21: // lh case MEMTYPE_WORD:
case 0x25: // lhu recMemcheck(op,32,store);
recMemcheck(op,16,false);
break; break;
case 0x22: // lwl case MEMTYPE_DWORD:
case 0x23: // lw recMemcheck(op,64,store);
case 0x26: // lwr
recMemcheck(op,32,false);
break; break;
case 0x29: // sh case MEMTYPE_QWORD:
recMemcheck(op,16,true); recMemcheck(op,128,store);
break;
case 0x2A: // swl
case 0x2B: // sw
case 0x2E: // swr
recMemcheck(op,32,true);
break;
case 0x37: // ld
case 0x1B: // ldr
case 0x1A: // ldl
recMemcheck(op,64,false);
break;
case 0x3F: // sd
case 0x3D: // sdr
case 0x2C: // sdl
recMemcheck(op,64,true);
break;
case 0x1E: // lq
recMemcheck(op,128,false);
break;
case 0x1F: // sq
recMemcheck(op,128,true);
break; break;
} }
} }
void recompileNextInstruction(int delayslot) void recompileNextInstruction(int delayslot)