mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-25 11:46:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8940 from RenaKunisaki/master

Browse source 
add Break On Hit and Log On Hit for instruction breakpoints
This commit is contained in:
Tilka 2020-08-08 19:46:10 +01:00 • committed by GitHub
commit 76b955e090
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 71 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Source/Core/Core/PowerPC/BreakPoints.cpp
View file

@ -30,6 +30,19 @@ bool BreakPoints::IsTempBreakPoint(u32 address) const
});
}
bool BreakPoints::IsBreakPointBreakOnHit(u32 address) const
{
return std::any_of(m_breakpoints.begin(), m_breakpoints.end(), [address](const auto& bp) {
return bp.address == address && bp.break_on_hit;
});
}
bool BreakPoints::IsBreakPointLogOnHit(u32 address) const
{
return std::any_of(m_breakpoints.begin(), m_breakpoints.end(),
[address](const auto& bp) { return bp.address == address && bp.log_on_hit; });
}
BreakPoints::TBreakPointsStr BreakPoints::GetStrings() const
{
TBreakPointsStr bp_strings;
@ -38,7 +51,8 @@ BreakPoints::TBreakPointsStr BreakPoints::GetStrings() const
if (!bp.is_temporary)
{
std::ostringstream ss;
ss << std::hex << bp.address << " " << (bp.is_enabled ? "n" : "");
ss << std::hex << bp.address << " " << (bp.is_enabled ? "n" : "")
<< (bp.log_on_hit ? "l" : "") << (bp.break_on_hit ? "b" : "");
bp_strings.push_back(ss.str());
}
}
@ -55,6 +69,8 @@ void BreakPoints::AddFromStrings(const TBreakPointsStr& bp_strings)
ss << std::hex << bp_string;
ss >> bp.address;
bp.is_enabled = bp_string.find('n') != bp_string.npos;
bp.log_on_hit = bp_string.find('l') != bp_string.npos;
bp.break_on_hit = bp_string.find('b') != bp_string.npos;
bp.is_temporary = false;
Add(bp);
}
@ -71,6 +87,11 @@ void BreakPoints::Add(const TBreakPoint& bp)
}
void BreakPoints::Add(u32 address, bool temp)
{
BreakPoints::Add(address, temp, true, false);
}
void BreakPoints::Add(u32 address, bool temp, bool break_on_hit, bool log_on_hit)
{
// Only add new addresses
if (IsAddressBreakPoint(address))
@ -79,6 +100,8 @@ void BreakPoints::Add(u32 address, bool temp)
TBreakPoint bp; // breakpoint settings
bp.is_enabled = true;
bp.is_temporary = temp;
bp.break_on_hit = break_on_hit;
bp.log_on_hit = log_on_hit;
bp.address = address;
m_breakpoints.push_back(bp);
@ -154,7 +177,7 @@ void MemChecks::AddFromStrings(const TMemChecksStr& mc_strings)
mc.is_break_on_read = mc_string.find('r') != mc_string.npos;
mc.is_break_on_write = mc_string.find('w') != mc_string.npos;
mc.log_on_hit = mc_string.find('l') != mc_string.npos;
mc.break_on_hit = mc_string.find('p') != mc_string.npos;
mc.break_on_hit = mc_string.find('b') != mc_string.npos;
if (mc.is_ranged)
ss >> mc.end_address;
else

5
Source/Core/Core/PowerPC/BreakPoints.h
View file

@ -20,6 +20,8 @@ struct TBreakPoint
u32 address = 0;
bool is_enabled = false;
bool is_temporary = false;
bool log_on_hit = false;
bool break_on_hit = false;
};
struct TMemCheck
@ -56,8 +58,11 @@ public:
// is address breakpoint
bool IsAddressBreakPoint(u32 address) const;
bool IsTempBreakPoint(u32 address) const;
bool IsBreakPointBreakOnHit(u32 address) const;
bool IsBreakPointLogOnHit(u32 address) const;
// Add BreakPoint
void Add(u32 address, bool temp, bool break_on_hit, bool log_on_hit);
void Add(u32 address, bool temp = false);
void Add(const TBreakPoint& bp);

10
Source/Core/Core/PowerPC/PowerPC.cpp
View file

@ -28,6 +28,7 @@
#include "Core/PowerPC/Interpreter/Interpreter.h"
#include "Core/PowerPC/JitInterface.h"
#include "Core/PowerPC/MMU.h"
#include "Core/PowerPC/PPCSymbolDB.h"
namespace PowerPC
{
@ -603,7 +604,14 @@ void CheckBreakPoints()
{
if (PowerPC::breakpoints.IsAddressBreakPoint(PC))
{
CPU::Break();
if (PowerPC::breakpoints.IsBreakPointBreakOnHit(PC))
CPU::Break();
if (PowerPC::breakpoints.IsBreakPointLogOnHit(PC))
{
NOTICE_LOG(MEMMAP, "BP %08x %s(%08x %08x %08x %08x %08x %08x %08x %08x %08x %08x) LR=%08x",
PC, g_symbolDB.GetDescription(PC).c_str(), GPR(3), GPR(4), GPR(5), GPR(6), GPR(7),
GPR(8), GPR(9), GPR(10), GPR(11), GPR(12), LR);
}
if (PowerPC::breakpoints.IsTempBreakPoint(PC))
PowerPC::breakpoints.Remove(PC);
}