X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gdbserver%2Fgdb-server.c;h=bf1478122a25db0832ef37805122345aad08da2f;hb=766138867ca4729497b989b89fc492fb2faa48f0;hp=bd478573f54376715d2c1697f2d83a1c4de55be8;hpb=2559ab0c30b6782e67c9a0a1622c04bde9ee51f5;p=fw%2Fstlink
diff --git a/gdbserver/gdb-server.c b/gdbserver/gdb-server.c
index bd47857..bf14781 100644
--- a/gdbserver/gdb-server.c
+++ b/gdbserver/gdb-server.c
@@ -36,6 +36,8 @@
//Allways update the FLASH_PAGE before each use, by calling stlink_calculate_pagesize
#define FLASH_PAGE (sl->flash_pgsz)
+stlink_t *connected_stlink = NULL;
+
static const char hex[] = "0123456789abcdef";
static const char* current_memory_map = NULL;
@@ -47,12 +49,26 @@ typedef struct _st_state_t {
char devicename[100];
int logging_level;
int listen_port;
+ int persistent;
+ int reset;
} st_state_t;
-int serve(stlink_t *sl, int port);
+int serve(stlink_t *sl, st_state_t *st);
char* make_memory_map(stlink_t *sl);
+static void cleanup(int signal __attribute__((unused))) {
+ if (connected_stlink) {
+ /* Switch back to mass storage mode before closing. */
+ stlink_run(connected_stlink);
+ stlink_exit_debug_mode(connected_stlink);
+ stlink_close(connected_stlink);
+ }
+
+ exit(1);
+}
+
+
int parse_options(int argc, char** argv, st_state_t *st) {
static struct option long_options[] = {
@@ -62,6 +78,8 @@ int parse_options(int argc, char** argv, st_state_t *st) {
{"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'},
{0, 0, 0, 0},
};
const char * help_str = "%s - usage:\n\n"
@@ -76,13 +94,18 @@ int parse_options(int argc, char** argv, st_state_t *st) {
" -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"
;
int option_index = 0;
int c;
int q;
- while ((c = getopt_long(argc, argv, "hv::d:s:1p:", long_options, &option_index)) != -1) {
+ while ((c = getopt_long(argc, argv, "hv::d: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");
@@ -129,6 +152,12 @@ int parse_options(int argc, char** argv, st_state_t *st) {
}
st->listen_port = q;
break;
+ case 'm':
+ st->persistent = 1;
+ break;
+ case 'n':
+ st->reset = 0;
+ break;
}
}
@@ -143,6 +172,7 @@ int parse_options(int argc, char** argv, st_state_t *st) {
int main(int argc, char** argv) {
+ uint32_t voltage;
stlink_t *sl = NULL;
@@ -152,20 +182,34 @@ int main(int argc, char** argv) {
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);
+ sl = stlink_open_usb(state.logging_level, 0);
if(sl == NULL) return 1;
break;
case 1:
- sl = stlink_v1_open(state.logging_level);
+ sl = stlink_v1_open(state.logging_level, 0);
if(sl == NULL) return 1;
break;
}
-
+
+ connected_stlink = sl;
+ signal(SIGINT, &cleanup);
+ signal(SIGTERM, &cleanup);
+
+ if (state.reset) {
+ stlink_reset(sl);
+ }
+
printf("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);
+ }
+
sl->verbose=0;
current_memory_map = make_memory_map(sl);
@@ -177,7 +221,12 @@ int main(int argc, char** argv) {
}
#endif
- while(serve(sl, state.listen_port) == 0);
+ do {
+ serve(sl, &state);
+
+ /* Continue */
+ stlink_run(sl);
+ } while (state.persistent);
#ifdef __MINGW32__
winsock_error:
@@ -185,20 +234,85 @@ winsock_error:
#endif
/* Switch back to mass storage mode before closing. */
- stlink_run(sl);
stlink_exit_debug_mode(sl);
stlink_close(sl);
return 0;
}
+static const char* const target_description_F4 =
+ ""
+ ""
+ ""
+ " arm"
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ " "
+ "";
+
static const char* const memory_map_template_F4 =
""
""
""
" " // code = sram, bootrom or flash; flash is bigger
- " " // sram
+ " " // ccm ram
+ " " // sram
" " //Sectors 0..3
" 0x4000" //16kB
" "
@@ -227,7 +341,7 @@ static const char* const memory_map_template =
" " // peripheral regs
" " // cortex regs
" " // bootrom
- " " // option byte area
+ " " // option byte area
"";
char* make_memory_map(stlink_t *sl) {
@@ -248,7 +362,7 @@ char* make_memory_map(stlink_t *sl) {
}
-/*
+/*
* DWT_COMP0 0xE0001020
* DWT_MASK0 0xE0001024
* DWT_FUNCTION0 0xE0001028
@@ -276,12 +390,12 @@ struct code_hw_watchpoint {
struct code_hw_watchpoint data_watches[DATA_WATCH_NUM];
static void init_data_watchpoints(stlink_t *sl) {
- #ifdef DEBUG
+ #if DEBUG
printf("init watchpoints\n");
#endif
// set trcena in debug command to turn on dwt unit
- stlink_write_debug32(sl, 0xE000EDFC,
+ stlink_write_debug32(sl, 0xE000EDFC,
stlink_read_debug32(sl, 0xE000EDFC) | (1<<24));
// make sure all watchpoints are cleared
@@ -311,7 +425,7 @@ static int add_data_watchpoint(stlink_t *sl, enum watchfun wf, stm32_addr_t addr
for(i = 0; i < DATA_WATCH_NUM; i++) {
// is this an empty slot ?
if(data_watches[i].fun == WATCHDISABLED) {
- #ifdef DEBUG
+ #if DEBUG
printf("insert watchpoint %d addr %x wf %u mask %u len %d\n", i, addr, wf, mask, len);
#endif
@@ -335,7 +449,7 @@ static int add_data_watchpoint(stlink_t *sl, enum watchfun wf, stm32_addr_t addr
}
}
- #ifdef DEBUG
+ #if DEBUG
printf("failure: add watchpoints addr %x wf %u len %u\n", addr, wf, len);
#endif
return -1;
@@ -347,7 +461,7 @@ static int delete_data_watchpoint(stlink_t *sl, stm32_addr_t addr)
for(i = 0 ; i < DATA_WATCH_NUM; i++) {
if((data_watches[i].addr == addr) && (data_watches[i].fun != WATCHDISABLED)) {
- #ifdef DEBUG
+ #if DEBUG
printf("delete watchpoint %d addr %x\n", i, addr);
#endif
@@ -358,7 +472,7 @@ static int delete_data_watchpoint(stlink_t *sl, stm32_addr_t addr)
}
}
- #ifdef DEBUG
+ #if DEBUG
printf("failure: delete watchpoint addr %x\n", addr);
#endif
@@ -419,7 +533,7 @@ static int update_code_breakpoint(stlink_t *sl, stm32_addr_t addr, int set) {
else brk->type &= ~type;
if(brk->type == 0) {
- #ifdef DEBUG
+ #if DEBUG
printf("clearing hw break %d\n", id);
#endif
@@ -427,7 +541,7 @@ static int update_code_breakpoint(stlink_t *sl, stm32_addr_t addr, int set) {
} else {
uint32_t mask = (brk->addr) | 1 | (brk->type << 30);
- #ifdef DEBUG
+ #if DEBUG
printf("setting hw break %d at %08x (%d)\n",
id, brk->addr, brk->type);
printf("reg %08x \n",
@@ -523,7 +637,7 @@ static int flash_go(stlink_t *sl) {
stlink_reset(sl);
for(struct flash_block* fb = flash_root; fb; fb = fb->next) {
- #ifdef DEBUG
+ #if DEBUG
printf("flash_do: block %08x -> %04x\n", fb->addr, fb->length);
#endif
@@ -533,7 +647,7 @@ static int flash_go(stlink_t *sl) {
//Update FLASH_PAGE
stlink_calculate_pagesize(sl, page);
- #ifdef DEBUG
+ #if DEBUG
printf("flash_do: page %08x\n", page);
#endif
@@ -559,7 +673,7 @@ error:
return error;
}
-int serve(stlink_t *sl, int port) {
+int serve(stlink_t *sl, st_state_t *st) {
int sock = socket(AF_INET, SOCK_STREAM, 0);
if(sock < 0) {
perror("socket");
@@ -567,13 +681,13 @@ int serve(stlink_t *sl, int port) {
}
unsigned int val = 1;
- setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
+ setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *)&val, sizeof(val));
struct sockaddr_in serv_addr;
memset(&serv_addr,0,sizeof(struct sockaddr_in));
serv_addr.sin_family = AF_INET;
- serv_addr.sin_addr.s_addr = inet_addr("127.0.0.1");
- serv_addr.sin_port = htons(port);
+ 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");
@@ -585,12 +699,7 @@ int serve(stlink_t *sl, int port) {
return 1;
}
- stlink_force_debug(sl);
- stlink_reset(sl);
- init_code_breakpoints(sl);
- init_data_watchpoints(sl);
-
- printf("Listening at *:%d...\n", port);
+ printf("Listening at *:%d...\n", st->listen_port);
int client = accept(sock, NULL, NULL);
//signal (SIGINT, SIG_DFL);
@@ -601,6 +710,13 @@ int serve(stlink_t *sl, int port) {
close(sock);
+ stlink_force_debug(sl);
+ if (st->reset) {
+ stlink_reset(sl);
+ }
+ init_code_breakpoints(sl);
+ init_data_watchpoints(sl);
+
printf("GDB connected.\n");
/*
@@ -618,7 +734,7 @@ int serve(stlink_t *sl, int port) {
return 1;
}
- #ifdef DEBUG
+ #if DEBUG
printf("recv: %s\n", packet);
#endif
@@ -643,12 +759,17 @@ int serve(stlink_t *sl, int port) {
char* queryName = calloc(queryNameLength + 1, 1);
strncpy(queryName, &packet[1], queryNameLength);
- #ifdef DEBUG
+ #if DEBUG
printf("query: %s;%s\n", queryName, params);
#endif
if(!strcmp(queryName, "Supported")) {
- reply = strdup("PacketSize=3fff;qXfer:memory-map:read+");
+ if(sl->chip_id==STM32_CHIPID_F4) {
+ reply = strdup("PacketSize=3fff;qXfer:memory-map:read+;qXfer:features:read+");
+ }
+ else {
+ reply = strdup("PacketSize=3fff;qXfer:memory-map:read+");
+ }
} else if(!strcmp(queryName, "Xfer")) {
char *type, *op, *__s_addr, *s_length;
char *tok = params;
@@ -663,7 +784,7 @@ int serve(stlink_t *sl, int port) {
unsigned addr = strtoul(__s_addr, NULL, 16),
length = strtoul(s_length, NULL, 16);
- #ifdef DEBUG
+ #if DEBUG
printf("Xfer: type:%s;op:%s;annex:%s;addr:%d;length:%d\n",
type, op, annex, addr, length);
#endif
@@ -673,6 +794,9 @@ int serve(stlink_t *sl, int port) {
if(!strcmp(type, "memory-map") && !strcmp(op, "read"))
data = current_memory_map;
+ if(!strcmp(type, "features") && !strcmp(op, "read"))
+ data = target_description_F4;
+
if(data) {
unsigned data_length = strlen(data);
if(addr + length > data_length)
@@ -694,41 +818,51 @@ int serve(stlink_t *sl, int port) {
} else {
params = separator + 1;
}
-
- if (!strncmp(params,"7265",4)) {// resume
-#ifdef DEBUG
+
+ if (!strncmp(params,"726573756d65",12)) {// resume
+#if DEBUG
printf("Rcmd: resume\n");
#endif
stlink_run(sl);
reply = strdup("OK");
- } else if (!strncmp(params,"6861",4)) { //half
+ } else if (!strncmp(params,"68616c74",8)) { //halt
reply = strdup("OK");
-
+
stlink_force_debug(sl);
-#ifdef DEBUG
+#if DEBUG
printf("Rcmd: halt\n");
#endif
- } else if (!strncmp(params,"7265",4)) { //reset
+ } else if (!strncmp(params,"6a7461675f7265736574",20)) { //jtag_reset
+ reply = strdup("OK");
+
+ 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");
-
+
stlink_force_debug(sl);
stlink_reset(sl);
init_code_breakpoints(sl);
init_data_watchpoints(sl);
-
-#ifdef DEBUG
+
+#if DEBUG
printf("Rcmd: reset\n");
#endif
} else {
-#ifdef DEBUG
+#if DEBUG
printf("Rcmd: %s\n", params);
#endif
}
-
+
}
if(reply == NULL)
@@ -755,7 +889,7 @@ int serve(stlink_t *sl, int port) {
unsigned addr = strtoul(__s_addr, NULL, 16),
length = strtoul(s_length, NULL, 16);
- #ifdef DEBUG
+ #if DEBUG
printf("FlashErase: addr:%08x,len:%04x\n",
addr, length);
#endif
@@ -793,7 +927,7 @@ int serve(stlink_t *sl, int port) {
if(dec_index % 2 != 0)
dec_index++;
- #ifdef DEBUG
+ #if DEBUG
printf("binary packet %d -> %d\n", data_length, dec_index);
#endif
@@ -880,6 +1014,30 @@ int serve(stlink_t *sl, int port) {
} else if(id == 0x19) {
stlink_read_reg(sl, 16, ®p);
myreg = htonl(regp.xpsr);
+ } else if(id == 0x1A) {
+ stlink_read_reg(sl, 17, ®p);
+ myreg = htonl(regp.main_sp);
+ } else if(id == 0x1B) {
+ stlink_read_reg(sl, 18, ®p);
+ myreg = htonl(regp.process_sp);
+ } else if(id == 0x1C) {
+ stlink_read_unsupported_reg(sl, id, ®p);
+ myreg = htonl(regp.control);
+ } else if(id == 0x1D) {
+ stlink_read_unsupported_reg(sl, id, ®p);
+ myreg = htonl(regp.faultmask);
+ } else if(id == 0x1E) {
+ stlink_read_unsupported_reg(sl, id, ®p);
+ myreg = htonl(regp.basepri);
+ } else if(id == 0x1F) {
+ stlink_read_unsupported_reg(sl, id, ®p);
+ myreg = htonl(regp.primask);
+ } else if(id >= 0x20 && id < 0x40) {
+ stlink_read_unsupported_reg(sl, id, ®p);
+ myreg = htonl(regp.s[id-0x20]);
+ } else if(id == 0x40) {
+ stlink_read_unsupported_reg(sl, id, ®p);
+ myreg = htonl(regp.fpscr);
} else {
reply = strdup("E00");
}
@@ -901,6 +1059,22 @@ int serve(stlink_t *sl, int port) {
stlink_write_reg(sl, ntohl(value), reg);
} else if(reg == 0x19) {
stlink_write_reg(sl, ntohl(value), 16);
+ } else if(reg == 0x1A) {
+ stlink_write_reg(sl, ntohl(value), 17);
+ } else if(reg == 0x1B) {
+ stlink_write_reg(sl, ntohl(value), 18);
+ } else if(reg == 0x1C) {
+ stlink_write_unsupported_reg(sl, ntohl(value), reg, ®p);
+ } else if(reg == 0x1D) {
+ stlink_write_unsupported_reg(sl, ntohl(value), reg, ®p);
+ } else if(reg == 0x1E) {
+ stlink_write_unsupported_reg(sl, ntohl(value), reg, ®p);
+ } else if(reg == 0x1F) {
+ stlink_write_unsupported_reg(sl, ntohl(value), reg, ®p);
+ } else if(reg >= 0x20 && reg < 0x40) {
+ stlink_write_unsupported_reg(sl, ntohl(value), reg, ®p);
+ } else if(reg == 0x40) {
+ stlink_write_unsupported_reg(sl, ntohl(value), reg, ®p);
} else {
reply = strdup("E00");
}
@@ -931,9 +1105,9 @@ int serve(stlink_t *sl, int port) {
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 % 4 == 0) ?
- count : count + 4 - (count % 4));
+ stlink_read_mem32(sl, start - adj_start, count_rnd);
reply = calloc(count * 2 + 1, 1);
for(unsigned int i = 0; i < count; i++) {
@@ -952,20 +1126,43 @@ int serve(stlink_t *sl, int port) {
stm32_addr_t start = strtoul(s_start, NULL, 16);
unsigned count = strtoul(s_count, NULL, 16);
- for(unsigned int i = 0; i < count; i ++) {
+ 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 % 4) == 0 && (start % 4) == 0) {
- stlink_write_mem32(sl, start, count);
- } else {
- stlink_write_mem8(sl, start, 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;
}
@@ -994,13 +1191,14 @@ int serve(stlink_t *sl, int port) {
wf = WATCHREAD;
} else {
wf = WATCHACCESS;
- if(add_data_watchpoint(sl, wf, addr, len) < 0) {
- reply = strdup("E00");
- } else {
- reply = strdup("OK");
- break;
- }
}
+
+ if(add_data_watchpoint(sl, wf, addr, len) < 0) {
+ reply = strdup("E00");
+ } else {
+ reply = strdup("OK");
+ break;
+ }
}
default:
@@ -1041,6 +1239,12 @@ int serve(stlink_t *sl, int port) {
* We do support that always.
*/
+ /*
+ * Also, set to persistent mode
+ * to allow GDB disconnect.
+ */
+ st->persistent = 1;
+
reply = strdup("OK");
break;
@@ -1065,13 +1269,15 @@ int serve(stlink_t *sl, int port) {
}
if(reply) {
- #ifdef DEBUG
+ #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;
}