X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fserver%2Fgdb_server.c;h=fc7a2821d1fda077eb24e4beb24ea1ac800fdea8;hp=bf11be1a02b9f7a11b0bf0fd5d59481fd389231d;hb=6d1d58a1fc3dfd60e9cac89460b5a6e438d11efa;hpb=9af5e445b796f3b4a51d41f9d2eeaf1f5cd78e3b diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c index bf11be1a02..fc7a2821d1 100644 --- a/src/server/gdb_server.c +++ b/src/server/gdb_server.c @@ -105,11 +105,11 @@ int check_pending(connection_t *connection, int timeout_s, int *got_data) fd_set read_fds; gdb_connection_t *gdb_con = connection->priv; int t; - if (got_data==NULL) + if (got_data == NULL) got_data=&t; - *got_data=0; + *got_data = 0; - if (gdb_con->buf_cnt>0) + if (gdb_con->buf_cnt > 0) { *got_data = 1; return ERROR_OK; @@ -125,7 +125,7 @@ int check_pending(connection_t *connection, int timeout_s, int *got_data) /* This can typically be because a "monitor" command took too long * before printing any progress messages */ - if (timeout_s>0) + if (timeout_s > 0) { return ERROR_GDB_TIMEOUT; } else @@ -133,14 +133,14 @@ 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; } int gdb_get_char(connection_t *connection, int* next_char) { gdb_connection_t *gdb_con = connection->priv; - int retval=ERROR_OK; + int retval = ERROR_OK; #ifdef _DEBUG_GDB_IO_ char *debug_buffer; @@ -313,7 +313,7 @@ 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; @@ -345,7 +345,7 @@ int gdb_put_packet_inner(connection_t *connection, char *buffer, int len) 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++); + memcpy(local_buffer + 1, buffer, len++); local_buffer[len++] = '#'; local_buffer[len++] = DIGITS[(my_checksum >> 4) & 0xf]; local_buffer[len++] = DIGITS[my_checksum & 0xf]; @@ -369,7 +369,7 @@ int gdb_put_packet_inner(connection_t *connection, char *buffer, int len) { 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; } @@ -409,7 +409,7 @@ int gdb_put_packet_inner(connection_t *connection, char *buffer, int len) } else { LOG_ERROR("unknown character(1) 0x%2.2x in reply, dropping connection", reply); - gdb_con->closed=1; + gdb_con->closed = 1; return ERROR_SERVER_REMOTE_CLOSED; } } @@ -421,7 +421,7 @@ int gdb_put_packet_inner(connection_t *connection, char *buffer, int len) else { LOG_ERROR("unknown character(2) 0x%2.2x in reply, dropping connection", reply); - gdb_con->closed=1; + gdb_con->closed = 1; return ERROR_SERVER_REMOTE_CLOSED; } } @@ -461,7 +461,7 @@ static __inline__ int fetch_packet(connection_t *connection, int *checksum_ok, i * We need to leave at least 2 bytes in the buffer to have * gdb_get_char() update various bits and bobs correctly. */ - if ((gdb_con->buf_cnt > 2) && ((gdb_con->buf_cnt+count) < *len)) + if ((gdb_con->buf_cnt > 2) && ((gdb_con->buf_cnt + count) < *len)) { /* The compiler will struggle a bit with constant propagation and * aliasing, so we help it by showing that these values do not @@ -547,7 +547,7 @@ static __inline__ int fetch_packet(connection_t *connection, int *checksum_ok, i if (!noack) { - *checksum_ok=(my_checksum == strtoul(checksum, NULL, 16)); + *checksum_ok = (my_checksum == strtoul(checksum, NULL, 16)); } return ERROR_OK; @@ -600,11 +600,11 @@ int gdb_get_packet_inner(connection_t *connection, char *buffer, int *len) */ 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; } @@ -649,9 +649,9 @@ int gdb_output_con(connection_t *connection, const char* line) return ERROR_GDB_BUFFER_TOO_SMALL; hex_buffer[0] = 'O'; - for (i=0; i>4) & 0xf]; - tstr[i*2+1] = DIGITS[buf[j]&0xf]; + tstr[i*2 + 1] = DIGITS[buf[j]&0xf]; } } @@ -904,7 +904,7 @@ static int hextoint(char c) { return c-'0'; } - c=toupper(c); + c = toupper(c); if (c>='A'&&c<='F') { return c-'A'+10; @@ -923,10 +923,10 @@ void gdb_target_to_reg(target_t *target, char *tstr, int str_len, uint8_t *bin) } int i; - for (i = 0; i < str_len; i+=2) + for (i = 0; i < str_len; i += 2) { - uint8_t t = hextoint(tstr[i])<<4; - t |= hextoint(tstr[i+1]); + 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; @@ -1182,7 +1182,7 @@ int gdb_read_memory_packet(connection_t *connection, target_t *target, char *pac return ERROR_SERVER_REMOTE_CLOSED; } - len = strtoul(separator+1, NULL, 16); + len = strtoul(separator + 1, NULL, 16); buffer = malloc(len); @@ -1190,7 +1190,7 @@ int gdb_read_memory_packet(connection_t *connection, target_t *target, char *pac 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. @@ -1199,7 +1199,7 @@ int gdb_read_memory_packet(connection_t *connection, target_t *target, char *pac * gained by involving the user in this problem that hopefully will get resolved * eventually * - * http://sourceware.org/cgi-bin/gnatsweb.pl?cmd=view%20audit-trail&database=gdb&pr=2395 + * http://sourceware.org/cgi-bin/gnatsweb.pl?cmd = view%20audit-trail&database = gdb&pr = 2395 * * For now, the default is to fix up things to make current GDB versions work. * This can be overwritten using the gdb_report_data_abort <'enable'|'disable'> command. @@ -1256,7 +1256,7 @@ int gdb_write_memory_packet(connection_t *connection, target_t *target, char *pa return ERROR_SERVER_REMOTE_CLOSED; } - len = strtoul(separator+1, &separator, 16); + len = strtoul(separator + 1, &separator, 16); if (*(separator++) != ':') { @@ -1268,7 +1268,7 @@ int gdb_write_memory_packet(connection_t *connection, target_t *target, char *pa LOG_DEBUG("addr: 0x%8.8" PRIx32 ", len: 0x%8.8" PRIx32 "", addr, len); - for (i=0; ibase==b2->base) + if (b1->base == b2->base) { return 0; - } else if (b1->base>b2->base) + } else if (b1->base > b2->base) { return 1; } else @@ -1584,7 +1584,7 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i char *cmd; int i; cmd = malloc((packet_size - 6)/2 + 1); - for (i=0; i < (packet_size - 6)/2; i++) + for (i = 0; i < (packet_size - 6)/2; i++) { uint32_t tmp; sscanf(packet + 6 + 2*i, "%2" SCNx32 , &tmp); @@ -1654,7 +1654,7 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i xml_printf(&retval, &buffer, &pos, &size, "PacketSize=%x;qXfer:memory-map:read%c;qXfer:features:read-;QStartNoAckMode+", - (GDB_BUFFER_SIZE - 1), ((gdb_use_memory_map == 1)&&(flash_get_bank_count()>0)) ? '+' : '-'); + (GDB_BUFFER_SIZE - 1), ((gdb_use_memory_map == 1) && (flash_get_bank_count() > 0)) ? '+' : '-'); if (retval != ERROR_OK) { @@ -1667,7 +1667,7 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i return ERROR_OK; } - else if (strstr(packet, "qXfer:memory-map:read::")&&(flash_get_bank_count()>0)) + else if (strstr(packet, "qXfer:memory-map:read::") && (flash_get_bank_count() > 0)) { /* We get away with only specifying flash here. Regions that are not * specified are treated as if we provided no memory map(if not we @@ -1699,10 +1699,10 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i read/write) by default for GDB. GDB does not have a concept of non-cacheable read/write memory. */ - flash_bank_t **banks=malloc(sizeof(flash_bank_t *)*flash_get_bank_count()); + flash_bank_t **banks = malloc(sizeof(flash_bank_t *)*flash_get_bank_count()); int i; - for (i=0; ibase) + if (ram_start < p->base) { xml_printf(&retval, &xml, &pos, &size, "\n", ram_start, p->base-ram_start); @@ -1736,9 +1736,9 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i "0x%x\n" \ "\n", \ p->base, p->size, blocksize); - ram_start=p->base+p->size; + 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); @@ -1800,7 +1800,7 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i } xml_printf(&retval, &xml, &pos, &size, \ - "l\narm\n\n"); + "l < target version=\"1.0\">\n < architecture > arm\n\n"); if (retval != ERROR_OK) { @@ -2018,7 +2018,7 @@ int gdb_input_inner(connection_t *connection) { gdb_service_t *gdb_service = connection->service->priv; target_t *target = gdb_service->target; - char *packet=gdb_packet_buffer; + char *packet = gdb_packet_buffer; int packet_size; int retval; gdb_connection_t *gdb_con = connection->priv; @@ -2041,7 +2041,7 @@ int gdb_input_inner(connection_t *connection) // 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; @@ -2108,8 +2108,8 @@ int gdb_input_inner(connection_t *connection) gdb_con->frontend_state = TARGET_RUNNING; 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) + int retval = gdb_step_continue_packet(connection, target, packet, packet_size); + if (retval != ERROR_OK) { /* we'll never receive a halted condition... issue a false one.. */ gdb_frontend_halted(target, connection); @@ -2349,15 +2349,15 @@ int handle_gdb_breakpoint_override_command(struct command_context_s *cmd_ctx, ch if (argc == 0) { - } else if (argc==1) + } else if (argc == 1) { gdb_breakpoint_override = 1; - if (strcmp(args[0], "hard")==0) + if (strcmp(args[0], "hard") == 0) { - gdb_breakpoint_override_type=BKPT_HARD; - } else if (strcmp(args[0], "soft")==0) + gdb_breakpoint_override_type = BKPT_HARD; + } else if (strcmp(args[0], "soft") == 0) { - gdb_breakpoint_override_type=BKPT_SOFT; + gdb_breakpoint_override_type = BKPT_SOFT; } else if (strcmp(args[0], "disable") == 0) { gdb_breakpoint_override = 0; @@ -2368,7 +2368,7 @@ int handle_gdb_breakpoint_override_command(struct command_context_s *cmd_ctx, ch } if (gdb_breakpoint_override) { - LOG_USER("force %s breakpoints", (gdb_breakpoint_override_type==BKPT_HARD)?"hard":"soft"); + LOG_USER("force %s breakpoints", (gdb_breakpoint_override_type == BKPT_HARD)?"hard":"soft"); } else { LOG_USER("breakpoint type is not overriden");