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

[Project64] Be able to handle memory breakpoints that are detected at compile time

This commit is contained in:
zilmar 2018-03-02 17:48:15 +11:00
parent cfbd181ff9
commit 5434f57f3f
2 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.cpp
View File

@ -2794,7 +2794,7 @@ void CX86RecompilerOps::LB()
uint32_t Address = (GetMipsRegLo(m_Opcode.base) + (int16_t)m_Opcode.offset) ^ 3; uint32_t Address = (GetMipsRegLo(m_Opcode.base) + (int16_t)m_Opcode.offset) ^ 3;
if (HaveReadBP() && g_Debugger->ReadBP8(Address)) if (HaveReadBP() && g_Debugger->ReadBP8(Address))
{ {
g_Notify->BreakPoint(__FILE__, __LINE__); FoundMemoryBreakpoint();
return; return;
} }
Map_GPR_32bit(m_Opcode.rt, true, -1); Map_GPR_32bit(m_Opcode.rt, true, -1);
@ -2855,7 +2855,7 @@ void CX86RecompilerOps::LH()
uint32_t Address = (GetMipsRegLo(m_Opcode.base) + (int16_t)m_Opcode.offset) ^ 2; uint32_t Address = (GetMipsRegLo(m_Opcode.base) + (int16_t)m_Opcode.offset) ^ 2;
if (HaveReadBP() && g_Debugger->ReadBP16(Address)) if (HaveReadBP() && g_Debugger->ReadBP16(Address))
{ {
g_Notify->BreakPoint(__FILE__, __LINE__); FoundMemoryBreakpoint();
return; return;
} }
Map_GPR_32bit(m_Opcode.rt, true, -1); Map_GPR_32bit(m_Opcode.rt, true, -1);
@ -2922,7 +2922,7 @@ void CX86RecompilerOps::LWL()
uint32_t Offset = Address & 3; uint32_t Offset = Address & 3;
if (HaveReadBP() && g_Debugger->ReadBP32(Address)) if (HaveReadBP() && g_Debugger->ReadBP32(Address))
{ {
g_Notify->BreakPoint(__FILE__, __LINE__); FoundMemoryBreakpoint();
return; return;
} }
@ -3017,7 +3017,7 @@ void CX86RecompilerOps::LW(bool ResultSigned, bool bRecordLLBit)
uint32_t Address = GetMipsRegLo(m_Opcode.base) + (int16_t)m_Opcode.offset; uint32_t Address = GetMipsRegLo(m_Opcode.base) + (int16_t)m_Opcode.offset;
if (HaveReadBP() && g_Debugger->ReadBP32(Address)) if (HaveReadBP() && g_Debugger->ReadBP32(Address))
{ {
g_Notify->BreakPoint(__FILE__, __LINE__); FoundMemoryBreakpoint();
return; return;
} }
Map_GPR_32bit(m_Opcode.rt, ResultSigned, -1); Map_GPR_32bit(m_Opcode.rt, ResultSigned, -1);
@ -3434,7 +3434,7 @@ void CX86RecompilerOps::LBU()
uint32_t Address = (GetMipsRegLo(m_Opcode.base) + (int16_t)m_Opcode.offset) ^ 3; uint32_t Address = (GetMipsRegLo(m_Opcode.base) + (int16_t)m_Opcode.offset) ^ 3;
if (HaveReadBP() && g_Debugger->ReadBP8(Address)) if (HaveReadBP() && g_Debugger->ReadBP8(Address))
{ {
g_Notify->BreakPoint(__FILE__, __LINE__); FoundMemoryBreakpoint();
return; return;
} }
Map_GPR_32bit(m_Opcode.rt, false, -1); Map_GPR_32bit(m_Opcode.rt, false, -1);
@ -3497,7 +3497,7 @@ void CX86RecompilerOps::LHU()
uint32_t Address = (GetMipsRegLo(m_Opcode.base) + (int16_t)m_Opcode.offset) ^ 2; uint32_t Address = (GetMipsRegLo(m_Opcode.base) + (int16_t)m_Opcode.offset) ^ 2;
if (HaveReadBP() && g_Debugger->ReadBP16(Address)) if (HaveReadBP() && g_Debugger->ReadBP16(Address))
{ {
g_Notify->BreakPoint(__FILE__, __LINE__); FoundMemoryBreakpoint();
return; return;
} }
Map_GPR_32bit(m_Opcode.rt, false, -1); Map_GPR_32bit(m_Opcode.rt, false, -1);
@ -3565,7 +3565,7 @@ void CX86RecompilerOps::LWR()
uint32_t Offset = Address & 3; uint32_t Offset = Address & 3;
if (HaveReadBP() && g_Debugger->ReadBP32(Address)) if (HaveReadBP() && g_Debugger->ReadBP32(Address))
{ {
g_Notify->BreakPoint(__FILE__, __LINE__); FoundMemoryBreakpoint();
return; return;
} }
Map_GPR_32bit(m_Opcode.rt, true, m_Opcode.rt); Map_GPR_32bit(m_Opcode.rt, true, m_Opcode.rt);
@ -3648,7 +3648,7 @@ void CX86RecompilerOps::SB()
uint32_t Address = (GetMipsRegLo(m_Opcode.base) + (int16_t)m_Opcode.offset) ^ 3; uint32_t Address = (GetMipsRegLo(m_Opcode.base) + (int16_t)m_Opcode.offset) ^ 3;
if (HaveWriteBP() && g_Debugger->WriteBP8(Address)) if (HaveWriteBP() && g_Debugger->WriteBP8(Address))
{ {
g_Notify->BreakPoint(__FILE__, __LINE__); FoundMemoryBreakpoint();
return; return;
} }
@ -3747,7 +3747,7 @@ void CX86RecompilerOps::SH()
uint32_t Address = (GetMipsRegLo(m_Opcode.base) + (int16_t)m_Opcode.offset) ^ 2; uint32_t Address = (GetMipsRegLo(m_Opcode.base) + (int16_t)m_Opcode.offset) ^ 2;
if (HaveWriteBP() && g_Debugger->WriteBP16(Address)) if (HaveWriteBP() && g_Debugger->WriteBP16(Address))
{ {
g_Notify->BreakPoint(__FILE__, __LINE__); FoundMemoryBreakpoint();
return; return;
} }
@ -3842,7 +3842,7 @@ void CX86RecompilerOps::SWL()
Address = GetMipsRegLo(m_Opcode.base) + (int16_t)m_Opcode.offset; Address = GetMipsRegLo(m_Opcode.base) + (int16_t)m_Opcode.offset;
if (HaveWriteBP() && g_Debugger->WriteBP32(Address)) if (HaveWriteBP() && g_Debugger->WriteBP32(Address))
{ {
g_Notify->BreakPoint(__FILE__, __LINE__); FoundMemoryBreakpoint();
return; return;
} }
uint32_t Offset = Address & 3; uint32_t Offset = Address & 3;
@ -3980,7 +3980,7 @@ void CX86RecompilerOps::SW(bool bCheckLLbit)
uint32_t Address = GetMipsRegLo(m_Opcode.base) + (int16_t)m_Opcode.offset; uint32_t Address = GetMipsRegLo(m_Opcode.base) + (int16_t)m_Opcode.offset;
if (HaveWriteBP() && g_Debugger->WriteBP32(Address)) if (HaveWriteBP() && g_Debugger->WriteBP32(Address))
{ {
g_Notify->BreakPoint(__FILE__, __LINE__); FoundMemoryBreakpoint();
return; return;
} }
@ -4104,7 +4104,7 @@ void CX86RecompilerOps::SWR()
uint32_t Address = GetMipsRegLo(m_Opcode.base) + (int16_t)m_Opcode.offset; uint32_t Address = GetMipsRegLo(m_Opcode.base) + (int16_t)m_Opcode.offset;
if (HaveWriteBP() && g_Debugger->WriteBP32(Address)) if (HaveWriteBP() && g_Debugger->WriteBP32(Address))
{ {
g_Notify->BreakPoint(__FILE__, __LINE__); FoundMemoryBreakpoint();
return; return;
} }
uint32_t Offset = Address & 3; uint32_t Offset = Address & 3;
@ -4265,7 +4265,7 @@ void CX86RecompilerOps::LWC1()
uint32_t Address = GetMipsRegLo(m_Opcode.base) + (int16_t)m_Opcode.offset; uint32_t Address = GetMipsRegLo(m_Opcode.base) + (int16_t)m_Opcode.offset;
if (HaveReadBP() && g_Debugger->ReadBP32(Address)) if (HaveReadBP() && g_Debugger->ReadBP32(Address))
{ {
g_Notify->BreakPoint(__FILE__, __LINE__); FoundMemoryBreakpoint();
return; return;
} }
x86Reg TempReg1 = Map_TempReg(x86_Any, -1, false); x86Reg TempReg1 = Map_TempReg(x86_Any, -1, false);
@ -4349,7 +4349,7 @@ void CX86RecompilerOps::LDC1()
uint32_t Address = GetMipsRegLo(m_Opcode.base) + (int16_t)m_Opcode.offset; uint32_t Address = GetMipsRegLo(m_Opcode.base) + (int16_t)m_Opcode.offset;
if (HaveReadBP() && g_Debugger->ReadBP64(Address)) if (HaveReadBP() && g_Debugger->ReadBP64(Address))
{ {
g_Notify->BreakPoint(__FILE__, __LINE__); FoundMemoryBreakpoint();
return; return;
} }
TempReg1 = Map_TempReg(x86_Any, -1, false); TempReg1 = Map_TempReg(x86_Any, -1, false);
@ -4468,7 +4468,7 @@ void CX86RecompilerOps::LD()
uint32_t Address = GetMipsRegLo(m_Opcode.base) + (int16_t)m_Opcode.offset; uint32_t Address = GetMipsRegLo(m_Opcode.base) + (int16_t)m_Opcode.offset;
if (HaveReadBP() && g_Debugger->ReadBP64(Address)) if (HaveReadBP() && g_Debugger->ReadBP64(Address))
{ {
g_Notify->BreakPoint(__FILE__, __LINE__); FoundMemoryBreakpoint();
return; return;
} }
Map_GPR_64bit(m_Opcode.rt, -1); Map_GPR_64bit(m_Opcode.rt, -1);
@ -4560,7 +4560,7 @@ void CX86RecompilerOps::SWC1()
uint32_t Address = GetMipsRegLo(m_Opcode.base) + (int16_t)m_Opcode.offset; uint32_t Address = GetMipsRegLo(m_Opcode.base) + (int16_t)m_Opcode.offset;
if (HaveWriteBP() && g_Debugger->WriteBP32(Address)) if (HaveWriteBP() && g_Debugger->WriteBP32(Address))
{ {
g_Notify->BreakPoint(__FILE__, __LINE__); FoundMemoryBreakpoint();
return; return;
} }
@ -4633,7 +4633,7 @@ void CX86RecompilerOps::SDC1()
uint32_t Address = GetMipsRegLo(m_Opcode.base) + (int16_t)m_Opcode.offset; uint32_t Address = GetMipsRegLo(m_Opcode.base) + (int16_t)m_Opcode.offset;
if (HaveWriteBP() && g_Debugger->WriteBP32(Address)) if (HaveWriteBP() && g_Debugger->WriteBP32(Address))
{ {
g_Notify->BreakPoint(__FILE__, __LINE__); FoundMemoryBreakpoint();
return; return;
} }
@ -4717,7 +4717,7 @@ void CX86RecompilerOps::SD()
uint32_t Address = GetMipsRegLo(m_Opcode.base) + (int16_t)m_Opcode.offset; uint32_t Address = GetMipsRegLo(m_Opcode.base) + (int16_t)m_Opcode.offset;
if (HaveWriteBP() && g_Debugger->WriteBP32(Address)) if (HaveWriteBP() && g_Debugger->WriteBP32(Address))
{ {
g_Notify->BreakPoint(__FILE__, __LINE__); FoundMemoryBreakpoint();
return; return;
} }
@ -9044,7 +9044,9 @@ void CX86RecompilerOps::UnknownOpcode()
void CX86RecompilerOps::ClearCachedInstructionInfo() void CX86RecompilerOps::ClearCachedInstructionInfo()
{ {
m_RegWorkingSet.WriteBackRegisters(); m_RegWorkingSet.WriteBackRegisters();
m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount() - g_System->CountPerOp());
UpdateCounters(m_RegWorkingSet, false, true); UpdateCounters(m_RegWorkingSet, false, true);
m_RegWorkingSet.SetBlockCycleCount(m_RegWorkingSet.GetBlockCycleCount() + g_System->CountPerOp());
MoveConstToVariable(m_CompilePC, &g_Reg->m_PROGRAM_COUNTER, "PROGRAM_COUNTER"); MoveConstToVariable(m_CompilePC, &g_Reg->m_PROGRAM_COUNTER, "PROGRAM_COUNTER");
if (g_SyncSystem) { if (g_SyncSystem) {
#ifdef _WIN32 #ifdef _WIN32
@ -9058,6 +9060,15 @@ void CX86RecompilerOps::ClearCachedInstructionInfo()
} }
} }
void CX86RecompilerOps::FoundMemoryBreakpoint()
{
ClearCachedInstructionInfo();
MoveConstToVariable((m_NextInstruction == JUMP || m_NextInstruction == DELAY_SLOT) ? 1 : 0, &memory_write_in_delayslot, "memory_write_in_delayslot");
Call_Direct(x86MemoryBreakpoint, "x86MemoryBreakpoint");
ExitCodeBlock();
m_NextInstruction = END_BLOCK;
}
void CX86RecompilerOps::PreReadInstruction() void CX86RecompilerOps::PreReadInstruction()
{ {
if (!HaveReadBP()) if (!HaveReadBP())

1
Source/Project64-core/N64System/Recompiler/x86/x86RecompilerOps.h
View File

@ -206,6 +206,7 @@ public:
void UnknownOpcode(); void UnknownOpcode();
void ClearCachedInstructionInfo(); void ClearCachedInstructionInfo();
void FoundMemoryBreakpoint();
void PreReadInstruction(); void PreReadInstruction();
void PreWriteInstruction(); void PreWriteInstruction();
void TestWriteBreakpoint(x86Reg AddressReg, void * FunctAddress, const char * FunctName); void TestWriteBreakpoint(x86Reg AddressReg, void * FunctAddress, const char * FunctName);