target/xtensa: avoid IHI for writes to non-executable memory

[openocd.git] / src / server / gdb_server.c

diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index 00e43cfe957bca175f906afe82b7c38caadd8817..dfd7cd52010e3991320000514c4a52b29129c8c5 100644 (file)
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -73,6 +73,8 @@ struct gdb_connection {
        enum target_state frontend_state;
        struct image *vflash_image;
        bool closed;
+       /* set to prevent re-entrance from log messages during gdb_get_packet()
+        * and gdb_put_packet(). */
        bool busy;
        int noack_mode;
        /* set flag to true if you want the next stepi to return immediately.
@@ -2843,7 +2845,9 @@ static int gdb_query_packet(struct connection *connection,
 
                        len = strtoul(separator + 1, NULL, 16);
 
+                       gdb_connection->output_flag = GDB_OUTPUT_NOTIF;
                        retval = target_checksum_memory(target, addr, len, &checksum);
+                       gdb_connection->output_flag = GDB_OUTPUT_NO;
 
                        if (retval == ERROR_OK) {
                                snprintf(gdb_reply, 10, "C%8.8" PRIx32 "", checksum);
@@ -3794,11 +3798,6 @@ static void gdb_keep_client_alive(struct connection *connection)
 {
        struct gdb_connection *gdb_con = connection->priv;
 
-       if (gdb_con->busy) {
-               /* do not send packets, retry asap */
-               return;
-       }
-
        switch (gdb_con->output_flag) {
        case GDB_OUTPUT_NO:
                /* no need for keep-alive */