Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Respect read/write only mem breakpoints in x86 jit.

Browse source
This commit is contained in:
Unknown W. Brackets 2013-03-09 00:40:33 -08:00
parent 15ff927d4d
commit a926ef6776
3 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Core/Debugger/Breakpoints.cpp
View file

@ -34,18 +34,14 @@ MemCheck::MemCheck(void)
numHits=0;
}
void MemCheck::Action(u32 iValue, u32 addr, bool write, int size, u32 pc)
void MemCheck::Action(u32 addr, bool write, int size, u32 pc)
{
if ((write && bOnWrite) || (!write && bOnRead))
{
++numHits;
if (bLog)
{
char temp[256];
sprintf(temp,"CHK %08x %s%i at %08x (%s), PC=%08x (%s)",iValue,write?"Write":"Read",size*8,addr,symbolMap.GetDescription(addr),pc,symbolMap.GetDescription(pc));
ERROR_LOG(MEMMAP,"%s",temp);
}
NOTICE_LOG(MEMMAP, "CHK %s%i at %08x (%s), PC=%08x (%s)", write ? "Write" : "Read", size * 8, addr, symbolMap.GetDescription(addr), pc, symbolMap.GetDescription(pc));
if (bBreak)
Core_Pause();
}

2
Core/Debugger/Breakpoints.h
View file

@ -47,7 +47,7 @@ struct MemCheck
u32 numHits;
void Action(u32 _iValue, u32 addr, bool write, int size, u32 pc);
void Action(u32 addr, bool write, int size, u32 pc);
};
class CBreakPoints

19
Core/MIPS/x86/Jit.cpp
View file

@ -659,12 +659,11 @@ void Jit::JitSafeMem::Finish()
jit_->SetJumpTarget(skipCheck_);
}
void JitMemCheck(u32 addr, int size)
void JitMemCheck(u32 addr, int size, int isWrite)
{
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);
check->Action(addr, isWrite == 1, size, currentMIPS->pc);
}
void Jit::JitSafeMem::MemCheckImm(ReadType type)
@ -672,8 +671,13 @@ void Jit::JitSafeMem::MemCheckImm(ReadType type)
MemCheck *check = CBreakPoints::GetMemCheck(iaddr_, size_);
if (check)
{
if (!check->bOnRead && type == MEM_READ)
return;
if (!check->bOnWrite && type == MEM_WRITE)
return;
jit_->MOV(32, M(&jit_->mips_->pc), Imm32(jit_->js.compilerPC));
jit_->ABI_CallFunctionCC(jit_->thunks.ProtectFunction((void *)&JitMemCheck, 2), iaddr_, size_);
jit_->ABI_CallFunctionCCC(jit_->thunks.ProtectFunction((void *)&JitMemCheck, 3), iaddr_, size_, type == MEM_WRITE ? 1 : 0);
jit_->CMP(32, M((void*)&coreState), Imm32(0));
if (!jit_->js.inDelaySlot)
@ -696,6 +700,11 @@ void Jit::JitSafeMem::MemCheckAsm(ReadType type)
{
for (auto it = CBreakPoints::MemChecks.begin(), end = CBreakPoints::MemChecks.end(); it != end; ++it)
{
if (!it->bOnRead && type == MEM_READ)
continue;
if (!it->bOnWrite && type == MEM_WRITE)
continue;
FixupBranch skipNext, skipNextRange;
if (it->bRange)
{
@ -712,7 +721,7 @@ void Jit::JitSafeMem::MemCheckAsm(ReadType type)
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_->ABI_CallFunctionACC(jit_->thunks.ProtectFunction((void *)&JitMemCheck, 3), R(xaddr_), size_, type == MEM_WRITE ? 1 : 0);
jit_->POP(xaddr_);
jit_->CMP(32, M((void*)&coreState), Imm32(0));