projects / fw / stlink / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge pull request #101 from prattmic/master
[fw/stlink] / gdbserver / gdb-server.c
diff --git a/gdbserver/gdb-server.c b/gdbserver/gdb-server.c
index bd478573f54376715d2c1697f2d83a1c4de55be8..ae06952bf83041f633803a7fd01a0b2393c511a4 100644 (file)
--- a/gdbserver/gdb-server.c
+++ b/gdbserver/gdb-server.c
@@ -163,7 +163,7 @@ int main(int argc, char** argv) {
                if(sl == NULL) return 1;
                break;
     }
-    
+
        printf("Chip ID is %08x, Core ID is  %08x.\n", sl->chip_id, sl->core_id);
 
        sl->verbose=0;
@@ -192,13 +192,79 @@ winsock_error:
        return 0;
 }
 
+static const char* const target_description_F4 =
+    "<?xml version=\"1.0\"?>"
+    "<!DOCTYPE target SYSTEM \"gdb-target.dtd\">"
+    "<target version=\"1.0\">"
+    "   <architecture>arm</architecture>"
+    "   <feature name=\"org.gnu.gdb.arm.m-profile\">"
+    "       <reg name=\"r0\" bitsize=\"32\"/>"
+    "       <reg name=\"r1\" bitsize=\"32\"/>"
+    "       <reg name=\"r2\" bitsize=\"32\"/>"
+    "       <reg name=\"r3\" bitsize=\"32\"/>"
+    "       <reg name=\"r4\" bitsize=\"32\"/>"
+    "       <reg name=\"r5\" bitsize=\"32\"/>"
+    "       <reg name=\"r6\" bitsize=\"32\"/>"
+    "       <reg name=\"r7\" bitsize=\"32\"/>"
+    "       <reg name=\"r8\" bitsize=\"32\"/>"
+    "       <reg name=\"r9\" bitsize=\"32\"/>"
+    "       <reg name=\"r10\" bitsize=\"32\"/>"
+    "       <reg name=\"r11\" bitsize=\"32\"/>"
+    "       <reg name=\"r12\" bitsize=\"32\"/>"
+    "       <reg name=\"sp\" bitsize=\"32\" type=\"data_ptr\"/>"
+    "       <reg name=\"lr\" bitsize=\"32\"/>"
+    "       <reg name=\"pc\" bitsize=\"32\" type=\"code_ptr\"/>"
+    "       <reg name=\"xpsr\" bitsize=\"32\" regnum=\"25\"/>"
+    "       <reg name=\"msp\" bitsize=\"32\" regnum=\"26\" type=\"data_ptr\" group=\"general\" />"
+    "       <reg name=\"psp\" bitsize=\"32\" regnum=\"27\" type=\"data_ptr\" group=\"general\" />"
+    "       <reg name=\"control\" bitsize=\"8\" regnum=\"28\" type=\"int\" group=\"general\" />"
+    "       <reg name=\"faultmask\" bitsize=\"8\" regnum=\"29\" type=\"int\" group=\"general\" />"
+    "       <reg name=\"basepri\" bitsize=\"8\" regnum=\"30\" type=\"int\" group=\"general\" />"
+    "       <reg name=\"primask\" bitsize=\"8\" regnum=\"31\" type=\"int\" group=\"general\" />"
+    "       <reg name=\"s0\" bitsize=\"32\" regnum=\"32\" type=\"float\" group=\"float\" />"
+    "       <reg name=\"s1\" bitsize=\"32\" type=\"float\" group=\"float\" />"
+    "       <reg name=\"s2\" bitsize=\"32\" type=\"float\" group=\"float\" />"
+    "       <reg name=\"s3\" bitsize=\"32\" type=\"float\" group=\"float\" />"
+    "       <reg name=\"s4\" bitsize=\"32\" type=\"float\" group=\"float\" />"
+    "       <reg name=\"s5\" bitsize=\"32\" type=\"float\" group=\"float\" />"
+    "       <reg name=\"s6\" bitsize=\"32\" type=\"float\" group=\"float\" />"
+    "       <reg name=\"s7\" bitsize=\"32\" type=\"float\" group=\"float\" />"
+    "       <reg name=\"s8\" bitsize=\"32\" type=\"float\" group=\"float\" />"
+    "       <reg name=\"s9\" bitsize=\"32\" type=\"float\" group=\"float\" />"
+    "       <reg name=\"s10\" bitsize=\"32\" type=\"float\" group=\"float\" />"
+    "       <reg name=\"s11\" bitsize=\"32\" type=\"float\" group=\"float\" />"
+    "       <reg name=\"s12\" bitsize=\"32\" type=\"float\" group=\"float\" />"
+    "       <reg name=\"s13\" bitsize=\"32\" type=\"float\" group=\"float\" />"
+    "       <reg name=\"s14\" bitsize=\"32\" type=\"float\" group=\"float\" />"
+    "       <reg name=\"s15\" bitsize=\"32\" type=\"float\" group=\"float\" />"
+    "       <reg name=\"s16\" bitsize=\"32\" type=\"float\" group=\"float\" />"
+    "       <reg name=\"s17\" bitsize=\"32\" type=\"float\" group=\"float\" />"
+    "       <reg name=\"s18\" bitsize=\"32\" type=\"float\" group=\"float\" />"
+    "       <reg name=\"s19\" bitsize=\"32\" type=\"float\" group=\"float\" />"
+    "       <reg name=\"s20\" bitsize=\"32\" type=\"float\" group=\"float\" />"
+    "       <reg name=\"s21\" bitsize=\"32\" type=\"float\" group=\"float\" />"
+    "       <reg name=\"s22\" bitsize=\"32\" type=\"float\" group=\"float\" />"
+    "       <reg name=\"s23\" bitsize=\"32\" type=\"float\" group=\"float\" />"
+    "       <reg name=\"s24\" bitsize=\"32\" type=\"float\" group=\"float\" />"
+    "       <reg name=\"s25\" bitsize=\"32\" type=\"float\" group=\"float\" />"
+    "       <reg name=\"s26\" bitsize=\"32\" type=\"float\" group=\"float\" />"
+    "       <reg name=\"s27\" bitsize=\"32\" type=\"float\" group=\"float\" />"
+    "       <reg name=\"s28\" bitsize=\"32\" type=\"float\" group=\"float\" />"
+    "       <reg name=\"s29\" bitsize=\"32\" type=\"float\" group=\"float\" />"
+    "       <reg name=\"s30\" bitsize=\"32\" type=\"float\" group=\"float\" />"
+    "       <reg name=\"s31\" bitsize=\"32\" type=\"float\" group=\"float\" />"
+    "       <reg name=\"fpscr\" bitsize=\"32\" type=\"int\" group=\"float\" />"
+    "   </feature>"
+    "</target>";
+
 static const char* const memory_map_template_F4 =
   "<?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 = sram, bootrom or flash; flash is bigger
-  "  <memory type=\"ram\" start=\"0x20000000\" length=\"0x30000\"/>"        // sram
+  "  <memory type=\"ram\" start=\"0x10000000\" length=\"0x10000\"/>"        // ccm ram
+  "  <memory type=\"ram\" start=\"0x20000000\" length=\"0x20000\"/>"        // sram
   "  <memory type=\"flash\" start=\"0x08000000\" length=\"0x10000\">"          //Sectors 0..3
   "    <property name=\"blocksize\">0x4000</property>"                                         //16kB
   "  </memory>"
@@ -227,7 +293,7 @@ static const char* const memory_map_template =
   "  <memory type=\"ram\" start=\"0x40000000\" length=\"0x1fffffff\"/>" // peripheral regs
   "  <memory type=\"ram\" start=\"0xe0000000\" length=\"0x1fffffff\"/>" // cortex regs
   "  <memory type=\"rom\" start=\"0x%08x\" length=\"0x%zx\"/>"           // bootrom
-  "  <memory type=\"rom\" start=\"0x1ffff800\" length=\"0x8x\"/>"        // option byte area
+  "  <memory type=\"rom\" start=\"0x1ffff800\" length=\"0x10\"/>"        // option byte area
   "</memory-map>";
 
 char* make_memory_map(stlink_t *sl) {
@@ -248,7 +314,7 @@ char* make_memory_map(stlink_t *sl) {
 }
 
 
-/* 
+/*
  * DWT_COMP0     0xE0001020
  * DWT_MASK0     0xE0001024
  * DWT_FUNCTION0 0xE0001028
@@ -281,7 +347,7 @@ static void init_data_watchpoints(stlink_t *sl) {
        #endif
 
        // set trcena in debug command to turn on dwt unit
-       stlink_write_debug32(sl, 0xE000EDFC, 
+       stlink_write_debug32(sl, 0xE000EDFC,
                             stlink_read_debug32(sl, 0xE000EDFC) | (1<<24));
 
        // make sure all watchpoints are cleared
@@ -567,7 +633,7 @@ int serve(stlink_t *sl, int port) {
        }
 
        unsigned int val = 1;
-       setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
+       setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *)&val, sizeof(val));
 
        struct sockaddr_in serv_addr;
        memset(&serv_addr,0,sizeof(struct sockaddr_in));
@@ -648,7 +714,12 @@ int serve(stlink_t *sl, int port) {
                        #endif
 
                        if(!strcmp(queryName, "Supported")) {
-                               reply = strdup("PacketSize=3fff;qXfer:memory-map:read+");
+                if(sl->chip_id==STM32_CHIPID_F4) {
+                    reply = strdup("PacketSize=3fff;qXfer:memory-map:read+;qXfer:features:read+");
+                }
+                else {
+                    reply = strdup("PacketSize=3fff;qXfer:memory-map:read+");
+                }
                        } else if(!strcmp(queryName, "Xfer")) {
                                char *type, *op, *__s_addr, *s_length;
                                char *tok = params;
@@ -673,6 +744,9 @@ int serve(stlink_t *sl, int port) {
                                if(!strcmp(type, "memory-map") && !strcmp(op, "read"))
                                        data = current_memory_map;
 
+                               if(!strcmp(type, "features") && !strcmp(op, "read"))
+                                       data = target_description_F4;
+
                                if(data) {
                                        unsigned data_length = strlen(data);
                                        if(addr + length > data_length)
@@ -694,31 +768,31 @@ int serve(stlink_t *sl, int port) {
                                } else {
                                        params = separator + 1;
                                }
-                               
 
-                               if (!strncmp(params,"7265",4)) {// resume
+
+                               if (!strncmp(params,"726573756d65",12)) {// resume
 #ifdef DEBUG
                                        printf("Rcmd: resume\n");
 #endif
                                        stlink_run(sl);
 
                                        reply = strdup("OK");
-                               } else if (!strncmp(params,"6861",4)) { //half
+                } else if (!strncmp(params,"68616c74",8)) { //halt
                                        reply = strdup("OK");
-                                       
+
                                        stlink_force_debug(sl);
 
 #ifdef DEBUG
                                        printf("Rcmd: halt\n");
 #endif
-                               } else if (!strncmp(params,"7265",4)) { //reset
+                } else if (!strncmp(params,"7265736574",10)) { //reset
                                        reply = strdup("OK");
-                                       
+
                                        stlink_force_debug(sl);
                                        stlink_reset(sl);
                                        init_code_breakpoints(sl);
                                        init_data_watchpoints(sl);
-                                       
+
 #ifdef DEBUG
                                        printf("Rcmd: reset\n");
 #endif
@@ -728,7 +802,7 @@ int serve(stlink_t *sl, int port) {
 #endif
 
                                }
-                               
+
                        }
 
                        if(reply == NULL)
@@ -880,6 +954,30 @@ int serve(stlink_t *sl, int port) {
                        } else if(id == 0x19) {
                                stlink_read_reg(sl, 16, &regp);
                                myreg = htonl(regp.xpsr);
+                       } else if(id == 0x1A) {
+                               stlink_read_reg(sl, 17, &regp);
+                               myreg = htonl(regp.main_sp);
+                       } else if(id == 0x1B) {
+                               stlink_read_reg(sl, 18, &regp);
+                               myreg = htonl(regp.process_sp);
+                       } else if(id == 0x1C) {
+                               stlink_read_unsupported_reg(sl, id, &regp);
+                               myreg = htonl(regp.control);
+                       } else if(id == 0x1D) {
+                               stlink_read_unsupported_reg(sl, id, &regp);
+                               myreg = htonl(regp.faultmask);
+                       } else if(id == 0x1E) {
+                               stlink_read_unsupported_reg(sl, id, &regp);
+                               myreg = htonl(regp.basepri);
+                       } else if(id == 0x1F) {
+                               stlink_read_unsupported_reg(sl, id, &regp);
+                               myreg = htonl(regp.primask);
+            } else if(id >= 0x20 && id < 0x40) {
+                stlink_read_unsupported_reg(sl, id, &regp);
+                myreg = htonl(regp.s[id-0x20]);
+                       } else if(id == 0x40) {
+                stlink_read_unsupported_reg(sl, id, &regp);
+                myreg = htonl(regp.fpscr);
                        } else {
                                reply = strdup("E00");
                        }
@@ -901,6 +999,22 @@ int serve(stlink_t *sl, int port) {
                                stlink_write_reg(sl, ntohl(value), reg);
                        } else if(reg == 0x19) {
                                stlink_write_reg(sl, ntohl(value), 16);
+                       } else if(reg == 0x1A) {
+                               stlink_write_reg(sl, ntohl(value), 17);
+                       } else if(reg == 0x1B) {
+                               stlink_write_reg(sl, ntohl(value), 18);
+                       } else if(reg == 0x1C) {
+                               stlink_write_unsupported_reg(sl, ntohl(value), reg, &regp);
+                       } else if(reg == 0x1D) {
+                               stlink_write_unsupported_reg(sl, ntohl(value), reg, &regp);
+                       } else if(reg == 0x1E) {
+                               stlink_write_unsupported_reg(sl, ntohl(value), reg, &regp);
+                       } else if(reg == 0x1F) {
+                               stlink_write_unsupported_reg(sl, ntohl(value), reg, &regp);
+            } else if(reg >= 0x20 && reg < 0x40) {
+                stlink_write_unsupported_reg(sl, ntohl(value), reg, &regp);
+                       } else if(reg == 0x40) {
+                stlink_write_unsupported_reg(sl, ntohl(value), reg, &regp);
                        } else {
                                reply = strdup("E00");
                        }
STM tools with support for Altus Metrum targets