From 5e3fc91775dd66cb633d6abc74cd370fe317f789 Mon Sep 17 00:00:00 2001 From: Robert O'Callahan Date: Sat, 9 Mar 2024 12:02:32 +1300 Subject: [PATCH] Rename `DREQ_SEARCH_MEM` to `DREQ_SEARCH_MEM_BINARY` --- src/GdbServer.cc | 2 +- src/GdbServerConnection.cc | 4 ++-- src/GdbServerConnection.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/GdbServer.cc b/src/GdbServer.cc index 30cbb7da557..f7e468a2832 100644 --- a/src/GdbServer.cc +++ b/src/GdbServer.cc @@ -553,7 +553,7 @@ void GdbServer::dispatch_debugger_request(Session& session, dbg->reply_set_mem(true); return; } - case DREQ_SEARCH_MEM: { + case DREQ_SEARCH_MEM_BINARY: { remote_ptr addr; bool found = search_memory(target, MemoryRange(req.mem().addr, req.mem().len), diff --git a/src/GdbServerConnection.cc b/src/GdbServerConnection.cc index f183c1ef730..1e3a2e59ff5 100644 --- a/src/GdbServerConnection.cc +++ b/src/GdbServerConnection.cc @@ -841,7 +841,7 @@ bool GdbServerConnection::query(char* payload) { *args++ = '\0'; } if (!strcmp(name, "memory") && args) { - req = GdbRequest(DREQ_SEARCH_MEM); + req = GdbRequest(DREQ_SEARCH_MEM_BINARY); req.target = query_thread; req.mem().addr = strtoul(args, &args, 16); parser_assert(';' == *args++); @@ -1866,7 +1866,7 @@ void GdbServerConnection::reply_set_mem(bool ok) { } void GdbServerConnection::reply_search_mem(bool found, remote_ptr addr) { - DEBUG_ASSERT(DREQ_SEARCH_MEM == req.type); + DEBUG_ASSERT(DREQ_SEARCH_MEM_BINARY == req.type); if (found) { char buf[256]; diff --git a/src/GdbServerConnection.h b/src/GdbServerConnection.h index 3b590b02017..776e9d8424e 100644 --- a/src/GdbServerConnection.h +++ b/src/GdbServerConnection.h @@ -99,7 +99,7 @@ enum GdbRequestType { // // Uses .mem for offset/len. DREQ_READ_SIGINFO, - DREQ_SEARCH_MEM, + DREQ_SEARCH_MEM_BINARY, DREQ_MEM_INFO, DREQ_MEM_FIRST = DREQ_GET_MEM, DREQ_MEM_LAST = DREQ_MEM_INFO, @@ -504,7 +504,7 @@ class GdbServerConnection { void reply_set_mem(bool ok); /** - * Reply to the DREQ_SEARCH_MEM request. + * Reply to the DREQ_SEARCH_MEM_BINARY request. * |found| is true if we found the searched-for bytes starting at address * |addr|. */