Implement query command and add memory map.

[fw/stlink] / src / gdb-server.c

diff --git a/src/gdb-server.c b/src/gdb-server.c
index cd44cc04e403067aa50ff236cb87f58cbe142a6d..53df7191543a9a8160d4bcbc47fd71a3b24c872d 100644 (file)
--- a/src/gdb-server.c
+++ b/src/gdb-server.c
@@ -13,30 +13,65 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <arpa/inet.h>
 #include "gdb-remote.h"
 #include "stlink-hw.h"
 
 static const char hex[] = "0123456789abcdef";
 
-int main(int argc, char** argv) {
-       struct sockaddr_in serv_addr;
+// configured for STM32F100RB
+static const char* const c_memory_map =
+  "<?xml version=\"1.0\"?>"
+  "<!DOCTYPE memory-map PUBLIC \"+//IDN gnu.org//DTD GDB Memory Map V1.0//EN\""
+  "     \"http://sourceware.org/gdb/gdb-memory-map.dtd\">"
+  "<memory-map>"
+  "  <memory type=\"rom\" start=\"0x00000000\" length=\"0x100000\"/>" // code
+  "  <memory type=\"ram\" start=\"0x20000000\" length=\"0x100000\"/>" // sram
+  "  <memory type=\"flash\" start=\"0x08000000\" length=\"0x20000\">" // flash 128k
+  "    <property name=\"blocksize\">0x400</property>"                 // 1k pages
+  "  </memory>"
+  "</memory-map>";
+
+int serve(struct stlink* sl, int port);
 
+int main(int argc, char** argv) {
        if(argc != 3) {
                fprintf(stderr, "Usage: %s <port> /dev/sgX\n", argv[0]);
                return 1;
        }
 
+       struct stlink *sl = stlink_quirk_open(argv[2], 0);
+       if (sl == NULL)
+               return 1;
+
+       if(stlink_current_mode(sl) != STLINK_DEV_DEBUG_MODE)
+               stlink_enter_swd_mode(sl);
+
+       stlink_core_id(sl);
+       printf("Debugging ARM core %08x.\n", sl->core_id);
+
        int port = atoi(argv[1]);
 
+       while(serve(sl, port) == 0);
+
+       stlink_close(sl);
+
+       return 0;
+}
+
+int serve(struct stlink* sl, int port) {
        int sock = socket(AF_INET, SOCK_STREAM, 0);
        if(sock < 0) {
                perror("socket");
                return 1;
        }
 
-       memset((char *) &serv_addr, 0, sizeof(serv_addr));
+       unsigned int val = 1;
+       setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
+
+       struct sockaddr_in serv_addr = {0};
        serv_addr.sin_family = AF_INET;
-       serv_addr.sin_addr.s_addr = INADDR_ANY;
+       serv_addr.sin_addr.s_addr = inet_addr("127.0.0.1");
        serv_addr.sin_port = htons(port);
 
        if(bind(sock, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0) {
@@ -49,16 +84,6 @@ int main(int argc, char** argv) {
                return 1;
        }
 
-       struct stlink *sl = stlink_quirk_open(argv[2], 0);
-       if (sl == NULL)
-               return 1;
-
-       if(stlink_current_mode(sl) != STLINK_DEV_DEBUG_MODE)
-               stlink_enter_swd_mode(sl);
-
-       stlink_core_id(sl);
-       printf("Debugging ARM core %08x.\n", sl->core_id);
-
        stlink_force_debug(sl);
        stlink_reset(sl);
 
@@ -83,11 +108,82 @@ int main(int argc, char** argv) {
                        return 1;
                }
 
-               //printf("recv: %s\n", packet);
+               #ifdef DEBUG
+               printf("recv: %s\n", packet);
+               #endif
 
                char* reply = NULL;
 
                switch(packet[0]) {
+               case 'q': {
+                       if(packet[1] == 'P' || packet[1] == 'C' || packet[1] == 'L') {
+                               reply = strdup("");
+                               break;
+                       }
+
+                       char *separator = strstr(packet, ":"), *params = "";
+                       if(separator == NULL) {
+                               separator = packet + strlen(packet);
+                       } else {
+                               params = separator + 1;
+                       }
+
+                       unsigned queryNameLength = (separator - &packet[1]);
+                       char* queryName = calloc(queryNameLength + 1, 1);
+                       strncpy(queryName, &packet[1], queryNameLength);
+
+                       #ifdef DEBUG
+                       printf("query: %s;%s\n", queryName, params);
+                       #endif
+
+                       if(!strcmp(queryName, "Supported")) {
+                               reply = strdup("PacketSize=3fff;qXfer:memory-map:read+");
+                       } else if(!strcmp(queryName, "Xfer")) {
+                               char *type, *op, *annex, *s_addr, *s_length;
+                               char *tok = params;
+
+                               type     = strsep(&tok, ":");
+                               op       = strsep(&tok, ":");
+                               annex    = strsep(&tok, ":");
+                               s_addr   = strsep(&tok, ",");
+                               s_length = tok;
+
+                               unsigned addr = strtoul(s_addr, NULL, 16),
+                                      length = strtoul(s_length, NULL, 16);
+
+                               #ifdef DEBUG
+                               printf("Xfer: type:%s;op:%s;annex:%s;addr:%d;length:%d\n",
+                                       type, op, annex, addr, length);
+                               #endif
+
+                               const char* data = NULL;
+
+                               if(!strcmp(type, "memory-map") && !strcmp(op, "read"))
+                                       data = c_memory_map;
+
+                               if(data) {
+                                       unsigned data_length = strlen(data);
+                                       if(addr + length > data_length)
+                                               length = data_length - addr;
+
+                                       if(length == 0) {
+                                               reply = strdup("l");
+                                       } else {
+                                               reply = calloc(length + 2, 1);
+                                               reply[0] = 'm';
+                                               strncpy(&reply[1], data, length);
+                                       }
+                               }
+                       }
+
+                       if(reply == NULL)
+                               reply = strdup("");
+
+                       free(queryName);
+
+                       break;
+               }
+
                case 'c':
                        stlink_run(sl);
 
@@ -221,12 +317,22 @@ int main(int argc, char** argv) {
                        break;
                }
 
+               case 'k': {
+                       // After this function will be entered afterwards, the
+                       // chip will be reset anyway. So this is a no-op.
+
+                       close(client);
+                       return 0;
+               }
+
                default:
                        reply = strdup("");
                }
 
                if(reply) {
-                       //printf("send: %s\n", reply);
+                       #ifdef DEBUG
+                       printf("send: %s\n", reply);
+                       #endif
 
                        int result = gdb_send_packet(client, reply);
                        if(result != 0) {