Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 21:39:52 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

And now the dynamic memory breakpoints in x86 jit.

Browse Source 
And add notes that this is interpreter/HLE only for now.
This commit is contained in:
Unknown W. Brackets 2013-03-09 00:35:08 -08:00
parent 68aaac25c6
commit 15ff927d4d
3 changed files with 55 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Core/Debugger/Breakpoints.cpp
View File

@ -38,6 +38,8 @@ void MemCheck::Action(u32 iValue, u32 addr, bool write, int size, u32 pc)
{
if ((write && bOnWrite) || (!write && bOnRead))
{
++numHits;
if (bLog)
{
char temp[256];
@ -86,20 +88,21 @@ void CBreakPoints::ClearAllBreakPoints()
InvalidateJit();
}
MemCheck *CBreakPoints::GetMemCheck(u32 address)
MemCheck *CBreakPoints::GetMemCheck(u32 address, int size)
{
std::vector<MemCheck>::iterator iter;
for (iter = MemChecks.begin(); iter != MemChecks.end(); ++iter)
{
if ((*iter).bRange)
MemCheck &check = *iter;
if (check.bRange)
{
if (address >= (*iter).iStartAddress && address <= (*iter).iEndAddress)
return &(*iter);
if (address >= check.iStartAddress && address + size < check.iEndAddress)
return &check;
}
else
{
if ((*iter).iStartAddress==address)
return &(*iter);
if (check.iStartAddress==address)
return &check;
}
}

5
Core/Debugger/Breakpoints.h
View File

@ -60,13 +60,14 @@ private:
static u32 m_iBreakOnCount;
public:
// WARNING: Not used in interpreter or HLE, only jit CPU memory access.
static std::vector<MemCheck> MemChecks;
// is address breakpoint
static bool IsAddressBreakPoint(u32 _iAddress);
//memory breakpoint
static MemCheck *GetMemCheck(u32 address);
// WARNING: Not used in interpreter or HLE, only jit CPU memory access.
static MemCheck *GetMemCheck(u32 address, int size);
// is break on count
static bool IsBreakOnCount(u32 _iAddress);

47
Core/MIPS/x86/Jit.cpp
View File

@ -415,7 +415,7 @@ Jit::JitSafeMem::JitSafeMem(Jit *jit, int raddr, s32 offset)
: jit_(jit), raddr_(raddr), offset_(offset), needsCheck_(false), needsSkip_(false), needsSkipCheck_(false)
{
// This makes it more instructions, so let's play it safe and say we need a far jump.
far_ = !g_Config.bIgnoreBadMemAccess;
far_ = !g_Config.bIgnoreBadMemAccess || !CBreakPoints::MemChecks.empty();
if (jit_->gpr.IsImmediate(raddr_))
iaddr_ = jit_->gpr.GetImmediate32(raddr_) + offset_;
else
@ -661,7 +661,7 @@ void Jit::JitSafeMem::Finish()
void JitMemCheck(u32 addr, int size)
{
MemCheck *check = CBreakPoints::GetMemCheck(addr);
MemCheck *check = CBreakPoints::GetMemCheck(addr, size);
// TODO: Value, hmm... also need to do read/write...
if (check)
check->Action(0, addr, false, size, currentMIPS->pc);
@ -669,7 +669,7 @@ void JitMemCheck(u32 addr, int size)
void Jit::JitSafeMem::MemCheckImm(ReadType type)
{
MemCheck *check = CBreakPoints::GetMemCheck(iaddr_);
MemCheck *check = CBreakPoints::GetMemCheck(iaddr_, size_);
if (check)
{
jit_->MOV(32, M(&jit_->mips_->pc), Imm32(jit_->js.compilerPC));
@ -694,7 +694,46 @@ void Jit::JitSafeMem::MemCheckImm(ReadType type)
void Jit::JitSafeMem::MemCheckAsm(ReadType type)
{
// TODO
for (auto it = CBreakPoints::MemChecks.begin(), end = CBreakPoints::MemChecks.end(); it != end; ++it)
{
FixupBranch skipNext, skipNextRange;
if (it->bRange)
{
jit_->CMP(32, R(xaddr_), Imm32(it->iStartAddress));
skipNext = jit_->J_CC(CC_B);
jit_->CMP(32, R(xaddr_), Imm32(it->iEndAddress - size_));
skipNextRange = jit_->J_CC(CC_AE);
}
else
{
jit_->CMP(32, R(xaddr_), Imm32(it->iStartAddress));
skipNext = jit_->J_CC(CC_NE);
}
jit_->PUSH(xaddr_);
jit_->MOV(32, M(&jit_->mips_->pc), Imm32(jit_->js.compilerPC));
jit_->ABI_CallFunctionAC(jit_->thunks.ProtectFunction((void *)&JitMemCheck, 2), R(xaddr_), size_);
jit_->POP(xaddr_);
jit_->CMP(32, M((void*)&coreState), Imm32(0));
if (!jit_->js.inDelaySlot)
{
FixupBranch skipCheck = jit_->J_CC(CC_E);
jit_->WriteSyscallExit();
jit_->SetJumpTarget(skipCheck);
}
else
{
// Skip the actual memory access if coreState tripped.
skipCheck_ = jit_->J_CC(CC_NE);
needsSkipCheck_ = true;
jit_->js.needCheckCoreState = true;
}
jit_->SetJumpTarget(skipNext);
if (it->bRange)
jit_->SetJumpTarget(skipNextRange);
}
}
void Jit::Comp_DoNothing(u32 op) { }