X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fserver%2Fgdb_server.c;h=e6a1ce5596342515a43f9c8e3d11bdd780a0b6b5;hb=d61714f4d5d72f9f39fbccbb1c3ba5f3d8982020;hp=4c8afbdfa23a43b756ec3a91c3b443c6e91ac501;hpb=6c15861bd8bd49504c634cb52316cb085056eefc;p=openocd diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c index 4c8afbdf..e6a1ce55 100644 --- a/src/server/gdb_server.c +++ b/src/server/gdb_server.c @@ -27,24 +27,14 @@ #include "config.h" #endif -#include "replacements.h" - #include "gdb_server.h" - +#include "target_request.h" +#include "register.h" #include "server.h" -#include "log.h" -#include "binarybuffer.h" -#include "jtag.h" -#include "breakpoints.h" #include "flash.h" -#include "target.h" -#include "target_request.h" -#include "configuration.h" +#include "image.h" +#include "jtag.h" -#include -#include -#include -#include #if 0 #define _DEBUG_GDB_IO_ @@ -54,7 +44,7 @@ static int gdb_breakpoint_override; static enum breakpoint_type gdb_breakpoint_override_type; extern int gdb_error(connection_t *connection, int retval); -static unsigned short gdb_port; +static unsigned short gdb_port = 3333; static const char *DIGITS = "0123456789abcdef"; static void gdb_log_callback(void *priv, const char *file, int line, @@ -71,6 +61,10 @@ enum gdb_detach_mode /* target behaviour on gdb detach */ enum gdb_detach_mode detach_mode = GDB_DETACH_RESUME; +/* number of gdb connections, mainly to supress gdb related debugging spam + * in helper/log.c when no gdb connections are actually active */ +int gdb_actual_connections; + /* set if we are sending a memory map to gdb * via qXfer:memory-map:read packet */ /* enabled by default*/ @@ -126,7 +120,7 @@ int check_pending(connection_t *connection, int timeout_s, int *got_data) tv.tv_sec = timeout_s; tv.tv_usec = 0; - if (select(connection->fd + 1, &read_fds, NULL, NULL, &tv) == 0) + if (socket_select(connection->fd + 1, &read_fds, NULL, NULL, &tv) == 0) { /* This can typically be because a "monitor" command took too long * before printing any progress messages @@ -139,7 +133,7 @@ int check_pending(connection_t *connection, int timeout_s, int *got_data) return ERROR_OK; } } - *got_data=FD_ISSET(connection->fd, &read_fds)!=0; + *got_data=FD_ISSET(connection->fd, &read_fds) != 0; return ERROR_OK; } @@ -169,10 +163,18 @@ int gdb_get_char(connection_t *connection, int* next_char) for (;;) { - retval=check_pending(connection, 1, NULL); - if (retval!=ERROR_OK) - return retval; - gdb_con->buf_cnt = read_socket(connection->fd, gdb_con->buffer, GDB_BUFFER_SIZE); + if (connection->service->type == CONNECTION_PIPE) + { + gdb_con->buf_cnt = read(connection->fd, gdb_con->buffer, GDB_BUFFER_SIZE); + } + else + { + retval = check_pending(connection, 1, NULL); + if (retval != ERROR_OK) + return retval; + gdb_con->buf_cnt = read_socket(connection->fd, gdb_con->buffer, GDB_BUFFER_SIZE); + } + if (gdb_con->buf_cnt > 0) { break; @@ -186,7 +188,7 @@ int gdb_get_char(connection_t *connection, int* next_char) #ifdef _WIN32 errno = WSAGetLastError(); - switch(errno) + switch (errno) { case WSAEWOULDBLOCK: usleep(1000); @@ -202,7 +204,7 @@ int gdb_get_char(connection_t *connection, int* next_char) exit(-1); } #else - switch(errno) + switch (errno) { case EAGAIN: usleep(1000); @@ -269,9 +271,20 @@ int gdb_write(connection_t *connection, void *data, int len) if (gdb_con->closed) return ERROR_SERVER_REMOTE_CLOSED; - if (write_socket(connection->fd, data, len) == len) + if (connection->service->type == CONNECTION_PIPE) { - return ERROR_OK; + /* write to stdout */ + if (write(STDOUT_FILENO, data, len) == len) + { + return ERROR_OK; + } + } + else + { + if (write_socket(connection->fd, data, len) == len) + { + return ERROR_OK; + } } gdb_con->closed = 1; return ERROR_SERVER_REMOTE_CLOSED; @@ -300,14 +313,14 @@ int gdb_put_packet_inner(connection_t *connection, char *buffer, int len) int gotdata; for (;;) { - if ((retval=check_pending(connection, 0, &gotdata))!=ERROR_OK) + if ((retval=check_pending(connection, 0, &gotdata)) != ERROR_OK) return retval; if (!gotdata) break; if ((retval = gdb_get_char(connection, &reply)) != ERROR_OK) return retval; - if( reply == '$' ){ - // fix a problem with some IAR tools + if ( reply == '$' ){ + /* fix a problem with some IAR tools */ gdb_putback_char( connection, reply ); LOG_DEBUG("Unexpected start of new packet"); break; @@ -329,14 +342,14 @@ int gdb_put_packet_inner(connection_t *connection, char *buffer, int len) char local_buffer[1024]; local_buffer[0] = '$'; - if (len+4 <= sizeof(local_buffer)) + if ((size_t)len + 4 <= sizeof(local_buffer)) { /* performance gain on smaller packets by only a single call to gdb_write() */ memcpy(local_buffer+1, buffer, len++); local_buffer[len++] = '#'; local_buffer[len++] = DIGITS[(my_checksum >> 4) & 0xf]; local_buffer[len++] = DIGITS[my_checksum & 0xf]; - if((retval = gdb_write(connection, local_buffer, len)) != ERROR_OK) + if ((retval = gdb_write(connection, local_buffer, len)) != ERROR_OK) { return retval; } @@ -348,15 +361,15 @@ int gdb_put_packet_inner(connection_t *connection, char *buffer, int len) local_buffer[1] = '#'; local_buffer[2] = DIGITS[(my_checksum >> 4) & 0xf]; local_buffer[3] = DIGITS[my_checksum & 0xf]; - if((retval = gdb_write(connection, local_buffer, 1)) != ERROR_OK) + if ((retval = gdb_write(connection, local_buffer, 1)) != ERROR_OK) { return retval; } - if((retval = gdb_write(connection, buffer, len)) != ERROR_OK) + if ((retval = gdb_write(connection, buffer, len)) != ERROR_OK) { return retval; } - if((retval = gdb_write(connection, local_buffer+1, 3)) != ERROR_OK) + if ((retval = gdb_write(connection, local_buffer+1, 3)) != ERROR_OK) { return retval; } @@ -389,7 +402,7 @@ int gdb_put_packet_inner(connection_t *connection, char *buffer, int len) log_remove_callback(gdb_log_callback, connection); LOG_WARNING("negative reply, retrying"); } - else if( reply == '$' ){ + else if ( reply == '$' ){ LOG_ERROR("GDB missing ack(1) - assumed good"); gdb_putback_char( connection, reply ); return ERROR_OK; @@ -400,7 +413,7 @@ int gdb_put_packet_inner(connection_t *connection, char *buffer, int len) return ERROR_SERVER_REMOTE_CLOSED; } } - else if( reply == '$' ){ + else if ( reply == '$' ){ LOG_ERROR("GDB missing ack(2) - assumed good"); gdb_putback_char( connection, reply ); return ERROR_OK; @@ -581,17 +594,17 @@ int gdb_get_packet_inner(connection_t *connection, char *buffer, int *len) - int checksum_ok; + int checksum_ok = 0; /* explicit code expansion here to get faster inlined code in -O3 by not * calculating checksum */ if (gdb_con->noack_mode) { - if ((retval=fetch_packet(connection, &checksum_ok, 1, len, buffer))!=ERROR_OK) + if ((retval=fetch_packet(connection, &checksum_ok, 1, len, buffer)) != ERROR_OK) return retval; } else { - if ((retval=fetch_packet(connection, &checksum_ok, 0, len, buffer))!=ERROR_OK) + if ((retval=fetch_packet(connection, &checksum_ok, 0, len, buffer)) != ERROR_OK) return retval; } @@ -707,7 +720,7 @@ int gdb_target_callback_event_handler(struct target_s *target, enum target_event break; case TARGET_EVENT_GDB_FLASH_ERASE_START: target_handle_event( target, TARGET_EVENT_OLD_gdb_program_config ); - if((retval = jtag_execute_queue()) != ERROR_OK) + if ((retval = jtag_execute_queue()) != ERROR_OK) { return retval; } @@ -719,7 +732,6 @@ int gdb_target_callback_event_handler(struct target_s *target, enum target_event return ERROR_OK; } - int gdb_new_connection(connection_t *connection) { gdb_connection_t *gdb_connection = malloc(sizeof(gdb_connection_t)); @@ -789,6 +801,9 @@ int gdb_new_connection(connection_t *connection) if (initial_ack != '+') gdb_putback_char(connection, initial_ack); target_call_event_callbacks(gdb_service->target, TARGET_EVENT_GDB_ATTACH ); + + gdb_actual_connections++; + return ERROR_OK; } @@ -797,6 +812,8 @@ int gdb_connection_closed(connection_t *connection) gdb_service_t *gdb_service = connection->service->priv; gdb_connection_t *gdb_connection = connection->priv; + gdb_actual_connections--; + /* see if an image built with vFlash commands is left */ if (gdb_connection->vflash_image) { @@ -827,7 +844,7 @@ int gdb_connection_closed(connection_t *connection) return ERROR_OK; } -void gdb_send_error(connection_t *connection, u8 the_error) +void gdb_send_error(connection_t *connection, uint8_t the_error) { char err[4]; snprintf(err, 4, "E%2.2X", the_error ); @@ -847,7 +864,6 @@ int gdb_last_signal_packet(connection_t *connection, target_t *target, char* pac return ERROR_OK; } - static int gdb_reg_pos(target_t *target, int pos, int len) { if (target->endianness == TARGET_LITTLE_ENDIAN) @@ -869,7 +885,7 @@ void gdb_str_to_target(target_t *target, char *tstr, reg_t *reg) { int i; - u8 *buf; + uint8_t *buf; int buf_len; buf = reg->value; buf_len = CEIL(reg->size, 8); @@ -898,7 +914,7 @@ static int hextoint(char c) } /* copy over in register buffer */ -void gdb_target_to_reg(target_t *target, char *tstr, int str_len, u8 *bin) +void gdb_target_to_reg(target_t *target, char *tstr, int str_len, uint8_t *bin) { if (str_len % 2) { @@ -907,10 +923,10 @@ void gdb_target_to_reg(target_t *target, char *tstr, int str_len, u8 *bin) } int i; - for (i = 0; i < str_len; i+=2) + for (i = 0; i < str_len; i += 2) { - u8 t = hextoint(tstr[i])<<4; - t |= hextoint(tstr[i]); + uint8_t t = hextoint(tstr[i])<<4; + t |= hextoint(tstr[i+1]); int j = gdb_reg_pos(target, i/2, str_len/2); bin[j] = t; @@ -931,7 +947,7 @@ int gdb_get_registers_packet(connection_t *connection, target_t *target, char* p LOG_DEBUG("-"); #endif - if ((retval = target->type->get_gdb_reg_list(target, ®_list, ®_list_size)) != ERROR_OK) + if ((retval = target_get_gdb_reg_list(target, ®_list, ®_list_size)) != ERROR_OK) { return gdb_error(connection, retval); } @@ -989,7 +1005,7 @@ int gdb_set_registers_packet(connection_t *connection, target_t *target, char *p return ERROR_SERVER_REMOTE_CLOSED; } - if ((retval = target->type->get_gdb_reg_list(target, ®_list, ®_list_size)) != ERROR_OK) + if ((retval = target_get_gdb_reg_list(target, ®_list, ®_list_size)) != ERROR_OK) { return gdb_error(connection, retval); } @@ -997,7 +1013,7 @@ int gdb_set_registers_packet(connection_t *connection, target_t *target, char *p packet_p = packet; for (i = 0; i < reg_list_size; i++) { - u8 *bin_buf; + uint8_t *bin_buf; int chars = (CEIL(reg_list[i]->size, 8) * 2); if (packet_p + chars > packet + packet_size) @@ -1041,7 +1057,7 @@ int gdb_get_register_packet(connection_t *connection, target_t *target, char *pa LOG_DEBUG("-"); #endif - if ((retval = target->type->get_gdb_reg_list(target, ®_list, ®_list_size)) != ERROR_OK) + if ((retval = target_get_gdb_reg_list(target, ®_list, ®_list_size)) != ERROR_OK) { return gdb_error(connection, retval); } @@ -1067,7 +1083,7 @@ int gdb_get_register_packet(connection_t *connection, target_t *target, char *pa int gdb_set_register_packet(connection_t *connection, target_t *target, char *packet, int packet_size) { char *separator; - u8 *bin_buf; + uint8_t *bin_buf; int reg_num = strtoul(packet + 1, &separator, 16); reg_t **reg_list; int reg_list_size; @@ -1076,7 +1092,7 @@ int gdb_set_register_packet(connection_t *connection, target_t *target, char *pa LOG_DEBUG("-"); - if ((retval = target->type->get_gdb_reg_list(target, ®_list, ®_list_size)) != ERROR_OK) + if ((retval = target_get_gdb_reg_list(target, ®_list, ®_list_size)) != ERROR_OK) { return gdb_error(connection, retval); } @@ -1147,10 +1163,10 @@ int gdb_error(connection_t *connection, int retval) int gdb_read_memory_packet(connection_t *connection, target_t *target, char *packet, int packet_size) { char *separator; - u32 addr = 0; - u32 len = 0; + uint32_t addr = 0; + uint32_t len = 0; - u8 *buffer; + uint8_t *buffer; char *hex_buffer; int retval = ERROR_OK; @@ -1170,11 +1186,11 @@ int gdb_read_memory_packet(connection_t *connection, target_t *target, char *pac buffer = malloc(len); - LOG_DEBUG("addr: 0x%8.8x, len: 0x%8.8x", addr, len); + LOG_DEBUG("addr: 0x%8.8" PRIx32 ", len: 0x%8.8" PRIx32 "", addr, len); retval = target_read_buffer(target, addr, len, buffer); - if ((retval!=ERROR_OK)&&!gdb_report_data_abort) + if ((retval != ERROR_OK)&&!gdb_report_data_abort) { /* TODO : Here we have to lie and send back all zero's lest stack traces won't work. * At some point this might be fixed in GDB, in which case this code can be removed. @@ -1196,10 +1212,10 @@ int gdb_read_memory_packet(connection_t *connection, target_t *target, char *pac { hex_buffer = malloc(len * 2 + 1); - int i; + uint32_t i; for (i = 0; i < len; i++) { - u8 t = buffer[i]; + uint8_t t = buffer[i]; hex_buffer[2 * i] = DIGITS[(t >> 4) & 0xf]; hex_buffer[2 * i + 1] = DIGITS[t & 0xf]; } @@ -1221,12 +1237,12 @@ int gdb_read_memory_packet(connection_t *connection, target_t *target, char *pac int gdb_write_memory_packet(connection_t *connection, target_t *target, char *packet, int packet_size) { char *separator; - u32 addr = 0; - u32 len = 0; + uint32_t addr = 0; + uint32_t len = 0; - u8 *buffer; + uint8_t *buffer; - int i; + uint32_t i; int retval; /* skip command character */ @@ -1250,12 +1266,12 @@ int gdb_write_memory_packet(connection_t *connection, target_t *target, char *pa buffer = malloc(len); - LOG_DEBUG("addr: 0x%8.8x, len: 0x%8.8x", addr, len); + LOG_DEBUG("addr: 0x%8.8" PRIx32 ", len: 0x%8.8" PRIx32 "", addr, len); for (i=0; itype->step(target, current, address, 0); /* step at current or address, don't handle breakpoints */ + /* step at current or address, don't handle breakpoints */ + retval = target_step(target, current, address, 0); } return retval; } @@ -1360,8 +1377,8 @@ int gdb_breakpoint_watchpoint_packet(connection_t *connection, target_t *target, int type; enum breakpoint_type bp_type = BKPT_SOFT /* dummy init to avoid warning */; enum watchpoint_rw wp_type; - u32 address; - u32 size; + uint32_t address; + uint32_t size; char *separator; int retval; @@ -1523,12 +1540,12 @@ static int decode_xfer_read(char *buf, char **annex, int *ofs, unsigned int *len int gdb_calc_blocksize(flash_bank_t *bank) { - int i; - int block_size = 0xffffffff; + uint32_t i; + uint32_t block_size = 0xffffffff; /* loop through all sectors and return smallest sector size */ - for (i = 0; i < bank->num_sectors; i++) + for (i = 0; i < (uint32_t)bank->num_sectors; i++) { if (bank->sectors[i].size < block_size) block_size = bank->sectors[i].size; @@ -1569,8 +1586,8 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i cmd = malloc((packet_size - 6)/2 + 1); for (i=0; i < (packet_size - 6)/2; i++) { - u32 tmp; - sscanf(packet + 6 + 2*i, "%2x", &tmp); + uint32_t tmp; + sscanf(packet + 6 + 2*i, "%2" SCNx32 , &tmp); cmd[i] = tmp; } cmd[(packet_size - 6)/2] = 0x0; @@ -1593,9 +1610,9 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i int retval; char gdb_reply[10]; char *separator; - u32 checksum; - u32 addr = 0; - u32 len = 0; + uint32_t checksum; + uint32_t addr = 0; + uint32_t len = 0; /* skip command character */ packet += 5; @@ -1614,7 +1631,7 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i if (retval == ERROR_OK) { - snprintf(gdb_reply, 10, "C%8.8x", checksum); + snprintf(gdb_reply, 10, "C%8.8" PRIx32 "", checksum); gdb_put_packet(connection, gdb_reply, 9); } else @@ -1700,7 +1717,7 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i qsort(banks, flash_get_bank_count(), sizeof(flash_bank_t *), compare_bank); - u32 ram_start=0; + uint32_t ram_start=0; for (i=0; ibase, p->size, blocksize); ram_start=p->base+p->size; } - if (ram_start!=0) + if (ram_start != 0) { xml_printf(&retval, &xml, &pos, &size, "\n", ram_start, 0-ram_start); @@ -1901,7 +1918,7 @@ int gdb_v_packet(connection_t *connection, target_t *target, char *packet, int p } /* create new section with content from packet buffer */ - if((retval = image_add_section(gdb_connection->vflash_image, addr, length, 0x0, (u8*)parse)) != ERROR_OK) + if ((retval = image_add_section(gdb_connection->vflash_image, addr, length, 0x0, (uint8_t*)parse)) != ERROR_OK) { return retval; } @@ -1913,7 +1930,7 @@ int gdb_v_packet(connection_t *connection, target_t *target, char *packet, int p if (!strcmp(packet, "vFlashDone")) { - u32 written; + uint32_t written; /* process the flashing buffer. No need to erase as GDB * always issues a vFlashErase first. */ @@ -1929,7 +1946,7 @@ int gdb_v_packet(connection_t *connection, target_t *target, char *packet, int p } else { - LOG_DEBUG("wrote %u bytes from vFlash image to flash", written); + LOG_DEBUG("wrote %u bytes from vFlash image to flash", (unsigned)written); gdb_put_packet(connection, "OK", 2); } @@ -1947,7 +1964,7 @@ int gdb_v_packet(connection_t *connection, target_t *target, char *packet, int p int gdb_detach(connection_t *connection, target_t *target) { - switch( detach_mode ) + switch ( detach_mode ) { case GDB_DETACH_RESUME: target_handle_event( target, TARGET_EVENT_OLD_pre_resume ); @@ -2019,12 +2036,12 @@ int gdb_input_inner(connection_t *connection) /* terminate with zero */ packet[packet_size] = 0; - if( LOG_LEVEL_IS( LOG_LVL_DEBUG ) ){ - if( packet[0] == 'X' ){ + if ( LOG_LEVEL_IS( LOG_LVL_DEBUG ) ){ + if ( packet[0] == 'X' ){ // binary packets spew junk into the debug log stream char buf[ 50 ]; int x; - for( x = 0 ; (x < 49) && (packet[x] != ':') ; x++ ){ + for ( x = 0 ; (x < 49) && (packet[x] != ':') ; x++ ){ buf[x] = packet[x]; } buf[x] = 0; @@ -2092,7 +2109,7 @@ int gdb_input_inner(connection_t *connection) log_add_callback(gdb_log_callback, connection); target_call_event_callbacks(target, TARGET_EVENT_GDB_START); int retval=gdb_step_continue_packet(connection, target, packet, packet_size); - if (retval!=ERROR_OK) + if (retval != ERROR_OK) { /* we'll never receive a halted condition... issue a false one.. */ gdb_frontend_halted(target, connection); @@ -2160,7 +2177,7 @@ int gdb_input(connection_t *connection) if (retval == ERROR_SERVER_REMOTE_CLOSED) return retval; - /* logging does not propagate the error, yet can set th gdb_con->closed flag */ + /* logging does not propagate the error, yet can set the gdb_con->closed flag */ if (gdb_con->closed) return ERROR_SERVER_REMOTE_CLOSED; @@ -2179,32 +2196,38 @@ int gdb_init(void) return ERROR_OK; } - if (gdb_port == 0) + if (gdb_port == 0 && server_use_pipes == 0) { - LOG_WARNING("no gdb port specified, using default port 3333"); - gdb_port = 3333; + LOG_INFO("gdb port disabled"); + return ERROR_OK; } - while (target) + if (server_use_pipes) { - char service_name[8]; - - snprintf(service_name, 8, "gdb-%2.2i", target->target_number); + /* only a single gdb connection when using a pipe */ gdb_service = malloc(sizeof(gdb_service_t)); gdb_service->target = target; - add_service("gdb", CONNECTION_GDB, - gdb_port + target->target_number, - 1, gdb_new_connection, gdb_input, - gdb_connection_closed, - gdb_service); + add_service("gdb", CONNECTION_PIPE, 0, 1, gdb_new_connection, gdb_input, gdb_connection_closed, gdb_service); - LOG_DEBUG("gdb service for target %s at port %i", - target->type->name, - gdb_port + target->target_number); + LOG_DEBUG("gdb service for target %s using pipes", + target_get_name(target)); + } + else + { + while (target) + { + gdb_service = malloc(sizeof(gdb_service_t)); + gdb_service->target = target; + + add_service("gdb", CONNECTION_TCP, gdb_port + target->target_number, 1, gdb_new_connection, gdb_input, gdb_connection_closed, gdb_service); - target = target->next; + LOG_DEBUG("gdb service for target %s at port %i", + target_get_name(target), + gdb_port + target->target_number); + target = target->next; + } } return ERROR_OK; @@ -2354,23 +2377,20 @@ int handle_gdb_breakpoint_override_command(struct command_context_s *cmd_ctx, ch return ERROR_OK; } - int gdb_register_commands(command_context_t *command_context) { register_command(command_context, NULL, "gdb_port", handle_gdb_port_command, - COMMAND_CONFIG, "daemon configuration command gdb_port"); + COMMAND_ANY, "daemon configuration command gdb_port"); register_command(command_context, NULL, "gdb_detach", handle_gdb_detach_command, - COMMAND_CONFIG, ""); + COMMAND_CONFIG, "resume/reset/halt/nothing - " + "specify behavior when GDB detaches from the target"); register_command(command_context, NULL, "gdb_memory_map", handle_gdb_memory_map_command, COMMAND_CONFIG, "enable or disable memory map"); register_command(command_context, NULL, "gdb_flash_program", handle_gdb_flash_program_command, COMMAND_CONFIG, "enable or disable flash program"); register_command(command_context, NULL, "gdb_report_data_abort", handle_gdb_report_data_abort_command, - COMMAND_CONFIG, "enable or disable report data"); + COMMAND_CONFIG, "enable or disable reporting data aborts"); register_command(command_context, NULL, "gdb_breakpoint_override", handle_gdb_breakpoint_override_command, - COMMAND_EXEC, "hard/soft/disabled - force breakpoint type for gdb 'break' commands." - "The raison d'etre for this option is to support GDB GUI's without " - "a hard/soft breakpoint concept where the default OpenOCD behaviour " - "is not sufficient"); + COMMAND_EXEC, "hard/soft/disable - force breakpoint type for gdb 'break' commands."); return ERROR_OK; }