X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gdbserver%2Fgdb-server.c;h=31f9beb0087b993463e7016b6f4a80d13bcbdfde;hb=e047ef25db9745e091a519520414a24bbea42b91;hp=e5e754bd897a0ebd72e7efb6cd2f6e36d81692c3;hpb=8f97b230fca22837643705449c49d82ce927ab5a;p=fw%2Fstlink
diff --git a/gdbserver/gdb-server.c b/gdbserver/gdb-server.c
index e5e754b..31f9beb 100644
--- a/gdbserver/gdb-server.c
+++ b/gdbserver/gdb-server.c
@@ -209,7 +209,9 @@ int main(int argc, char** argv) {
#endif
do {
- serve(sl, &state);
+ if (serve(sl, &state)) {
+ sleep (1); // don't go bezurk if serve returns with error
+ }
/* Continue */
stlink_run(sl);
@@ -306,15 +308,65 @@ static const char* const memory_map_template_F4 =
" " //Sector 4
" 0x10000" //64kB
" "
- " " //Sectors 5..11
+ " " //Sectors 5..11
" 0x20000" //128kB
" "
" " // peripheral regs
+ " " // AHB3 Peripherals
" " // cortex regs
" " // bootrom
" " // option byte area
"";
+static const char* const memory_map_template_F4_HD =
+ ""
+ ""
+ ""
+ " " // code = sram, bootrom or flash; flash is bigger
+ " " // ccm ram
+ " " // sram
+ " " // fmc bank 1 (nor/psram/sram)
+ " " // fmc bank 2 & 3 (nand flash)
+ " " // fmc bank 4 (pc card)
+ " " // fmc sdram bank 1 & 2
+ " " //Sectors 0..3
+ " 0x4000" //16kB
+ " "
+ " " //Sector 4
+ " 0x10000" //64kB
+ " "
+ " " //Sectors 5..11
+ " 0x20000" //128kB
+ " "
+ " " // peripheral regs
+ " " // cortex regs
+ " " // bootrom
+ " " // option byte area
+ "";
+
+static const char* const memory_map_template_F2 =
+ ""
+ ""
+ ""
+ " " // code = sram, bootrom or flash; flash is bigger
+ " " // sram
+ " " //Sectors 0..3
+ " 0x4000" //16kB
+ " "
+ " " //Sector 4
+ " 0x10000" //64kB
+ " "
+ " " //Sectors 5..
+ " 0x20000" //128kB
+ " "
+ " " // peripheral regs
+ " " // cortex regs
+ " " // bootrom
+ " " // option byte area
+ "";
+
static const char* const memory_map_template =
""
"" // option byte area
"";
+static const char* const memory_map_template_F7 =
+ ""
+ ""
+ ""
+ " " // ITCM ram 16kB
+ " " // ITCM flash
+ " " // sram
+ " " // Sectors 0..3
+ " 0x8000" // 32kB
+ " "
+ " " // Sector 4
+ " 0x20000" // 128kB
+ " "
+ " " // Sectors 5..7
+ " 0x40000" // 128kB
+ " "
+ " " // peripheral regs
+ " " // AHB3 Peripherals
+ " " // cortex regs
+ " " // bootrom
+ " " // option byte area
+ "";
+
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 || sl->chip_id==STM32_CHIPID_F4_HD) {
+ 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 {
snprintf(map, 4096, memory_map_template,
sl->flash_size,
@@ -619,8 +705,8 @@ static int flash_go(stlink_t *sl) {
for(struct flash_block* fb = flash_root; fb; fb = fb->next) {
DLOG("flash_do: block %08x -> %04x\n", fb->addr, fb->length);
- unsigned length = fb->length;
for(stm32_addr_t page = fb->addr; page < fb->addr + fb->length; page += FLASH_PAGE) {
+ unsigned length = fb->length - (page - fb->addr);
//Update FLASH_PAGE
stlink_calculate_pagesize(sl, page);
@@ -707,6 +793,9 @@ int serve(stlink_t *sl, st_state_t *st) {
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;
}
@@ -916,6 +1005,9 @@ int serve(stlink_t *sl, st_state_t *st) {
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;
}
@@ -1230,6 +1322,9 @@ int serve(stlink_t *sl, st_state_t *st) {
ELOG("cannot send: %d\n", result);
free(reply);
free(packet);
+#ifdef __MINGW32__
+ win32_close_socket(sock);
+#endif
return 1;
}
@@ -1239,5 +1334,9 @@ int serve(stlink_t *sl, st_state_t *st) {
free(packet);
}
+#ifdef __MINGW32__
+ win32_close_socket(sock);
+#endif
+
return 0;
}