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.

src/core/gdbstub/gdbstub.cpp

@@ -153,9 +153,10 @@ struct Breakpoint {
     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
 
 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) {
     case BreakpointType::Execute:
         return breakpoints_execute;
@@ -399,21 +400,23 @@ static std::map<u32, Breakpoint>& GetBreakpointList(BreakpointType type) {
  * @param addr Address of breakpoint.
  */
 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;
+    }
+
+    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) {
-    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;
 
     if (next_breakpoint != p.end()) {
@@ -432,10 +435,13 @@ bool CheckBreakpoint(VAddr addr, BreakpointType type) {
         return false;
     }
 
-    std::map<u32, Breakpoint>& p = GetBreakpointList(type);
+    const BreakpointMap& p = GetBreakpointMap(type);
+    const auto bp = p.find(addr);
+
+    if (bp == p.end()) {
+        return false;
+    }
 
-    auto bp = p.find(addr);
-    if (bp != p.end()) {
     u32 len = bp->second.len;
 
     // IDA Pro defaults to 4-byte breakpoints for all non-hardware breakpoints
@@ -452,11 +458,11 @@ bool CheckBreakpoint(VAddr addr, BreakpointType type) {
 
     if (bp->second.active && (addr >= bp->second.addr && addr < bp->second.addr + len)) {
         LOG_DEBUG(Debug_GDBStub,
-                      "Found breakpoint type {} @ {:08x}, range: {:08x} - {:08x} ({} bytes)\n",
+                  "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;
 }
@@ -897,7 +903,7 @@ static void Continue() {
  * @param len Length of breakpoint.
  */
 static bool CommitBreakpoint(BreakpointType type, VAddr addr, u32 len) {
-    std::map<u32, Breakpoint>& p = GetBreakpointList(type);
+    BreakpointMap& p = GetBreakpointMap(type);
 
     Breakpoint breakpoint;
     breakpoint.active = true;