gdbstub: Use type alias for breakpoint maps
Rather than having to type out the full std::map type signature, we can just use a straightforward alias. While we're at it, rename GetBreakpointList to GetBreakpointMap, which makes the name more accurate. We can also get rid of unnecessary u64 static_casts, since VAddr is an alias for a u64.
This commit is contained in:
parent
80f1ffd8dc
commit
91559bfdfe
|
@ -153,9 +153,10 @@ struct Breakpoint {
|
||||||
std::array<u8, 4> inst;
|
std::array<u8, 4> inst;
|
||||||
};
|
};
|
||||||
|
|
||||||
std::map<u32, Breakpoint> breakpoints_execute;
|
using BreakpointMap = std::map<VAddr, Breakpoint>;
|
||||||
std::map<u32, Breakpoint> breakpoints_read;
|
BreakpointMap breakpoints_execute;
|
||||||
std::map<u32, Breakpoint> breakpoints_write;
|
BreakpointMap breakpoints_read;
|
||||||
|
BreakpointMap breakpoints_write;
|
||||||
} // Anonymous namespace
|
} // Anonymous namespace
|
||||||
|
|
||||||
static Kernel::Thread* FindThreadById(int id) {
|
static Kernel::Thread* FindThreadById(int id) {
|
||||||
|
@ -375,11 +376,11 @@ static u8 CalculateChecksum(const u8* buffer, size_t length) {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the list of breakpoints for a given breakpoint type.
|
* Get the map of breakpoints for a given breakpoint type.
|
||||||
*
|
*
|
||||||
* @param type Type of breakpoint list.
|
* @param type Type of breakpoint map.
|
||||||
*/
|
*/
|
||||||
static std::map<u32, Breakpoint>& GetBreakpointList(BreakpointType type) {
|
static BreakpointMap& GetBreakpointMap(BreakpointType type) {
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case BreakpointType::Execute:
|
case BreakpointType::Execute:
|
||||||
return breakpoints_execute;
|
return breakpoints_execute;
|
||||||
|
@ -399,21 +400,23 @@ static std::map<u32, Breakpoint>& GetBreakpointList(BreakpointType type) {
|
||||||
* @param addr Address of breakpoint.
|
* @param addr Address of breakpoint.
|
||||||
*/
|
*/
|
||||||
static void RemoveBreakpoint(BreakpointType type, VAddr addr) {
|
static void RemoveBreakpoint(BreakpointType type, VAddr addr) {
|
||||||
std::map<u32, Breakpoint>& p = GetBreakpointList(type);
|
BreakpointMap& p = GetBreakpointMap(type);
|
||||||
|
|
||||||
auto bp = p.find(addr);
|
const auto bp = p.find(addr);
|
||||||
if (bp != p.end()) {
|
if (bp == p.end()) {
|
||||||
LOG_DEBUG(Debug_GDBStub, "gdb: removed a breakpoint: {:08x} bytes at {:08x} of type {}\n",
|
return;
|
||||||
bp->second.len, bp->second.addr, static_cast<int>(type));
|
|
||||||
Memory::WriteBlock(bp->second.addr, bp->second.inst.data(), bp->second.inst.size());
|
|
||||||
Core::CPU().ClearInstructionCache();
|
|
||||||
p.erase(addr);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
LOG_DEBUG(Debug_GDBStub, "gdb: removed a breakpoint: {:08x} bytes at {:08x} of type {}",
|
||||||
|
bp->second.len, bp->second.addr, static_cast<int>(type));
|
||||||
|
Memory::WriteBlock(bp->second.addr, bp->second.inst.data(), bp->second.inst.size());
|
||||||
|
Core::CPU().ClearInstructionCache();
|
||||||
|
p.erase(addr);
|
||||||
}
|
}
|
||||||
|
|
||||||
BreakpointAddress GetNextBreakpointFromAddress(VAddr addr, BreakpointType type) {
|
BreakpointAddress GetNextBreakpointFromAddress(VAddr addr, BreakpointType type) {
|
||||||
std::map<u32, Breakpoint>& p = GetBreakpointList(type);
|
const BreakpointMap& p = GetBreakpointMap(type);
|
||||||
auto next_breakpoint = p.lower_bound(addr);
|
const auto next_breakpoint = p.lower_bound(addr);
|
||||||
BreakpointAddress breakpoint;
|
BreakpointAddress breakpoint;
|
||||||
|
|
||||||
if (next_breakpoint != p.end()) {
|
if (next_breakpoint != p.end()) {
|
||||||
|
@ -432,30 +435,33 @@ bool CheckBreakpoint(VAddr addr, BreakpointType type) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::map<u32, Breakpoint>& p = GetBreakpointList(type);
|
const BreakpointMap& p = GetBreakpointMap(type);
|
||||||
|
const auto bp = p.find(addr);
|
||||||
|
|
||||||
auto bp = p.find(addr);
|
if (bp == p.end()) {
|
||||||
if (bp != p.end()) {
|
return false;
|
||||||
u32 len = bp->second.len;
|
}
|
||||||
|
|
||||||
// IDA Pro defaults to 4-byte breakpoints for all non-hardware breakpoints
|
u32 len = bp->second.len;
|
||||||
// no matter if it's a 4-byte or 2-byte instruction. When you execute a
|
|
||||||
// Thumb instruction with a 4-byte breakpoint set, it will set a breakpoint on
|
|
||||||
// two instructions instead of the single instruction you placed the breakpoint
|
|
||||||
// on. So, as a way to make sure that execution breakpoints are only breaking
|
|
||||||
// on the instruction that was specified, set the length of an execution
|
|
||||||
// breakpoint to 1. This should be fine since the CPU should never begin executing
|
|
||||||
// an instruction anywhere except the beginning of the instruction.
|
|
||||||
if (type == BreakpointType::Execute) {
|
|
||||||
len = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (bp->second.active && (addr >= bp->second.addr && addr < bp->second.addr + len)) {
|
// IDA Pro defaults to 4-byte breakpoints for all non-hardware breakpoints
|
||||||
LOG_DEBUG(Debug_GDBStub,
|
// no matter if it's a 4-byte or 2-byte instruction. When you execute a
|
||||||
"Found breakpoint type {} @ {:08x}, range: {:08x} - {:08x} ({} bytes)\n",
|
// Thumb instruction with a 4-byte breakpoint set, it will set a breakpoint on
|
||||||
static_cast<int>(type), addr, bp->second.addr, bp->second.addr + len, len);
|
// two instructions instead of the single instruction you placed the breakpoint
|
||||||
return true;
|
// on. So, as a way to make sure that execution breakpoints are only breaking
|
||||||
}
|
// on the instruction that was specified, set the length of an execution
|
||||||
|
// breakpoint to 1. This should be fine since the CPU should never begin executing
|
||||||
|
// an instruction anywhere except the beginning of the instruction.
|
||||||
|
if (type == BreakpointType::Execute) {
|
||||||
|
len = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (bp->second.active && (addr >= bp->second.addr && addr < bp->second.addr + len)) {
|
||||||
|
LOG_DEBUG(Debug_GDBStub,
|
||||||
|
"Found breakpoint type {} @ {:08x}, range: {:08x}"
|
||||||
|
" - {:08x} ({:x} bytes)",
|
||||||
|
static_cast<int>(type), addr, bp->second.addr, bp->second.addr + len, len);
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
@ -897,7 +903,7 @@ static void Continue() {
|
||||||
* @param len Length of breakpoint.
|
* @param len Length of breakpoint.
|
||||||
*/
|
*/
|
||||||
static bool CommitBreakpoint(BreakpointType type, VAddr addr, u32 len) {
|
static bool CommitBreakpoint(BreakpointType type, VAddr addr, u32 len) {
|
||||||
std::map<u32, Breakpoint>& p = GetBreakpointList(type);
|
BreakpointMap& p = GetBreakpointMap(type);
|
||||||
|
|
||||||
Breakpoint breakpoint;
|
Breakpoint breakpoint;
|
||||||
breakpoint.active = true;
|
breakpoint.active = true;
|
||||||
|
|
Reference in New Issue