Align loader to 32-bit boundary
[fw/stlink] / gdbserver / gdb-server.c
index a6de1b20d2db8f68fc6f2891e2b5e1f338ce809e..eca6597b470d0fae819500d6f1fface020afde30 100644 (file)
@@ -1,12 +1,11 @@
-/* -*- tab-width:8 -*- */
-#define DEBUG 0
 /*
- Copyright (C)  2011 Peter Zotov <whitequark@whitequark.org>
- Use of this source code is governed by a BSD-style
- license that can be found in the LICENSE file.
-*/
Copyright (C)  2011 Peter Zotov <whitequark@whitequark.org>
Use of this source code is governed by a BSD-style
license that can be found in the LICENSE file.
+ */
 
 #include <getopt.h>
+#include <signal.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
-#include <signal.h>
 #endif
 
 #include <stlink-common.h>
+#include <uglylogging.h>
 
 #include "gdb-remote.h"
-
-#define DEFAULT_LOGGING_LEVEL 50
-#define DEFAULT_GDB_LISTEN_PORT 4242
-
-#define STRINGIFY_inner(name) #name
-#define STRINGIFY(name) STRINGIFY_inner(name)
+#include "gdb-server.h"
 
 #define FLASH_BASE 0x08000000
 
@@ -45,10 +39,8 @@ static const char* current_memory_map = NULL;
 typedef struct _st_state_t {
     // things from command line, bleh
     int stlink_version;
-    // "/dev/serial/by-id/usb-FTDI_TTL232R-3V3_FTE531X6-if00-port0" is only 58 chars
-    char devicename[100];
     int logging_level;
-       int listen_port;
+    int listen_port;
     int persistent;
     int reset;
 } st_state_t;
@@ -56,8 +48,8 @@ typedef struct _st_state_t {
 
 int serve(stlink_t *sl, st_state_t *st);
 char* make_memory_map(stlink_t *sl);
+static void init_cache (stlink_t *sl);
 
-#ifndef __MINGW32__
 static void cleanup(int signal __attribute__((unused))) {
     if (connected_stlink) {
         /* Switch back to mass storage mode before closing. */
@@ -68,7 +60,6 @@ static void cleanup(int signal __attribute__((unused))) {
 
     exit(1);
 }
-#endif
 
 
 
@@ -76,90 +67,84 @@ int parse_options(int argc, char** argv, st_state_t *st) {
     static struct option long_options[] = {
         {"help", no_argument, NULL, 'h'},
         {"verbose", optional_argument, NULL, 'v'},
-        {"device", required_argument, NULL, 'd'},
         {"stlink_version", required_argument, NULL, 's'},
         {"stlinkv1", no_argument, NULL, '1'},
-               {"listen_port", required_argument, NULL, 'p'},
-               {"multi", optional_argument, NULL, 'm'},
-               {"no-reset", optional_argument, NULL, 'n'},
+        {"listen_port", required_argument, NULL, 'p'},
+        {"multi", optional_argument, NULL, 'm'},
+        {"no-reset", optional_argument, NULL, 'n'},
         {0, 0, 0, 0},
     };
-       const char * help_str = "%s - usage:\n\n"
-       "  -h, --help\t\tPrint this help\n"
-       "  -vXX, --verbose=XX\tspecify a specific verbosity level (0..99)\n"
-       "  -v, --verbose\tspecify generally verbose logging\n"
-       "  -d <device>, --device=/dev/stlink2_1\n"
-       "\t\t\tWhere is your stlink device connected?\n"
-       "  -s X, --stlink_version=X\n"
-       "\t\t\tChoose what version of stlink to use, (defaults to 2)\n"
-       "  -1, --stlinkv1\tForce stlink version 1\n"
-       "  -p 4242, --listen_port=1234\n"
-       "\t\t\tSet the gdb server listen port. "
-       "(default port: " STRINGIFY(DEFAULT_GDB_LISTEN_PORT) ")\n"
-    "  -m, --multi\n"
-    "\t\t\tSet gdb server to extended mode.\n"
-    "\t\t\tst-util will continue listening for connections after disconnect.\n"
-    "  -n, --no-reset\n"
-    "\t\t\tDo not reset board on connection.\n"
-       ;
+    const char * help_str = "%s - usage:\n\n"
+        "  -h, --help\t\tPrint this help\n"
+        "  -vXX, --verbose=XX\tSpecify a specific verbosity level (0..99)\n"
+        "  -v, --verbose\t\tSpecify generally verbose logging\n"
+        "  -s X, --stlink_version=X\n"
+        "\t\t\tChoose what version of stlink to use, (defaults to 2)\n"
+        "  -1, --stlinkv1\tForce stlink version 1\n"
+        "  -p 4242, --listen_port=1234\n"
+        "\t\t\tSet the gdb server listen port. "
+        "(default port: " STRINGIFY(DEFAULT_GDB_LISTEN_PORT) ")\n"
+        "  -m, --multi\n"
+        "\t\t\tSet gdb server to extended mode.\n"
+        "\t\t\tst-util will continue listening for connections after disconnect.\n"
+        "  -n, --no-reset\n"
+        "\t\t\tDo not reset board on connection.\n"
+        "\n"
+        "The STLINKv2 device to use can be specified in the environment\n"
+        "variable STLINK_DEVICE on the format <USB_BUS>:<USB_ADDR>.\n"
+        "\n"
+        ;
 
 
     int option_index = 0;
     int c;
     int q;
-    while ((c = getopt_long(argc, argv, "hv::d:s:1p:mn", long_options, &option_index)) != -1) {
+    while ((c = getopt_long(argc, argv, "hv::s:1p:mn", long_options, &option_index)) != -1) {
         switch (c) {
-        case 0:
-            printf("XXXXX Shouldn't really normally come here, only if there's no corresponding option\n");
-            printf("option %s", long_options[option_index].name);
-            if (optarg) {
-                printf(" with arg %s", optarg);
-            }
-            printf("\n");
-            break;
-        case 'h':
-            printf(help_str, argv[0]);
-            exit(EXIT_SUCCESS);
-            break;
-        case 'v':
-            if (optarg) {
-                st->logging_level = atoi(optarg);
-            } else {
-                st->logging_level = DEFAULT_LOGGING_LEVEL;
-            }
-            break;
-        case 'd':
-            if (strlen(optarg) > sizeof (st->devicename)) {
-                fprintf(stderr, "device name too long: %zd\n", strlen(optarg));
-            } else {
-                strcpy(st->devicename, optarg);
-            }
-            break;
-               case '1':
-                       st->stlink_version = 1;
-                       break;
-               case 's':
-                       sscanf(optarg, "%i", &q);
-                       if (q < 0 || q > 2) {
-                               fprintf(stderr, "stlink version %d unknown!\n", q);
-                               exit(EXIT_FAILURE);
-                       }
-                       st->stlink_version = q;
-                       break;
-               case 'p':
-                       sscanf(optarg, "%i", &q);
-                       if (q < 0) {
-                               fprintf(stderr, "Can't use a negative port to listen on: %d\n", q);
-                               exit(EXIT_FAILURE);
-                       }
-                       st->listen_port = q;
-                       break;
-               case 'm':
-                       st->persistent = 1;
-                       break;
-               case 'n':
-                       st->reset = 0;
-                       break;
+            case 0:
+                printf("XXXXX Shouldn't really normally come here, only if there's no corresponding option\n");
+                printf("option %s", long_options[option_index].name);
+                if (optarg) {
+                    printf(" with arg %s", optarg);
+                }
+                printf("\n");
+                break;
+            case 'h':
+                printf(help_str, argv[0]);
+                exit(EXIT_SUCCESS);
+                break;
+            case 'v':
+                if (optarg) {
+                    st->logging_level = atoi(optarg);
+                } else {
+                    st->logging_level = DEFAULT_LOGGING_LEVEL;
+                }
+                break;
+            case '1':
+                st->stlink_version = 1;
+                break;
+            case 's':
+                sscanf(optarg, "%i", &q);
+                if (q < 0 || q > 2) {
+                    fprintf(stderr, "stlink version %d unknown!\n", q);
+                    exit(EXIT_FAILURE);
+                }
+                st->stlink_version = q;
+                break;
+            case 'p':
+                sscanf(optarg, "%i", &q);
+                if (q < 0) {
+                    fprintf(stderr, "Can't use a negative port to listen on: %d\n", q);
+                    exit(EXIT_FAILURE);
+                }
+                st->listen_port = q;
+                break;
+            case 'm':
+                st->persistent = 1;
+                break;
+            case 'n':
+                st->reset = 0;
+                break;
         }
     }
 
@@ -174,74 +159,77 @@ int parse_options(int argc, char** argv, st_state_t *st) {
 
 
 int main(int argc, char** argv) {
-       uint32_t voltage;
-
-       stlink_t *sl = NULL;
-
-       st_state_t state;
-       memset(&state, 0, sizeof(state));
-       // set defaults...
-       state.stlink_version = 2;
-       state.logging_level = DEFAULT_LOGGING_LEVEL;
-       state.listen_port = DEFAULT_GDB_LISTEN_PORT;
-       state.reset = 1;    /* By default, reset board */
-       parse_options(argc, argv, &state);
-       switch (state.stlink_version) {
-       case 2:
-               sl = stlink_open_usb(state.logging_level, 0);
-               if(sl == NULL) return 1;
-               break;
-       case 1:
-               sl = stlink_v1_open(state.logging_level, 0);
-               if(sl == NULL) return 1;
-               break;
+    int32_t voltage;
+
+    stlink_t *sl = NULL;
+
+    st_state_t state;
+    memset(&state, 0, sizeof(state));
+    // set defaults...
+    state.stlink_version = 2;
+    state.logging_level = DEFAULT_LOGGING_LEVEL;
+    state.listen_port = DEFAULT_GDB_LISTEN_PORT;
+    state.reset = 1;    /* By default, reset board */
+    parse_options(argc, argv, &state);
+    switch (state.stlink_version) {
+        case 2:
+            sl = stlink_open_usb(state.logging_level, state.reset, NULL);
+            if(sl == NULL) return 1;
+            break;
+        case 1:
+            sl = stlink_v1_open(state.logging_level, state.reset);
+            if(sl == NULL) return 1;
+            break;
     }
 
     connected_stlink = sl;
-#ifndef __MINGW32__
     signal(SIGINT, &cleanup);
     signal(SIGTERM, &cleanup);
-#endif
+    signal(SIGSEGV, &cleanup);
 
     if (state.reset) {
-               stlink_reset(sl);
+        stlink_reset(sl);
     }
 
-       printf("Chip ID is %08x, Core ID is  %08x.\n", sl->chip_id, sl->core_id);
+    ILOG("Chip ID is %08x, Core ID is  %08x.\n", sl->chip_id, sl->core_id);
 
-       voltage = stlink_target_voltage(sl);
-       if (voltage != -1) {
-               printf("Target voltage is %d mV.\n", voltage);
-       }
+    voltage = stlink_target_voltage(sl);
+    if (voltage != -1) {
+        ILOG("Target voltage is %d mV.\n", voltage);
+    }
 
-       sl->verbose=0;
+    sl->verbose=0;
 
-       current_memory_map = make_memory_map(sl);
+    current_memory_map = make_memory_map(sl);
 
 #ifdef __MINGW32__
-       WSADATA wsadata;
-       if (WSAStartup(MAKEWORD(2,2),&wsadata) !=0 ) {
-               goto winsock_error;
-       }
+    WSADATA    wsadata;
+    if (WSAStartup(MAKEWORD(2,2),&wsadata) !=0 ) {
+        goto winsock_error;
+    }
 #endif
 
-       do {
-               serve(sl, &state);
+    init_cache(sl);
+
+    do {
+        if (serve(sl, &state)) {
+         sleep (1); // don't go bezurk if serve returns with error
+       }
 
-               /* Continue */
-               stlink_run(sl);
-       } while (state.persistent);
+        /* Continue */
+        stlink_run(sl);
+    } while (state.persistent);
 
 #ifdef __MINGW32__
 winsock_error:
-       WSACleanup();
+    WSACleanup();
 #endif
 
-       /* Switch back to mass storage mode before closing. */
-       stlink_exit_debug_mode(sl);
-       stlink_close(sl);
+    /* Switch back to mass storage mode before closing. */
+    stlink_exit_debug_mode(sl);
+    stlink_close(sl);
 
-       return 0;
+    return 0;
 }
 
 static const char* const target_description_F4 =
@@ -310,59 +298,165 @@ static const char* const target_description_F4 =
     "</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=\"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>"
-  "  <memory type=\"flash\" start=\"0x08010000\" length=\"0x10000\">"          //Sector 4
-  "    <property name=\"blocksize\">0x10000</property>"                                                //64kB
-  "  </memory>"
-  "  <memory type=\"flash\" start=\"0x08020000\" length=\"0x70000\">"          //Sectors 5..11
-  "    <property name=\"blocksize\">0x20000</property>"                                                //128kB
-  "  </memory>"
-  "  <memory type=\"ram\" start=\"0x40000000\" length=\"0x1fffffff\"/>"        // peripheral regs
-  "  <memory type=\"ram\" start=\"0xe0000000\" length=\"0x1fffffff\"/>"        // cortex regs
-  "  <memory type=\"rom\" start=\"0x1fff0000\" length=\"0x7800\"/>"         // bootrom
-  "  <memory type=\"rom\" start=\"0x1fffc000\" length=\"0x10\"/>"              // option byte area
-  "</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 = sram, bootrom or flash; flash is bigger
+    "  <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>"
+    "  <memory type=\"flash\" start=\"0x08010000\" length=\"0x10000\">"     //Sector 4
+    "    <property name=\"blocksize\">0x10000</property>"                   //64kB
+    "  </memory>"
+    "  <memory type=\"flash\" start=\"0x08020000\" length=\"0xE0000\">"     //Sectors 5..11
+    "    <property name=\"blocksize\">0x20000</property>"                   //128kB
+    "  </memory>"
+    "  <memory type=\"ram\" start=\"0x40000000\" length=\"0x1fffffff\"/>"   // peripheral regs
+    "  <memory type=\"ram\" start=\"0x60000000\" length=\"0x7fffffff\"/>"   // AHB3 Peripherals
+    "  <memory type=\"ram\" start=\"0xe0000000\" length=\"0x1fffffff\"/>"   // cortex regs
+    "  <memory type=\"rom\" start=\"0x1fff0000\" length=\"0x7800\"/>"       // bootrom
+    "  <memory type=\"rom\" start=\"0x1fffc000\" length=\"0x10\"/>"         // option byte area
+    "</memory-map>";
+
+static const char* const memory_map_template_F4_HD =
+    "<?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=\"0x10000000\" length=\"0x10000\"/>"      // ccm ram
+    "  <memory type=\"ram\" start=\"0x20000000\" length=\"0x40000\"/>"      // sram
+    "  <memory type=\"ram\" start=\"0x60000000\" length=\"0x10000000\"/>"   // fmc bank 1 (nor/psram/sram)
+    "  <memory type=\"ram\" start=\"0x70000000\" length=\"0x20000000\"/>"   // fmc bank 2 & 3 (nand flash)
+    "  <memory type=\"ram\" start=\"0x90000000\" length=\"0x10000000\"/>"   // fmc bank 4 (pc card)
+    "  <memory type=\"ram\" start=\"0xC0000000\" length=\"0x20000000\"/>"   // fmc sdram bank 1 & 2
+    "  <memory type=\"flash\" start=\"0x08000000\" length=\"0x10000\">"     //Sectors 0..3
+    "    <property name=\"blocksize\">0x4000</property>"                    //16kB
+    "  </memory>"
+    "  <memory type=\"flash\" start=\"0x08010000\" length=\"0x10000\">"     //Sector 4
+    "    <property name=\"blocksize\">0x10000</property>"                   //64kB
+    "  </memory>"
+    "  <memory type=\"flash\" start=\"0x08020000\" length=\"0xE0000\">"     //Sectors 5..11
+    "    <property name=\"blocksize\">0x20000</property>"                   //128kB
+    "  </memory>"
+    "  <memory type=\"ram\" start=\"0x40000000\" length=\"0x1fffffff\"/>"   // peripheral regs
+    "  <memory type=\"ram\" start=\"0xe0000000\" length=\"0x1fffffff\"/>"   // cortex regs
+    "  <memory type=\"rom\" start=\"0x1fff0000\" length=\"0x7800\"/>"       // bootrom
+    "  <memory type=\"rom\" start=\"0x1fffc000\" length=\"0x10\"/>"         // option byte area
+    "</memory-map>";
+
+static const char* const memory_map_template_F2 =
+    "<?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=\"0x%zx\"/>"        // code = sram, bootrom or flash; flash is bigger
+    "  <memory type=\"ram\" start=\"0x20000000\" length=\"0x%zx\"/>"        // sram
+    "  <memory type=\"flash\" start=\"0x08000000\" length=\"0x10000\">"     //Sectors 0..3
+    "    <property name=\"blocksize\">0x4000</property>"                    //16kB
+    "  </memory>"
+    "  <memory type=\"flash\" start=\"0x08010000\" length=\"0x10000\">"     //Sector 4
+    "    <property name=\"blocksize\">0x10000</property>"                   //64kB
+    "  </memory>"
+    "  <memory type=\"flash\" start=\"0x08020000\" length=\"0x%zx\">"       //Sectors 5..
+    "    <property name=\"blocksize\">0x20000</property>"                   //128kB
+    "  </memory>"
+    "  <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=\"0x1fffc000\" length=\"0x10\"/>"         // option byte area
+    "</memory-map>";
+
+static const char* const memory_map_template_L4 =
+    "<?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=\"0x%zx\"/>"        // code = sram, bootrom or flash; flash is bigger
+    "  <memory type=\"ram\" start=\"0x10000000\" length=\"0x8000\"/>"       // SRAM2 (32 KB)
+    "  <memory type=\"ram\" start=\"0x20000000\" length=\"0x18000\"/>"      // SRAM1 (96 KB)
+    "  <memory type=\"flash\" start=\"0x08000000\" length=\"0x%zx\">"
+    "    <property name=\"blocksize\">0x800</property>"
+    "  </memory>"
+    "  <memory type=\"ram\" start=\"0x40000000\" length=\"0x1fffffff\"/>"   // peripheral regs
+    "  <memory type=\"ram\" start=\"0x60000000\" length=\"0x7fffffff\"/>"   // AHB3 Peripherals
+    "  <memory type=\"ram\" start=\"0xe0000000\" length=\"0x1fffffff\"/>"   // cortex regs
+    "  <memory type=\"rom\" start=\"0x1fff0000\" length=\"0x7000\"/>"       // bootrom
+    "  <memory type=\"rom\" start=\"0x1fff7800\" length=\"0x10\"/>"         // option byte area
+    "  <memory type=\"rom\" start=\"0x1ffff800\" length=\"0x10\"/>"         // option byte area
+    "</memory-map>";
 
 static const char* const memory_map_template =
-  "<?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=\"0x%zx\"/>"       // code = sram, bootrom or flash; flash is bigger
-  "  <memory type=\"ram\" start=\"0x20000000\" length=\"0x%zx\"/>"       // sram 8k
-  "  <memory type=\"flash\" start=\"0x08000000\" length=\"0x%zx\">"
-  "    <property name=\"blocksize\">0x%zx</property>"
-  "  </memory>"
-  "  <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=\"0x10\"/>"        // option byte area
-  "</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=\"0x%zx\"/>"        // code = sram, bootrom or flash; flash is bigger
+    "  <memory type=\"ram\" start=\"0x20000000\" length=\"0x%zx\"/>"        // sram 8k
+    "  <memory type=\"flash\" start=\"0x08000000\" length=\"0x%zx\">"
+    "    <property name=\"blocksize\">0x%zx</property>"
+    "  </memory>"
+    "  <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=\"0x10\"/>"         // option byte area
+    "</memory-map>";
+
+static const char* const memory_map_template_F7 =
+    "<?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=\"ram\" start=\"0x00000000\" length=\"0x4000\"/>"       // ITCM ram 16kB
+    "  <memory type=\"rom\" start=\"0x00200000\" length=\"0x100000\"/>"     // ITCM flash
+    "  <memory type=\"ram\" start=\"0x20000000\" length=\"0x50000\"/>"      // sram
+    "  <memory type=\"flash\" start=\"0x08000000\" length=\"0x20000\">"     // Sectors 0..3
+    "    <property name=\"blocksize\">0x8000</property>"                    // 32kB
+    "  </memory>"
+    "  <memory type=\"flash\" start=\"0x08020000\" length=\"0x20000\">"     // Sector 4
+    "    <property name=\"blocksize\">0x20000</property>"                   // 128kB
+    "  </memory>"
+    "  <memory type=\"flash\" start=\"0x08040000\" length=\"0xC0000\">"     // Sectors 5..7
+    "    <property name=\"blocksize\">0x40000</property>"                   // 128kB
+    "  </memory>"
+    "  <memory type=\"ram\" start=\"0x40000000\" length=\"0x1fffffff\"/>"   // peripheral regs
+    "  <memory type=\"ram\" start=\"0x60000000\" length=\"0x7fffffff\"/>"   // AHB3 Peripherals
+    "  <memory type=\"ram\" start=\"0xe0000000\" length=\"0x1fffffff\"/>"   // cortex regs
+    "  <memory type=\"rom\" start=\"0x00100000\" length=\"0xEDC0\"/>"       // bootrom
+    "  <memory type=\"rom\" start=\"0x1fff0000\" length=\"0x20\"/>"         // option byte area
+    "</memory-map>";
 
 char* make_memory_map(stlink_t *sl) {
-       /* This will be freed in serve() */
-       char* map = malloc(4096);
-       map[0] = '\0';
-
-       if(sl->chip_id==STM32_CHIPID_F4) {
-       strcpy(map, memory_map_template_F4);
+    /* This will be freed in serve() */
+    char* map = malloc(4096);
+    map[0] = '\0';
+
+    if(sl->chip_id==STM32_CHIPID_F4 || sl->chip_id==STM32_CHIPID_F446) {
+        strcpy(map, memory_map_template_F4);
+    } else if(sl->chip_id==STM32_CHIPID_F4 || sl->chip_id==STM32_CHIPID_F7) {
+        strcpy(map, memory_map_template_F7);
+    } else if(sl->chip_id==STM32_CHIPID_F4_HD) {
+        strcpy(map, memory_map_template_F4_HD);
+    } else if(sl->chip_id==STM32_CHIPID_F2) {
+        snprintf(map, 4096, memory_map_template_F2,
+                sl->flash_size,
+                sl->sram_size,
+                sl->flash_size - 0x20000,
+                sl->sys_base, sl->sys_size);
+    } else if(sl->chip_id==STM32_CHIPID_L4) {
+        snprintf(map, 4096, memory_map_template_L4,
+                sl->flash_size, sl->flash_size);
     } else {
         snprintf(map, 4096, memory_map_template,
-                       sl->flash_size,
-                       sl->sram_size,
-                       sl->flash_size, sl->flash_pgsz,
-                       sl->sys_base, sl->sys_size);
+                sl->flash_size,
+                sl->sram_size,
+                sl->flash_size, sl->flash_pgsz,
+                sl->sys_base, sl->sys_size);
     }
-       return map;
+    return map;
 }
 
 
@@ -386,910 +480,1076 @@ char* make_memory_map(stlink_t *sl) {
 enum watchfun { WATCHDISABLED = 0, WATCHREAD = 5, WATCHWRITE = 6, WATCHACCESS = 7 };
 
 struct code_hw_watchpoint {
-       stm32_addr_t addr;
-       uint8_t mask;
-       enum watchfun fun;
+    stm32_addr_t addr;
+    uint8_t mask;
+    enum watchfun fun;
 };
 
 struct code_hw_watchpoint data_watches[DATA_WATCH_NUM];
 
 static void init_data_watchpoints(stlink_t *sl) {
-       #if DEBUG
-       printf("init watchpoints\n");
-       #endif
-
-       // set trcena in debug command to turn on dwt unit
-       stlink_write_debug32(sl, 0xE000EDFC,
-                            stlink_read_debug32(sl, 0xE000EDFC) | (1<<24));
-
-       // make sure all watchpoints are cleared
-       for(int i = 0; i < DATA_WATCH_NUM; i++) {
-               data_watches[i].fun = WATCHDISABLED;
-               stlink_write_debug32(sl, 0xe0001028 + i * 16, 0);
-       }
+    uint32_t data;
+    DLOG("init watchpoints\n");
+
+    stlink_read_debug32(sl, 0xE000EDFC, &data);
+    data |= 1<<24;
+    // set trcena in debug command to turn on dwt unit
+    stlink_write_debug32(sl, 0xE000EDFC, data);
+
+    // make sure all watchpoints are cleared
+    for(int i = 0; i < DATA_WATCH_NUM; i++) {
+        data_watches[i].fun = WATCHDISABLED;
+        stlink_write_debug32(sl, 0xe0001028 + i * 16, 0);
+    }
 }
 
-static int add_data_watchpoint(stlink_t *sl, enum watchfun wf, stm32_addr_t addr, unsigned int len)
-{
-       int i = 0;
-       uint32_t mask;
-
-       // computer mask
-       // find a free watchpoint
-       // configure
-
-       mask = -1;
-       i = len;
-       while(i) {
-               i >>= 1;
-               mask++;
-       }
+static int add_data_watchpoint(stlink_t *sl, enum watchfun wf,
+                               stm32_addr_t addr, unsigned int len) {
+    int i = 0;
+    uint32_t mask, dummy;
 
-       if((mask != (uint32_t)-1) && (mask < 16)) {
-               for(i = 0; i < DATA_WATCH_NUM; i++) {
-                       // is this an empty slot ?
-                       if(data_watches[i].fun == WATCHDISABLED) {
-                               #if DEBUG
-                               printf("insert watchpoint %d addr %x wf %u mask %u len %d\n", i, addr, wf, mask, len);
-                               #endif
+    // computer mask
+    // find a free watchpoint
+    // configure
 
-                               data_watches[i].fun = wf;
-                               data_watches[i].addr = addr;
-                               data_watches[i].mask = mask;
+    mask = -1;
+    i = len;
+    while(i) {
+        i >>= 1;
+        mask++;
+    }
 
-                               // insert comparator address
-                               stlink_write_debug32(sl, 0xE0001020 + i * 16, addr);
+    if((mask != (uint32_t)-1) && (mask < 16)) {
+        for(i = 0; i < DATA_WATCH_NUM; i++) {
+            // is this an empty slot ?
+            if(data_watches[i].fun == WATCHDISABLED) {
+                DLOG("insert watchpoint %d addr %x wf %u mask %u len %d\n", i, addr, wf, mask, len);
 
-                               // insert mask
-                               stlink_write_debug32(sl, 0xE0001024 + i * 16, mask);
+                data_watches[i].fun = wf;
+                data_watches[i].addr = addr;
+                data_watches[i].mask = mask;
 
-                               // insert function
-                               stlink_write_debug32(sl, 0xE0001028 + i * 16, wf);
+                // insert comparator address
+                stlink_write_debug32(sl, 0xE0001020 + i * 16, addr);
 
-                               // just to make sure the matched bit is clear !
-                               stlink_read_debug32(sl,  0xE0001028 + i * 16);
-                               return 0;
-                       }
-               }
-       }
+                // insert mask
+                stlink_write_debug32(sl, 0xE0001024 + i * 16, mask);
+
+                // insert function
+                stlink_write_debug32(sl, 0xE0001028 + i * 16, wf);
 
-       #if DEBUG
-       printf("failure: add watchpoints addr %x wf %u len %u\n", addr, wf, len);
-       #endif
-       return -1;
+                // just to make sure the matched bit is clear !
+                stlink_read_debug32(sl,  0xE0001028 + i * 16, &dummy);
+                return 0;
+            }
+        }
+    }
+
+    DLOG("failure: add watchpoints addr %x wf %u len %u\n", addr, wf, len);
+    return -1;
 }
 
 static int delete_data_watchpoint(stlink_t *sl, stm32_addr_t addr)
 {
-       int i;
+    int i;
 
-       for(i = 0 ; i < DATA_WATCH_NUM; i++) {
-               if((data_watches[i].addr == addr) && (data_watches[i].fun != WATCHDISABLED)) {
-                       #if DEBUG
-                       printf("delete watchpoint %d addr %x\n", i, addr);
-                       #endif
+    for(i = 0 ; i < DATA_WATCH_NUM; i++) {
+        if((data_watches[i].addr == addr) && (data_watches[i].fun != WATCHDISABLED)) {
+            DLOG("delete watchpoint %d addr %x\n", i, addr);
 
-                       data_watches[i].fun = WATCHDISABLED;
-                       stlink_write_debug32(sl, 0xe0001028 + i * 16, 0);
+            data_watches[i].fun = WATCHDISABLED;
+            stlink_write_debug32(sl, 0xe0001028 + i * 16, 0);
 
-                       return 0;
-               }
-       }
+            return 0;
+        }
+    }
 
-       #if DEBUG
-       printf("failure: delete watchpoint addr %x\n", addr);
-       #endif
+    DLOG("failure: delete watchpoint addr %x\n", addr);
 
-       return -1;
+    return -1;
 }
 
-#define CODE_BREAK_NUM 6
+int code_break_num;
+int code_lit_num;
+#define CODE_BREAK_NUM_MAX     15
 #define CODE_BREAK_LOW 0x01
 #define CODE_BREAK_HIGH        0x02
 
 struct code_hw_breakpoint {
-       stm32_addr_t addr;
-       int          type;
+    stm32_addr_t addr;
+    int          type;
 };
 
-struct code_hw_breakpoint code_breaks[CODE_BREAK_NUM];
+struct code_hw_breakpoint code_breaks[CODE_BREAK_NUM_MAX];
 
 static void init_code_breakpoints(stlink_t *sl) {
-       memset(sl->q_buf, 0, 4);
-       stlink_write_debug32(sl, CM3_REG_FP_CTRL, 0x03 /*KEY | ENABLE4*/);
-        printf("KARL - should read back as 0x03, not 60 02 00 00\n");
-        stlink_read_debug32(sl, CM3_REG_FP_CTRL);
-
-       for(int i = 0; i < CODE_BREAK_NUM; i++) {
-               code_breaks[i].type = 0;
-               stlink_write_debug32(sl, CM3_REG_FP_COMP0 + i * 4, 0);
-       }
+    unsigned int val;
+    memset(sl->q_buf, 0, 4);
+    stlink_write_debug32(sl, CM3_REG_FP_CTRL, 0x03 /*KEY | ENABLE4*/);
+    stlink_read_debug32(sl, CM3_REG_FP_CTRL, &val);
+    code_break_num = ((val >> 4) & 0xf);
+    code_lit_num = ((val >> 8) & 0xf);
+
+    ILOG("Found %i hw breakpoint registers\n", code_break_num);
+
+    for(int i = 0; i < code_break_num; i++) {
+        code_breaks[i].type = 0;
+        stlink_write_debug32(sl, CM3_REG_FP_COMP0 + i * 4, 0);
+    }
 }
 
 static int update_code_breakpoint(stlink_t *sl, stm32_addr_t addr, int set) {
-       stm32_addr_t fpb_addr = addr & ~0x3;
-       int type = addr & 0x2 ? CODE_BREAK_HIGH : CODE_BREAK_LOW;
+    stm32_addr_t fpb_addr;
+    uint32_t mask;
+    int type = (addr & 0x2) ? CODE_BREAK_HIGH : CODE_BREAK_LOW;
 
-       if(addr & 1) {
-               fprintf(stderr, "update_code_breakpoint: unaligned address %08x\n", addr);
-               return -1;
-       }
+    if(addr & 1) {
+        ELOG("update_code_breakpoint: unaligned address %08x\n", addr);
+        return -1;
+    }
 
-       int id = -1;
-       for(int i = 0; i < CODE_BREAK_NUM; i++) {
-               if(fpb_addr == code_breaks[i].addr ||
-                       (set && code_breaks[i].type == 0)) {
-                       id = i;
-                       break;
-               }
+       if (sl->chip_id==STM32_CHIPID_F7) {
+               fpb_addr = addr;
+       } else {
+               fpb_addr = addr & ~0x3;
        }
 
-       if(id == -1) {
-               if(set) return -1; // Free slot not found
-               else    return 0;  // Breakpoint is already removed
-       }
+    int id = -1;
+    for(int i = 0; i < code_break_num; i++) {
+        if(fpb_addr == code_breaks[i].addr ||
+                (set && code_breaks[i].type == 0)) {
+            id = i;
+            break;
+        }
+    }
 
-       struct code_hw_breakpoint* brk = &code_breaks[id];
+    if(id == -1) {
+        if(set) return -1; // Free slot not found
+        else   return 0;  // Breakpoint is already removed
+    }
 
-       brk->addr = fpb_addr;
+    struct code_hw_breakpoint* brk = &code_breaks[id];
 
-       if(set) brk->type |= type;
-       else    brk->type &= ~type;
+    brk->addr = fpb_addr;
 
-       if(brk->type == 0) {
-               #if DEBUG
-               printf("clearing hw break %d\n", id);
-               #endif
+       if (sl->chip_id==STM32_CHIPID_F7) {
+               if(set) brk->type = type;
+               else    brk->type = 0;
 
-               stlink_write_debug32(sl, 0xe0002008 + id * 4, 0);
+               mask = (brk->addr) | 1;
        } else {
-               uint32_t mask = (brk->addr) | 1 | (brk->type << 30);
+               if(set) brk->type |= type;
+               else    brk->type &= ~type;
 
-               #if DEBUG
-               printf("setting hw break %d at %08x (%d)\n",
-                       id, brk->addr, brk->type);
-               printf("reg %08x \n",
-                       mask);
-               #endif
-
-               stlink_write_debug32(sl, 0xe0002008 + id * 4, mask);
+               mask = (brk->addr) | 1 | (brk->type << 30);
        }
 
-       return 0;
+    if(brk->type == 0) {
+        DLOG("clearing hw break %d\n", id);
+
+        stlink_write_debug32(sl, 0xe0002008 + id * 4, 0);
+    } else {
+        DLOG("setting hw break %d at %08x (%d)\n",
+                    id, brk->addr, brk->type);
+        DLOG("reg %08x \n",
+                    mask);
+
+        stlink_write_debug32(sl, 0xe0002008 + id * 4, mask);
+    }
+
+    return 0;
 }
 
 
 struct flash_block {
-       stm32_addr_t addr;
-       unsigned     length;
-       uint8_t*     data;
+    stm32_addr_t addr;
+    unsigned     length;
+    uint8_t*     data;
 
-       struct flash_block* next;
+    struct flash_block* next;
 };
 
 static struct flash_block* flash_root;
 
 static int flash_add_block(stm32_addr_t addr, unsigned length, stlink_t *sl) {
 
-       if(addr < FLASH_BASE || addr + length > FLASH_BASE + sl->flash_size) {
-               fprintf(stderr, "flash_add_block: incorrect bounds\n");
-               return -1;
-       }
+    if(addr < FLASH_BASE || addr + length > FLASH_BASE + sl->flash_size) {
+        ELOG("flash_add_block: incorrect bounds\n");
+        return -1;
+    }
 
-       stlink_calculate_pagesize(sl, addr);
-       if(addr % FLASH_PAGE != 0 || length % FLASH_PAGE != 0) {
-               fprintf(stderr, "flash_add_block: unaligned block\n");
-               return -1;
-       }
+    stlink_calculate_pagesize(sl, addr);
+    if(addr % FLASH_PAGE != 0 || length % FLASH_PAGE != 0) {
+        ELOG("flash_add_block: unaligned block\n");
+        return -1;
+    }
 
-       struct flash_block* new = malloc(sizeof(struct flash_block));
-       new->next = flash_root;
+    struct flash_block* new = malloc(sizeof(struct flash_block));
+    new->next = flash_root;
 
-       new->addr   = addr;
-       new->length = length;
-       new->data   = calloc(length, 1);
+    new->addr   = addr;
+    new->length = length;
+    new->data   = calloc(length, 1);
 
-       flash_root = new;
+    flash_root = new;
 
-       return 0;
+    return 0;
 }
 
 static int flash_populate(stm32_addr_t addr, uint8_t* data, unsigned length) {
-       unsigned int fit_blocks = 0, fit_length = 0;
-
-       for(struct flash_block* fb = flash_root; fb; fb = fb->next) {
-               /* Block: ------X------Y--------
-                * Data:            a-----b
-                *                a--b
-                *            a-----------b
-                * Block intersects with data, if:
-                *  a < Y && b > x
-                */
-
-               unsigned X = fb->addr, Y = fb->addr + fb->length;
-               unsigned a = addr, b = addr + length;
-               if(a < Y && b > X) {
-                       // from start of the block
-                       unsigned start = (a > X ? a : X) - X;
-                       unsigned end   = (b > Y ? Y : b) - X;
-
-                       memcpy(fb->data + start, data, end - start);
-
-                       fit_blocks++;
-                       fit_length += end - start;
-               }
-       }
+    unsigned int fit_blocks = 0, fit_length = 0;
+
+    for(struct flash_block* fb = flash_root; fb; fb = fb->next) {
+        /* Block: ------X------Y--------
+         * Data:            a-----b
+         *                a--b
+         *            a-----------b
+         * Block intersects with data, if:
+         *  a < Y && b > x
+         */
+
+        unsigned X = fb->addr, Y = fb->addr + fb->length;
+        unsigned a = addr, b = addr + length;
+        if(a < Y && b > X) {
+            // from start of the block
+            unsigned start = (a > X ? a : X) - X;
+            unsigned end   = (b > Y ? Y : b) - X;
+
+            memcpy(fb->data + start, data, end - start);
+
+            fit_blocks++;
+            fit_length += end - start;
+        }
+    }
 
-       if(fit_blocks == 0) {
-               fprintf(stderr, "Unfit data block %08x -> %04x\n", addr, length);
-               return -1;
-       }
+    if(fit_blocks == 0) {
+        ELOG("Unfit data block %08x -> %04x\n", addr, length);
+        return -1;
+    }
 
-       if(fit_length != length) {
-               fprintf(stderr, "warning: data block %08x -> %04x truncated to %04x\n",
-                       addr, length, fit_length);
-               fprintf(stderr, "(this is not an error, just a GDB glitch)\n");
-       }
+    if(fit_length != length) {
+        WLOG("data block %08x -> %04x truncated to %04x\n",
+                addr, length, fit_length);
+        WLOG("(this is not an error, just a GDB glitch)\n");
+    }
 
-       return 0;
+    return 0;
 }
 
 static int flash_go(stlink_t *sl) {
-       int error = -1;
-
-       // Some kinds of clock settings do not allow writing to flash.
-       stlink_reset(sl);
+    int error = -1;
 
-       for(struct flash_block* fb = flash_root; fb; fb = fb->next) {
-               #if DEBUG
-               printf("flash_do: block %08x -> %04x\n", fb->addr, fb->length);
-               #endif
+    // Some kinds of clock settings do not allow writing to flash.
+    stlink_reset(sl);
+    stlink_force_debug(sl);
 
-               unsigned length = fb->length;
-               for(stm32_addr_t page = fb->addr; page < fb->addr + fb->length; page += FLASH_PAGE) {
+    for(struct flash_block* fb = flash_root; fb; fb = fb->next) {
+        DLOG("flash_do: block %08x -> %04x\n", fb->addr, fb->length);
 
-                       //Update FLASH_PAGE
-                       stlink_calculate_pagesize(sl, page);
+        for(stm32_addr_t page = fb->addr; page < fb->addr + fb->length; page += FLASH_PAGE) {
+            unsigned length = fb->length - (page - fb->addr);
 
-                       #if DEBUG
-                       printf("flash_do: page %08x\n", page);
-                       #endif
+            //Update FLASH_PAGE
+            stlink_calculate_pagesize(sl, page);
 
-                       if(stlink_write_flash(sl, page, fb->data + (page - fb->addr),
-                                       length > FLASH_PAGE ? FLASH_PAGE : length) < 0)
-                               goto error;
-                       }
-       }
+            DLOG("flash_do: page %08x\n", page);
+            unsigned send = length > FLASH_PAGE ? FLASH_PAGE : length;
+            if(stlink_write_flash(sl, page, fb->data + (page - fb->addr),
+                        send, 0) < 0)
+                goto error;
+            length -= send;
+            
+        }
+    }
 
-       stlink_reset(sl);
+    stlink_reset(sl);
 
-       error = 0;
+    error = 0;
 
 error:
-       for(struct flash_block* fb = flash_root, *next; fb; fb = next) {
-               next = fb->next;
-               free(fb->data);
-               free(fb);
-       }
+    for(struct flash_block* fb = flash_root, *next; fb; fb = next) {
+        next = fb->next;
+        free(fb->data);
+        free(fb);
+    }
 
-       flash_root = NULL;
+    flash_root = NULL;
 
-       return error;
+    return error;
 }
 
-int serve(stlink_t *sl, st_state_t *st) {
-       int sock = socket(AF_INET, SOCK_STREAM, 0);
-       if(sock < 0) {
-               perror("socket");
-               return 1;
-       }
+#define CLIDR   0xE000ED78
+#define CTR     0xE000ED7C
+#define CCSIDR  0xE000ED80
+#define CSSELR  0xE000ED84
+#define CCR     0xE000ED14
+#define CCR_DC  (1 << 16)
+#define CCR_IC  (1 << 17)
+#define DCCSW   0xE000EF6C
+#define ICIALLU 0xE000EF50
+
+struct cache_level_desc
+{
+  unsigned int nsets;
+  unsigned int nways;
+  unsigned int log2_nways;
+  unsigned int width;
+};
 
-       unsigned int val = 1;
-       setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *)&val, sizeof(val));
+struct cache_desc_t
+{
+  /* Minimal line size in bytes.  */
+  unsigned int dminline;
+  unsigned int iminline;
 
-       struct sockaddr_in serv_addr;
-       memset(&serv_addr,0,sizeof(struct sockaddr_in));
-       serv_addr.sin_family = AF_INET;
-       serv_addr.sin_addr.s_addr = INADDR_ANY;
-       serv_addr.sin_port = htons(st->listen_port);
+  /* Last level of unification (uniprocessor).  */
+  unsigned int louu;
 
-       if(bind(sock, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0) {
-               perror("bind");
-               return 1;
+  struct cache_level_desc icache[7];
+  struct cache_level_desc dcache[7];
+};
+
+static struct cache_desc_t cache_desc;
+
+/* Return the smallest R so that V <= (1 << R).  Not performance critical.  */
+static unsigned ceil_log2(unsigned v)
+{
+  unsigned res;
+  for (res = 0; (1U << res) < v; res++)
+    ;
+  return res;
+}
+
+static void read_cache_level_desc(stlink_t *sl, struct cache_level_desc *desc)
+{
+  unsigned int ccsidr;
+  unsigned int log2_nsets;
+
+  stlink_read_debug32(sl, CCSIDR, &ccsidr);
+  desc->nsets = ((ccsidr >> 13) & 0x3fff) + 1;
+  desc->nways = ((ccsidr >> 3) & 0x1ff) + 1;
+  desc->log2_nways = ceil_log2 (desc->nways);
+  log2_nsets = ceil_log2 (desc->nsets);
+  desc->width = 4 + (ccsidr & 7) + log2_nsets;
+  ILOG("%08x LineSize: %u, ways: %u, sets: %u (width: %u)\n",
+       ccsidr, 4 << (ccsidr & 7), desc->nways, desc->nsets, desc->width);
+}
+
+static void init_cache (stlink_t *sl) {
+  unsigned int clidr;
+  unsigned int ccr;
+  unsigned int ctr;
+  int i;
+
+  /* Assume only F7 has a cache.  */
+  if(sl->chip_id!=STM32_CHIPID_F7)
+    return;
+
+  stlink_read_debug32(sl, CLIDR, &clidr);
+  stlink_read_debug32(sl, CCR, &ccr);
+  stlink_read_debug32(sl, CTR, &ctr);
+  cache_desc.dminline = 4 << ((ctr >> 16) & 0x0f);
+  cache_desc.iminline = 4 << (ctr & 0x0f);
+  cache_desc.louu = (clidr >> 27) & 7;
+
+  ILOG("Chip clidr: %08x, I-Cache: %s, D-Cache: %s\n",
+       clidr, ccr & CCR_IC ? "on" : "off", ccr & CCR_DC ? "on" : "off");
+  ILOG(" cache: LoUU: %u, LoC: %u, LoUIS: %u\n",
+       (clidr >> 27) & 7, (clidr >> 24) & 7, (clidr >> 21) & 7);
+  ILOG(" cache: ctr: %08x, DminLine: %u bytes, IminLine: %u bytes\n", ctr,
+       cache_desc.dminline, cache_desc.iminline);
+  for(i = 0; i < 7; i++)
+    {
+      unsigned int ct = (clidr >> (3 * i)) & 0x07;
+
+      cache_desc.dcache[i].width = 0;
+      cache_desc.icache[i].width = 0;
+
+      if(ct == 2 || ct == 3 || ct == 4)
+       {
+         /* Data.  */
+         stlink_write_debug32(sl, CSSELR, i << 1);
+         ILOG("D-Cache L%d: ", i);
+         read_cache_level_desc(sl, &cache_desc.dcache[i]);
        }
 
-       if(listen(sock, 5) < 0) {
-               perror("listen");
-               return 1;
+      if(ct == 1 || ct == 3)
+       {
+         /* Instruction.  */
+         stlink_write_debug32(sl, CSSELR, (i << 1) | 1);
+         ILOG("I-Cache L%d: ", i);
+         read_cache_level_desc(sl, &cache_desc.icache[i]);
        }
+    }
+}
 
-       printf("Listening at *:%d...\n", st->listen_port);
+static void cache_flush(stlink_t *sl, unsigned ccr) {
+  int level;
+
+  if (ccr & CCR_DC)
+    for (level = cache_desc.louu - 1; level >= 0; level--)
+      {
+       struct cache_level_desc *desc = &cache_desc.dcache[level];
+       unsigned addr;
+       unsigned max_addr = 1 << desc->width;
+       unsigned way_sh = 32 - desc->log2_nways;
+
+       /* D-cache clean by set-ways.  */
+       for (addr = (level << 1); addr < max_addr; addr += cache_desc.dminline)
+         {
+           unsigned int way;
+
+           for (way = 0; way < desc->nways; way++)
+             stlink_write_debug32(sl, DCCSW, addr | (way << way_sh));
+         }
+      }
+
+  /* Invalidate all I-cache to oPU.  */
+  if (ccr & CCR_IC)
+    stlink_write_debug32(sl, ICIALLU, 0);
+}
 
-       int client = accept(sock, NULL, NULL);
-       //signal (SIGINT, SIG_DFL);
-       if(client < 0) {
-               perror("accept");
-               return 1;
-       }
+static int cache_modified;
 
-       close(sock);
+static void cache_change(stm32_addr_t start, unsigned count)
+{
+  if (count == 0)
+    return;
+  (void)start;
+  cache_modified = 1;
+}
+
+static void cache_sync(stlink_t *sl)
+{
+  unsigned ccr;
+
+  if(sl->chip_id!=STM32_CHIPID_F7)
+    return;
+  if (!cache_modified)
+    return;
+  cache_modified = 0;
+
+  stlink_read_debug32(sl, CCR, &ccr);
+  if (ccr & (CCR_IC | CCR_DC))
+    cache_flush(sl, ccr);
+}
+
+int serve(stlink_t *sl, st_state_t *st) {
+    int sock = socket(AF_INET, SOCK_STREAM, 0);
+    if(sock < 0) {
+        perror("socket");
+        return 1;
+    }
+
+    unsigned int val = 1;
+    setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *)&val, sizeof(val));
+
+    struct sockaddr_in serv_addr;
+    memset(&serv_addr,0,sizeof(struct sockaddr_in));
+    serv_addr.sin_family = AF_INET;
+    serv_addr.sin_addr.s_addr = INADDR_ANY;
+    serv_addr.sin_port = htons(st->listen_port);
+
+    if(bind(sock, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0) {
+        perror("bind");
+        return 1;
+    }
+
+    if(listen(sock, 5) < 0) {
+        perror("listen");
+        return 1;
+    }
+
+    ILOG("Listening at *:%d...\n", st->listen_port);
 
-       stlink_force_debug(sl);
-       if (st->reset) {
-               stlink_reset(sl);
+    int client = accept(sock, NULL, NULL);
+    //signal (SIGINT, SIG_DFL);
+    if(client < 0) {
+        perror("accept");
+        return 1;
     }
-       init_code_breakpoints(sl);
-       init_data_watchpoints(sl);
-
-       printf("GDB connected.\n");
-
-       /*
-        * To allow resetting the chip from GDB it is required to
-        * emulate attaching and detaching to target.
-        */
-       unsigned int attached = 1;
-
-       while(1) {
-               char* packet;
-
-               int status = gdb_recv_packet(client, &packet);
-               if(status < 0) {
-                       fprintf(stderr, "cannot recv: %d\n", status);
-                       return 1;
-               }
-
-               #if DEBUG
-               printf("recv: %s\n", packet);
-               #endif
-
-               char* reply = NULL;
-                reg regp;
-
-               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);
-
-                       #if DEBUG
-                       printf("query: %s;%s\n", queryName, params);
-                       #endif
-
-                       if(!strcmp(queryName, "Supported")) {
-                if(sl->chip_id==STM32_CHIPID_F4) {
-                    reply = strdup("PacketSize=3fff;qXfer:memory-map:read+;qXfer:features:read+");
+
+    close(sock);
+
+    stlink_force_debug(sl);
+    if (st->reset) {
+        stlink_reset(sl);
+    }
+    init_code_breakpoints(sl);
+    init_data_watchpoints(sl);
+
+    ILOG("GDB connected.\n");
+
+    /*
+     * To allow resetting the chip from GDB it is required to
+     * emulate attaching and detaching to target.
+     */
+    unsigned int attached = 1;
+
+    while(1) {
+        char* packet;
+
+        int status = gdb_recv_packet(client, &packet);
+        if(status < 0) {
+            ELOG("cannot recv: %d\n", status);
+#ifdef __MINGW32__
+            win32_close_socket(sock);
+#endif
+            return 1;
+        }
+
+        DLOG("recv: %s\n", packet);
+
+        char* reply = NULL;
+        reg regp;
+
+        switch(packet[0]) {
+            case 'q': {
+                if(packet[1] == 'P' || packet[1] == 'C' || packet[1] == 'L') {
+                    reply = strdup("");
+                    break;
                 }
-                else {
-                    reply = strdup("PacketSize=3fff;qXfer:memory-map:read+");
+
+                char *separator = strstr(packet, ":"), *params = "";
+                if(separator == NULL) {
+                    separator = packet + strlen(packet);
+                } else {
+                    params = separator + 1;
                 }
-                       } else if(!strcmp(queryName, "Xfer")) {
-                               char *type, *op, *__s_addr, *s_length;
-                               char *tok = params;
-                               char *annex __attribute__((unused));
-
-                               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);
-
-                               #if 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 = 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)
-                                               length = data_length - addr;
-
-                                       if(length == 0) {
-                                               reply = strdup("l");
-                                       } else {
-                                               reply = calloc(length + 2, 1);
-                                               reply[0] = 'm';
-                                               strncpy(&reply[1], data, length);
-                                       }
-                               }
-                       } else if(!strncmp(queryName, "Rcmd,",4)) {
-                               // Rcmd uses the wrong separator
-                               char *separator = strstr(packet, ","), *params = "";
-                               if(separator == NULL) {
-                                       separator = packet + strlen(packet);
-                               } else {
-                                       params = separator + 1;
-                               }
-
-
-                               if (!strncmp(params,"726573756d65",12)) {// resume
-#if DEBUG
-                                       printf("Rcmd: resume\n");
-#endif
-                                       stlink_run(sl);
 
-                                       reply = strdup("OK");
-                } else if (!strncmp(params,"68616c74",8)) { //halt
-                                       reply = strdup("OK");
+                unsigned queryNameLength = (separator - &packet[1]);
+                char* queryName = calloc(queryNameLength + 1, 1);
+                strncpy(queryName, &packet[1], queryNameLength);
 
-                                       stlink_force_debug(sl);
+                DLOG("query: %s;%s\n", queryName, params);
 
-#if DEBUG
-                                       printf("Rcmd: halt\n");
-#endif
-                } else if (!strncmp(params,"6a7461675f7265736574",20)) { //jtag_reset
-                                       reply = strdup("OK");
+                if(!strcmp(queryName, "Supported")) {
+                    if(sl->chip_id==STM32_CHIPID_F4
+                      || sl->chip_id==STM32_CHIPID_F4_HD
+                      || sl->chip_id==STM32_CHIPID_F7) {
+                        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;
+                    char *annex __attribute__((unused));
+
+                    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);
+
+                    DLOG("Xfer: type:%s;op:%s;annex:%s;addr:%d;length:%d\n",
+                                type, op, annex, addr, length);
+
+                    const char* data = NULL;
+
+                    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)
+                            length = data_length - addr;
+
+                        if(length == 0) {
+                            reply = strdup("l");
+                        } else {
+                            reply = calloc(length + 2, 1);
+                            reply[0] = 'm';
+                            strncpy(&reply[1], data, length);
+                        }
+                    }
+                } else if(!strncmp(queryName, "Rcmd,",4)) {
+                    // Rcmd uses the wrong separator
+                    char *separator = strstr(packet, ","), *params = "";
+                    if(separator == NULL) {
+                        separator = packet + strlen(packet);
+                    } else {
+                        params = separator + 1;
+                    }
 
-                                       stlink_jtag_reset(sl, 1);
-                                       stlink_jtag_reset(sl, 0);
-                                       stlink_force_debug(sl);
 
-#if DEBUG
-                                       printf("Rcmd: jtag_reset\n");
-#endif
-                } else if (!strncmp(params,"7265736574",10)) { //reset
-                                       reply = strdup("OK");
+                    if (!strncmp(params,"726573756d65",12)) {// resume
+                        DLOG("Rcmd: resume\n");
+                        cache_sync(sl);
+                        stlink_run(sl);
 
-                                       stlink_force_debug(sl);
-                                       stlink_reset(sl);
-                                       init_code_breakpoints(sl);
-                                       init_data_watchpoints(sl);
+                        reply = strdup("OK");
+                    } else if (!strncmp(params,"68616c74",8)) { //halt
+                        reply = strdup("OK");
 
-#if DEBUG
-                                       printf("Rcmd: reset\n");
-#endif
-                               } else {
-#if DEBUG
-                                       printf("Rcmd: %s\n", params);
-#endif
+                        stlink_force_debug(sl);
+
+                        DLOG("Rcmd: halt\n");
+                    } else if (!strncmp(params,"6a7461675f7265736574",20)) { //jtag_reset
+                        reply = strdup("OK");
+
+                        stlink_jtag_reset(sl, 0);
+                        stlink_jtag_reset(sl, 1);
+                        stlink_force_debug(sl);
+
+                        DLOG("Rcmd: jtag_reset\n");
+                    } 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);
+
+                        DLOG("Rcmd: reset\n");
+                    } else {
+                        DLOG("Rcmd: %s\n", params);
+                    }
+
+                }
+
+                if(reply == NULL)
+                    reply = strdup("");
+
+                free(queryName);
+
+                break;
+            }
+
+            case 'v': {
+                char *params = NULL;
+                char *cmdName = strtok_r(packet, ":;", &params);
+
+                cmdName++; // vCommand -> Command
+
+                if(!strcmp(cmdName, "FlashErase")) {
+                    char *__s_addr, *s_length;
+                    char *tok = params;
+
+                    __s_addr   = strsep(&tok, ",");
+                    s_length = tok;
+
+                    unsigned addr = strtoul(__s_addr, NULL, 16),
+                             length = strtoul(s_length, NULL, 16);
+
+                    DLOG("FlashErase: addr:%08x,len:%04x\n",
+                                addr, length);
+
+                    if(flash_add_block(addr, length, sl) < 0) {
+                        reply = strdup("E00");
+                    } else {
+                        reply = strdup("OK");
+                    }
+                } else if(!strcmp(cmdName, "FlashWrite")) {
+                    char *__s_addr, *data;
+                    char *tok = params;
+
+                    __s_addr = strsep(&tok, ":");
+                    data   = tok;
+
+                    unsigned addr = strtoul(__s_addr, NULL, 16);
+                    unsigned data_length = status - (data - packet);
+
+                    // Length of decoded data cannot be more than
+                    // encoded, as escapes are removed.
+                    // Additional byte is reserved for alignment fix.
+                    uint8_t *decoded = calloc(data_length + 1, 1);
+                    unsigned dec_index = 0;
+                    for(unsigned int i = 0; i < data_length; i++) {
+                        if(data[i] == 0x7d) {
+                            i++;
+                            decoded[dec_index++] = data[i] ^ 0x20;
+                        } else {
+                            decoded[dec_index++] = data[i];
+                        }
+                    }
+
+                    // Fix alignment
+                    if(dec_index % 2 != 0)
+                        dec_index++;
 
-                               }
-
-                       }
-
-                       if(reply == NULL)
-                               reply = strdup("");
-
-                       free(queryName);
-
-                       break;
-               }
-
-               case 'v': {
-                       char *params = NULL;
-                       char *cmdName = strtok_r(packet, ":;", &params);
-
-                       cmdName++; // vCommand -> Command
-
-                       if(!strcmp(cmdName, "FlashErase")) {
-                               char *__s_addr, *s_length;
-                               char *tok = params;
-
-                               __s_addr   = strsep(&tok, ",");
-                               s_length = tok;
-
-                               unsigned addr = strtoul(__s_addr, NULL, 16),
-                                      length = strtoul(s_length, NULL, 16);
-
-                               #if DEBUG
-                               printf("FlashErase: addr:%08x,len:%04x\n",
-                                       addr, length);
-                               #endif
-
-                               if(flash_add_block(addr, length, sl) < 0) {
-                                       reply = strdup("E00");
-                               } else {
-                                       reply = strdup("OK");
-                               }
-                       } else if(!strcmp(cmdName, "FlashWrite")) {
-                               char *__s_addr, *data;
-                               char *tok = params;
-
-                               __s_addr = strsep(&tok, ":");
-                               data   = tok;
-
-                               unsigned addr = strtoul(__s_addr, NULL, 16);
-                               unsigned data_length = status - (data - packet);
-
-                               // Length of decoded data cannot be more than
-                               // encoded, as escapes are removed.
-                               // Additional byte is reserved for alignment fix.
-                               uint8_t *decoded = calloc(data_length + 1, 1);
-                               unsigned dec_index = 0;
-                               for(unsigned int i = 0; i < data_length; i++) {
-                                       if(data[i] == 0x7d) {
-                                               i++;
-                                               decoded[dec_index++] = data[i] ^ 0x20;
-                                       } else {
-                                               decoded[dec_index++] = data[i];
-                                       }
-                               }
-
-                               // Fix alignment
-                               if(dec_index % 2 != 0)
-                                       dec_index++;
-
-                               #if DEBUG
-                               printf("binary packet %d -> %d\n", data_length, dec_index);
-                               #endif
-
-                               if(flash_populate(addr, decoded, dec_index) < 0) {
-                                       reply = strdup("E00");
-                               } else {
-                                       reply = strdup("OK");
-                               }
-                       } else if(!strcmp(cmdName, "FlashDone")) {
-                               if(flash_go(sl) < 0) {
-                                       reply = strdup("E00");
-                               } else {
-                                       reply = strdup("OK");
-                               }
-                       } else if(!strcmp(cmdName, "Kill")) {
-                               attached = 0;
-
-                               reply = strdup("OK");
-                       }
-
-                       if(reply == NULL)
-                               reply = strdup("");
-
-                       break;
-               }
-
-               case 'c':
-                       stlink_run(sl);
-
-                       while(1) {
-                               int status = gdb_check_for_interrupt(client);
-                               if(status < 0) {
-                                       fprintf(stderr, "cannot check for int: %d\n", status);
-                                       return 1;
-                               }
-
-                               if(status == 1) {
-                                       stlink_force_debug(sl);
-                                       break;
-                               }
-
-                               stlink_status(sl);
-                               if(sl->core_stat == STLINK_CORE_HALTED) {
-                                       break;
-                               }
-
-                               usleep(100000);
-                       }
-
-                       reply = strdup("S05"); // TRAP
-                       break;
-
-               case 's':
-                       stlink_step(sl);
-
-                       reply = strdup("S05"); // TRAP
-                       break;
-
-               case '?':
-                       if(attached) {
-                               reply = strdup("S05"); // TRAP
-                       } else {
-                               /* Stub shall reply OK if not attached. */
-                               reply = strdup("OK");
-                       }
-                       break;
-
-               case 'g':
-                       stlink_read_all_regs(sl, &regp);
-
-                       reply = calloc(8 * 16 + 1, 1);
-                       for(int i = 0; i < 16; i++)
-                               sprintf(&reply[i * 8], "%08x", htonl(regp.r[i]));
-
-                       break;
-
-               case 'p': {
-                       unsigned id = strtoul(&packet[1], NULL, 16);
-                        unsigned myreg = 0xDEADDEAD;
-
-                       if(id < 16) {
-                               stlink_read_reg(sl, id, &regp);
-                               myreg = htonl(regp.r[id]);
-                       } 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");
-                       }
-
-                       reply = calloc(8 + 1, 1);
-                       sprintf(reply, "%08x", myreg);
-
-                       break;
-               }
-
-               case 'P': {
-                       char* s_reg = &packet[1];
-                       char* s_value = strstr(&packet[1], "=") + 1;
-
-                       unsigned reg   = strtoul(s_reg,   NULL, 16);
-                       unsigned value = strtoul(s_value, NULL, 16);
-
-                       if(reg < 16) {
-                               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");
-                       }
-
-                       if(!reply) {
-                               reply = strdup("OK");
-                       }
-
-                       break;
-               }
-
-               case 'G':
-                       for(int i = 0; i < 16; i++) {
-                               char str[9] = {0};
-                               strncpy(str, &packet[1 + i * 8], 8);
-                               uint32_t reg = strtoul(str, NULL, 16);
-                               stlink_write_reg(sl, ntohl(reg), i);
-                       }
-
-                       reply = strdup("OK");
-                       break;
-
-               case 'm': {
-                       char* s_start = &packet[1];
-                       char* s_count = strstr(&packet[1], ",") + 1;
-
-                       stm32_addr_t start = strtoul(s_start, NULL, 16);
-                       unsigned     count = strtoul(s_count, NULL, 16);
-
-                       unsigned adj_start = start % 4;
-                       unsigned count_rnd = (count + adj_start + 4 - 1) / 4 * 4;
-
-                       stlink_read_mem32(sl, start - adj_start, count_rnd);
-
-                       reply = calloc(count * 2 + 1, 1);
-                       for(unsigned int i = 0; i < count; i++) {
-                               reply[i * 2 + 0] = hex[sl->q_buf[i + adj_start] >> 4];
-                               reply[i * 2 + 1] = hex[sl->q_buf[i + adj_start] & 0xf];
-                       }
-
-                       break;
-               }
-
-               case 'M': {
-                       char* s_start = &packet[1];
-                       char* s_count = strstr(&packet[1], ",") + 1;
-                       char* hexdata = strstr(packet, ":") + 1;
-
-                       stm32_addr_t start = strtoul(s_start, NULL, 16);
-                       unsigned     count = strtoul(s_count, NULL, 16);
-
-                       if(start % 4) {
-                         unsigned align_count = 4 - start % 4;
-                         if (align_count > count) align_count = count;
-                         for(unsigned int i = 0; i < align_count; i ++) {
-                               char hex[3] = { hexdata[i*2], hexdata[i*2+1], 0 };
-                               uint8_t byte = strtoul(hex, NULL, 16);
-                               sl->q_buf[i] = byte;
-                         }
-                         stlink_write_mem8(sl, start, align_count);
-                         start += align_count;
-                         count -= align_count;
-                         hexdata += 2*align_count;
-                       }
-
-                       if(count - count % 4) {
-                         unsigned aligned_count = count - count % 4;
-
-                         for(unsigned int i = 0; i < aligned_count; i ++) {
-                           char hex[3] = { hexdata[i*2], hexdata[i*2+1], 0 };
-                           uint8_t byte = strtoul(hex, NULL, 16);
-                           sl->q_buf[i] = byte;
-                         }
-                         stlink_write_mem32(sl, start, aligned_count);
-                         count -= aligned_count;
-                         start += aligned_count;
-                         hexdata += 2*aligned_count;
-                       }
-
-                       if(count) {
-                         for(unsigned int i = 0; i < count; i ++) {
-                           char hex[3] = { hexdata[i*2], hexdata[i*2+1], 0 };
-                           uint8_t byte = strtoul(hex, NULL, 16);
-                           sl->q_buf[i] = byte;
-                         }
-                         stlink_write_mem8(sl, start, count);
-                       }
-                       reply = strdup("OK");
-                       break;
-               }
-
-               case 'Z': {
-                       char *endptr;
-                       stm32_addr_t addr = strtoul(&packet[3], &endptr, 16);
-                       stm32_addr_t len  = strtoul(&endptr[1], NULL, 16);
-
-                       switch (packet[1]) {
-                               case '1':
-                               if(update_code_breakpoint(sl, addr, 1) < 0) {
-                                       reply = strdup("E00");
-                               } else {
-                                       reply = strdup("OK");
-                               }
-                               break;
-
-                               case '2':   // insert write watchpoint
-                               case '3':   // insert read  watchpoint
-                               case '4':   // insert access watchpoint
-                               {
-                                       enum watchfun wf;
-                                       if(packet[1] == '2') {
-                                               wf = WATCHWRITE;
-                                       } else if(packet[1] == '3') {
-                                               wf = WATCHREAD;
-                                       } else {
-                                               wf = WATCHACCESS;
-                                       }
-
-                    if(add_data_watchpoint(sl, wf, addr, len) < 0) {
+                    DLOG("binary packet %d -> %d\n", data_length, dec_index);
+
+                    if(flash_populate(addr, decoded, dec_index) < 0) {
                         reply = strdup("E00");
                     } else {
                         reply = strdup("OK");
+                    }
+                } else if(!strcmp(cmdName, "FlashDone")) {
+                    if(flash_go(sl) < 0) {
+                        reply = strdup("E00");
+                    } else {
+                        reply = strdup("OK");
+                    }
+                } else if(!strcmp(cmdName, "Kill")) {
+                    attached = 0;
+
+                    reply = strdup("OK");
+                }
+
+                if(reply == NULL)
+                    reply = strdup("");
+
+                break;
+            }
+
+            case 'c':
+                cache_sync(sl);
+                stlink_run(sl);
+
+                while(1) {
+                    int status = gdb_check_for_interrupt(client);
+                    if(status < 0) {
+                        ELOG("cannot check for int: %d\n", status);
+#ifdef __MINGW32__
+                        win32_close_socket(sock);
+#endif
+                        return 1;
+                    }
+
+                    if(status == 1) {
+                        stlink_force_debug(sl);
                         break;
                     }
-                               }
-
-                               default:
-                               reply = strdup("");
-                       }
-                       break;
-               }
-               case 'z': {
-                       char *endptr;
-                       stm32_addr_t addr = strtoul(&packet[3], &endptr, 16);
-                       //stm32_addr_t len  = strtoul(&endptr[1], NULL, 16);
-
-                       switch (packet[1]) {
-                               case '1': // remove breakpoint
-                               update_code_breakpoint(sl, addr, 0);
-                               reply = strdup("OK");
-                               break;
-
-                               case '2' : // remove write watchpoint
-                               case '3' : // remove read watchpoint
-                               case '4' : // remove access watchpoint
-                               if(delete_data_watchpoint(sl, addr) < 0) {
-                                       reply = strdup("E00");
-                               } else {
-                                       reply = strdup("OK");
-                                       break;
-                               }
-
-                               default:
-                               reply = strdup("");
-                       }
-                       break;
-               }
-
-               case '!': {
-                       /*
-                        * Enter extended mode which allows restarting.
-                        * We do support that always.
-                        */
-
-                       /*
-                        * Also, set to persistent mode
-                        * to allow GDB disconnect.
-                        */
-                       st->persistent = 1;
-
-                       reply = strdup("OK");
-
-                       break;
-               }
-
-               case 'R': {
-                       /* Reset the core. */
-
-                       stlink_reset(sl);
-                       init_code_breakpoints(sl);
-                       init_data_watchpoints(sl);
-
-                       attached = 1;
-
-                       reply = strdup("OK");
-
-                       break;
-               }
-
-               default:
-                       reply = strdup("");
-               }
-
-               if(reply) {
-                       #if DEBUG
-                       printf("send: %s\n", reply);
-                       #endif
-
-                       int result = gdb_send_packet(client, reply);
-                       if(result != 0) {
-                               fprintf(stderr, "cannot send: %d\n", result);
-                               free(reply);
-                               free(packet);
-                               return 1;
-                       }
-
-                       free(reply);
-               }
-
-               free(packet);
-       }
 
-       return 0;
+                    stlink_status(sl);
+                    if(sl->core_stat == STLINK_CORE_HALTED) {
+                        break;
+                    }
+
+                    usleep(100000);
+                }
+
+                reply = strdup("S05"); // TRAP
+                break;
+
+            case 's':
+               cache_sync(sl);
+                stlink_step(sl);
+
+                reply = strdup("S05"); // TRAP
+                break;
+
+            case '?':
+                if(attached) {
+                    reply = strdup("S05"); // TRAP
+                } else {
+                    /* Stub shall reply OK if not attached. */
+                    reply = strdup("OK");
+                }
+                break;
+
+            case 'g':
+                stlink_read_all_regs(sl, &regp);
+
+                reply = calloc(8 * 16 + 1, 1);
+                for(int i = 0; i < 16; i++)
+                    sprintf(&reply[i * 8], "%08x", htonl(regp.r[i]));
+
+                break;
+
+            case 'p': {
+                unsigned id = strtoul(&packet[1], NULL, 16);
+                unsigned myreg = 0xDEADDEAD;
+
+                if(id < 16) {
+                    stlink_read_reg(sl, id, &regp);
+                    myreg = htonl(regp.r[id]);
+                } 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");
+                }
+
+                reply = calloc(8 + 1, 1);
+                sprintf(reply, "%08x", myreg);
+
+                break;
+            }
+
+            case 'P': {
+                char* s_reg = &packet[1];
+                char* s_value = strstr(&packet[1], "=") + 1;
+
+                unsigned reg   = strtoul(s_reg,   NULL, 16);
+                unsigned value = strtoul(s_value, NULL, 16);
+
+                if(reg < 16) {
+                    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");
+                }
+
+                if(!reply) {
+                    reply = strdup("OK");
+                }
+
+                break;
+            }
+
+            case 'G':
+                for(int i = 0; i < 16; i++) {
+                    char str[9] = {0};
+                    strncpy(str, &packet[1 + i * 8], 8);
+                    uint32_t reg = strtoul(str, NULL, 16);
+                    stlink_write_reg(sl, ntohl(reg), i);
+                }
+
+                reply = strdup("OK");
+                break;
+
+            case 'm': {
+                char* s_start = &packet[1];
+                char* s_count = strstr(&packet[1], ",") + 1;
+
+                stm32_addr_t start = strtoul(s_start, NULL, 16);
+                unsigned     count = strtoul(s_count, NULL, 16);
+
+                unsigned adj_start = start % 4;
+                unsigned count_rnd = (count + adj_start + 4 - 1) / 4 * 4;
+                if (count_rnd > sl->flash_pgsz)
+                    count_rnd = sl->flash_pgsz;
+                if (count_rnd > 0x1800)
+                    count_rnd = 0x1800;
+                if (count_rnd < count)
+                    count = count_rnd;
+
+                stlink_read_mem32(sl, start - adj_start, count_rnd);
+
+                reply = calloc(count * 2 + 1, 1);
+                for(unsigned int i = 0; i < count; i++) {
+                    reply[i * 2 + 0] = hex[sl->q_buf[i + adj_start] >> 4];
+                    reply[i * 2 + 1] = hex[sl->q_buf[i + adj_start] & 0xf];
+                }
+
+                break;
+            }
+
+            case 'M': {
+                char* s_start = &packet[1];
+                char* s_count = strstr(&packet[1], ",") + 1;
+                char* hexdata = strstr(packet, ":") + 1;
+
+                stm32_addr_t start = strtoul(s_start, NULL, 16);
+                unsigned     count = strtoul(s_count, NULL, 16);
+
+                if(start % 4) {
+                    unsigned align_count = 4 - start % 4;
+                    if (align_count > count) align_count = count;
+                    for(unsigned int i = 0; i < align_count; i ++) {
+                        char hex[3] = { hexdata[i*2], hexdata[i*2+1], 0 };
+                        uint8_t byte = strtoul(hex, NULL, 16);
+                        sl->q_buf[i] = byte;
+                    }
+                    stlink_write_mem8(sl, start, align_count);
+                    cache_change(start, align_count);
+                    start += align_count;
+                    count -= align_count;
+                    hexdata += 2*align_count;
+                }
+
+                if(count - count % 4) {
+                    unsigned aligned_count = count - count % 4;
+
+                    for(unsigned int i = 0; i < aligned_count; i ++) {
+                        char hex[3] = { hexdata[i*2], hexdata[i*2+1], 0 };
+                        uint8_t byte = strtoul(hex, NULL, 16);
+                        sl->q_buf[i] = byte;
+                    }
+                    stlink_write_mem32(sl, start, aligned_count);
+                    cache_change(start, aligned_count);
+                    count -= aligned_count;
+                    start += aligned_count;
+                    hexdata += 2*aligned_count;
+                }
+
+                if(count) {
+                    for(unsigned int i = 0; i < count; i ++) {
+                        char hex[3] = { hexdata[i*2], hexdata[i*2+1], 0 };
+                        uint8_t byte = strtoul(hex, NULL, 16);
+                        sl->q_buf[i] = byte;
+                    }
+                    stlink_write_mem8(sl, start, count);
+                    cache_change(start, count);
+                }
+                reply = strdup("OK");
+                break;
+            }
+
+            case 'Z': {
+                char *endptr;
+                stm32_addr_t addr = strtoul(&packet[3], &endptr, 16);
+                stm32_addr_t len  = strtoul(&endptr[1], NULL, 16);
+
+                switch (packet[1]) {
+                    case '1':
+                        if(update_code_breakpoint(sl, addr, 1) < 0) {
+                            reply = strdup("E00");
+                        } else {
+                            reply = strdup("OK");
+                        }
+                        break;
+
+                    case '2':   // insert write watchpoint
+                    case '3':   // insert read  watchpoint
+                    case '4': { // insert access watchpoint
+                        enum watchfun wf;
+                        if(packet[1] == '2') {
+                            wf = WATCHWRITE;
+                        } else if(packet[1] == '3') {
+                            wf = WATCHREAD;
+                        } else {
+                            wf = WATCHACCESS;
+                        }
+
+                        if(add_data_watchpoint(sl, wf, addr, len) < 0) {
+                            reply = strdup("E00");
+                        } else {
+                            reply = strdup("OK");
+                            break;
+                        }
+                    }
+
+                    default:
+                        reply = strdup("");
+                }
+                break;
+            }
+            case 'z': {
+                char *endptr;
+                stm32_addr_t addr = strtoul(&packet[3], &endptr, 16);
+                //stm32_addr_t len  = strtoul(&endptr[1], NULL, 16);
+
+                switch (packet[1]) {
+                    case '1': // remove breakpoint
+                        update_code_breakpoint(sl, addr, 0);
+                        reply = strdup("OK");
+                        break;
+
+                    case '2' : // remove write watchpoint
+                    case '3' : // remove read watchpoint
+                    case '4' : // remove access watchpoint
+                        if(delete_data_watchpoint(sl, addr) < 0) {
+                            reply = strdup("E00");
+                        } else {
+                            reply = strdup("OK");
+                            break;
+                        }
+
+                    default:
+                        reply = strdup("");
+                }
+                break;
+            }
+
+            case '!': {
+                /*
+                 * Enter extended mode which allows restarting.
+                 * We do support that always.
+                 */
+
+                /*
+                 * Also, set to persistent mode
+                 * to allow GDB disconnect.
+                 */
+                st->persistent = 1;
+
+                reply = strdup("OK");
+
+                break;
+            }
+
+            case 'R': {
+                /* Reset the core. */
+
+                stlink_reset(sl);
+                init_code_breakpoints(sl);
+                init_data_watchpoints(sl);
+
+                attached = 1;
+
+                reply = strdup("OK");
+
+                break;
+            }
+
+            default:
+                reply = strdup("");
+        }
+
+        if(reply) {
+            DLOG("send: %s\n", reply);
+
+            int result = gdb_send_packet(client, reply);
+            if(result != 0) {
+                ELOG("cannot send: %d\n", result);
+                free(reply);
+                free(packet);
+#ifdef __MINGW32__
+                win32_close_socket(sock);
+#endif
+                return 1;
+            }
+
+            free(reply);
+        }
+
+        free(packet);
+    }
+
+#ifdef __MINGW32__
+    win32_close_socket(sock);
+#endif
+
+    return 0;
 }