X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fserver%2Fgdb_server.c;h=59ce46472b240a90ee5686c3104530688fd6e265;hb=b38f2bb60e4effd4ed0f6f611603593aeea4eec5;hp=a81b3345f796c79147be0fc54f8024aa9f7689ca;hpb=7de7bc80fcca79e72c45040dc0ff3467e4b10dea;p=openocd.git diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c index a81b3345f7..59ce46472b 100644 --- a/src/server/gdb_server.c +++ b/src/server/gdb_server.c @@ -2,6 +2,9 @@ * Copyright (C) 2005 by Dominic Rath * * Dominic.Rath@gmx.de * * * + * Copyright (C) 2007,2008 Øyvind Harboe * + * oyvind.harboe@zylin.com * + * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * @@ -63,8 +66,10 @@ enum gdb_detach_mode detach_mode = GDB_DETACH_RESUME; /* set if we are sending a memory map to gdb * via qXfer:memory-map:read packet */ -int gdb_use_memory_map = 0; -int gdb_flash_program = 0; +/* enabled by default*/ +int gdb_use_memory_map = 1; +/* enabled by default*/ +int gdb_flash_program = 1; /* if set, data aborts cause an error to be reported in memory read packets * see the code in gdb_read_memory_packet() for further explanations */ @@ -85,12 +90,11 @@ int gdb_last_signal(target_t *target) case DBG_REASON_NOTHALTED: return 0x0; /* no signal... shouldn't happen */ default: - USER("undefined debug reason %d - target needs reset", target->debug_reason); + LOG_USER("undefined debug reason %d - target needs reset", target->debug_reason); return 0x0; } } -#ifndef _WIN32 int check_pending(connection_t *connection, int timeout_s, int *got_data) { /* a non-blocking socket will block if there is 0 bytes available on the socket, @@ -131,7 +135,6 @@ int check_pending(connection_t *connection, int timeout_s, int *got_data) *got_data=FD_ISSET(connection->fd, &read_fds)!=0; return ERROR_OK; } -#endif int gdb_get_char(connection_t *connection, int* next_char) { @@ -151,7 +154,7 @@ int gdb_get_char(connection_t *connection, int* next_char) connection->input_pending = 0; #ifdef _DEBUG_GDB_IO_ - DEBUG("returned char '%c' (0x%2.2x)", *next_char, *next_char); + LOG_DEBUG("returned char '%c' (0x%2.2x)", *next_char, *next_char); #endif return ERROR_OK; @@ -159,11 +162,9 @@ int gdb_get_char(connection_t *connection, int* next_char) for (;;) { -#ifndef _WIN32 retval=check_pending(connection, 1, NULL); if (retval!=ERROR_OK) return retval; -#endif gdb_con->buf_cnt = read_socket(connection->fd, gdb_con->buffer, GDB_BUFFER_SIZE); if (gdb_con->buf_cnt > 0) { @@ -190,7 +191,7 @@ int gdb_get_char(connection_t *connection, int* next_char) gdb_con->closed = 1; return ERROR_SERVER_REMOTE_CLOSED; default: - ERROR("read: %d", errno); + LOG_ERROR("read: %d", errno); exit(-1); } #else @@ -206,7 +207,7 @@ int gdb_get_char(connection_t *connection, int* next_char) gdb_con->closed = 1; return ERROR_SERVER_REMOTE_CLOSED; default: - ERROR("read: %s", strerror(errno)); + LOG_ERROR("read: %s", strerror(errno)); gdb_con->closed = 1; return ERROR_SERVER_REMOTE_CLOSED; } @@ -217,7 +218,7 @@ int gdb_get_char(connection_t *connection, int* next_char) debug_buffer = malloc(gdb_con->buf_cnt + 1); memcpy(debug_buffer, gdb_con->buffer, gdb_con->buf_cnt); debug_buffer[gdb_con->buf_cnt] = 0; - DEBUG("received '%s'", debug_buffer); + LOG_DEBUG("received '%s'", debug_buffer); free(debug_buffer); #endif @@ -229,7 +230,7 @@ int gdb_get_char(connection_t *connection, int* next_char) else connection->input_pending = 0; #ifdef _DEBUG_GDB_IO_ - DEBUG("returned char '%c' (0x%2.2x)", *next_char, *next_char); + LOG_DEBUG("returned char '%c' (0x%2.2x)", *next_char, *next_char); #endif return retval; @@ -246,7 +247,7 @@ int gdb_putback_char(connection_t *connection, int last_char) } else { - ERROR("BUG: couldn't put character back"); + LOG_ERROR("BUG: couldn't put character back"); } return ERROR_OK; @@ -289,7 +290,6 @@ int gdb_put_packet_inner(connection_t *connection, char *buffer, int len) * however sometimes '-' is sent even though we've already received * an ACK (+) for everything we've sent off. */ -#ifndef _WIN32 int gotdata; for (;;) { @@ -299,9 +299,8 @@ int gdb_put_packet_inner(connection_t *connection, char *buffer, int len) break; if ((retval = gdb_get_char(connection, &reply)) != ERROR_OK) return retval; - WARNING("Discard unexpected char %c", reply); + LOG_WARNING("Discard unexpected char %c", reply); } -#endif #endif while (1) @@ -310,7 +309,7 @@ int gdb_put_packet_inner(connection_t *connection, char *buffer, int len) debug_buffer = malloc(len + 1); memcpy(debug_buffer, buffer, len); debug_buffer[len] = 0; - DEBUG("sending packet '$%s#%2.2x'", debug_buffer, my_checksum); + LOG_DEBUG("sending packet '$%s#%2.2x'", debug_buffer, my_checksum); free(debug_buffer); #endif @@ -346,7 +345,7 @@ int gdb_put_packet_inner(connection_t *connection, char *buffer, int len) { /* Stop sending output packets for now */ log_remove_callback(gdb_log_callback, connection); - WARNING("negative reply, retrying"); + LOG_WARNING("negative reply, retrying"); } else if (reply == 0x3) { @@ -359,18 +358,18 @@ int gdb_put_packet_inner(connection_t *connection, char *buffer, int len) { /* Stop sending output packets for now */ log_remove_callback(gdb_log_callback, connection); - WARNING("negative reply, retrying"); + LOG_WARNING("negative reply, retrying"); } else { - ERROR("unknown character 0x%2.2x in reply, dropping connection", reply); + LOG_ERROR("unknown character 0x%2.2x in reply, dropping connection", reply); gdb_con->closed=1; return ERROR_SERVER_REMOTE_CLOSED; } } else { - ERROR("unknown character 0x%2.2x in reply, dropping connection", reply); + LOG_ERROR("unknown character 0x%2.2x in reply, dropping connection", reply); gdb_con->closed=1; return ERROR_SERVER_REMOTE_CLOSED; } @@ -407,7 +406,7 @@ int gdb_get_packet_inner(connection_t *connection, char *buffer, int *len) return retval; #ifdef _DEBUG_GDB_IO_ - DEBUG("character: '%c'", character); + LOG_DEBUG("character: '%c'", character); #endif switch (character) @@ -415,17 +414,19 @@ int gdb_get_packet_inner(connection_t *connection, char *buffer, int *len) case '$': break; case '+': - WARNING("acknowledgment received, but no packet pending"); + /* gdb sends a dummy ack '+' at every remote connect - see remote_start_remote (remote.c) + * incase anyone tries to debug why they receive this warning every time */ + LOG_WARNING("acknowledgment received, but no packet pending"); break; case '-': - WARNING("negative acknowledgment, but no packet pending"); + LOG_WARNING("negative acknowledgment, but no packet pending"); break; case 0x3: gdb_con->ctrl_c = 1; *len = 0; return ERROR_OK; default: - WARNING("ignoring character 0x%x", character); + LOG_WARNING("ignoring character 0x%x", character); break; } } while (character != '$'); @@ -486,7 +487,7 @@ int gdb_get_packet_inner(connection_t *connection, char *buffer, int *len) } if (count > *len) { - ERROR("packet buffer too small"); + LOG_ERROR("packet buffer too small"); return ERROR_GDB_BUFFER_TOO_SMALL; } @@ -530,7 +531,7 @@ int gdb_get_packet_inner(connection_t *connection, char *buffer, int *len) break; } - WARNING("checksum error, requesting retransmission"); + LOG_WARNING("checksum error, requesting retransmission"); gdb_write(connection, "-", 1); } if (gdb_con->closed) @@ -570,75 +571,67 @@ int gdb_output_con(connection_t *connection, const char* line) return ERROR_OK; } -int gdb_output(struct command_context_s *context, char* line) +int gdb_output(struct command_context_s *context, const char* line) { /* this will be dumped to the log and also sent as an O packet if possible */ - USER_N("%s", line); + LOG_USER_N("%s", line); return ERROR_OK; } int gdb_program_handler(struct target_s *target, enum target_event event, void *priv) { - FILE *script; struct command_context_s *cmd_ctx = priv; - if (target->gdb_program_script) + target_invoke_script(cmd_ctx, target, "gdb_program"); + jtag_execute_queue(); + + return ERROR_OK; +} + +static void gdb_frontend_halted(struct target_s *target, connection_t *connection) +{ + gdb_connection_t *gdb_connection = connection->priv; + + /* In the GDB protocol when we are stepping or coninuing execution, + * we have a lingering reply. Upon receiving a halted event + * when we have that lingering packet, we reply to the original + * step or continue packet. + * + * Executing monitor commands can bring the target in and + * out of the running state so we'll see lots of TARGET_EVENT_XXX + * that are to be ignored. + */ + if (gdb_connection->frontend_state == TARGET_RUNNING) { - script = open_file_from_path(target->gdb_program_script, "r"); - if (!script) + char sig_reply[4]; + int signal; + /* stop forwarding log packets! */ + log_remove_callback(gdb_log_callback, connection); + + if (gdb_connection->ctrl_c) { - ERROR("couldn't open script file %s", target->gdb_program_script); - return ERROR_OK; + signal = 0x2; + gdb_connection->ctrl_c = 0; + } + else + { + signal = gdb_last_signal(target); } - INFO("executing gdb_program script '%s'", target->gdb_program_script); - command_run_file(cmd_ctx, script, COMMAND_EXEC); - fclose(script); - - jtag_execute_queue(); + snprintf(sig_reply, 4, "T%2.2x", signal); + gdb_put_packet(connection, sig_reply, 3); + gdb_connection->frontend_state = TARGET_HALTED; } - - return ERROR_OK; } int gdb_target_callback_event_handler(struct target_s *target, enum target_event event, void *priv) { connection_t *connection = priv; - gdb_connection_t *gdb_connection = connection->priv; - char sig_reply[4]; - int signal; switch (event) { case TARGET_EVENT_HALTED: - /* In the GDB protocol when we are stepping or coninuing execution, - * we have a lingering reply. Upon receiving a halted event - * when we have that lingering packet, we reply to the original - * step or continue packet. - * - * Executing monitor commands can bring the target in and - * out of the running state so we'll see lots of TARGET_EVENT_XXX - * that are to be ignored. - */ - if (gdb_connection->frontend_state == TARGET_RUNNING) - { - /* stop forwarding log packets! */ - log_remove_callback(gdb_log_callback, connection); - - if (gdb_connection->ctrl_c) - { - signal = 0x2; - gdb_connection->ctrl_c = 0; - } - else - { - signal = gdb_last_signal(target); - } - - snprintf(sig_reply, 4, "T%2.2x", signal); - gdb_put_packet(connection, sig_reply, 3); - gdb_connection->frontend_state = TARGET_HALTED; - } + gdb_frontend_halted(target, connection); break; case TARGET_EVENT_GDB_PROGRAM: gdb_program_handler(target, event, connection->cmd_ctx); @@ -694,7 +687,13 @@ int gdb_new_connection(connection_t *connection) * instantaneous and thus avoiding annoying timeout problems during * connect. */ - gdb_service->target->type->halt(gdb_service->target); + target_halt(gdb_service->target); + /* FIX!!!! could extended-remote work better here? + * + * wait a tiny bit for halted state or we just continue. The + * GDB register packet will then contain garbage + */ + target_wait_state(gdb_service->target, TARGET_HALTED, 500); /* remove the initial ACK from the incoming buffer */ if ((retval = gdb_get_char(connection, &initial_ack)) != ERROR_OK) @@ -732,7 +731,7 @@ int gdb_connection_closed(connection_t *connection) } else { - ERROR("BUG: connection->priv == NULL"); + LOG_ERROR("BUG: connection->priv == NULL"); } target_unregister_event_callback(gdb_target_callback_event_handler, connection); @@ -787,7 +786,7 @@ void gdb_target_to_str(target_t *target, char *tstr, char *str) if (str_len % 2) { - ERROR("BUG: gdb value with uneven number of characters encountered"); + LOG_ERROR("BUG: gdb value with uneven number of characters encountered"); exit(-1); } @@ -809,7 +808,7 @@ int gdb_get_registers_packet(connection_t *connection, target_t *target, char* p int i; #ifdef _DEBUG_GDB_IO_ - DEBUG("-"); + LOG_DEBUG("-"); #endif if ((retval = target->type->get_gdb_reg_list(target, ®_list, ®_list_size)) != ERROR_OK) @@ -835,7 +834,7 @@ int gdb_get_registers_packet(connection_t *connection, target_t *target, char* p { char *reg_packet_p; reg_packet_p = strndup(reg_packet, CEIL(reg_packet_size, 8) * 2); - DEBUG("reg_packet: %s", reg_packet_p); + LOG_DEBUG("reg_packet: %s", reg_packet_p); free(reg_packet_p); } #endif @@ -857,7 +856,7 @@ int gdb_set_registers_packet(connection_t *connection, target_t *target, char *p char *packet_p; #ifdef _DEBUG_GDB_IO_ - DEBUG("-"); + LOG_DEBUG("-"); #endif /* skip command character */ @@ -866,7 +865,7 @@ int gdb_set_registers_packet(connection_t *connection, target_t *target, char *p if (packet_size % 2) { - WARNING("GDB set_registers packet with uneven characters received, dropping connection"); + LOG_WARNING("GDB set_registers packet with uneven characters received, dropping connection"); return ERROR_SERVER_REMOTE_CLOSED; } @@ -894,7 +893,7 @@ int gdb_set_registers_packet(connection_t *connection, target_t *target, char *p arch_type = register_get_arch_type(reg_list[i]->arch_type); if (arch_type == NULL) { - ERROR("BUG: encountered unregistered arch type"); + LOG_ERROR("BUG: encountered unregistered arch type"); exit(-1); } arch_type->set(reg_list[i], bin_buf); @@ -923,7 +922,7 @@ int gdb_get_register_packet(connection_t *connection, target_t *target, char *pa int retval; #ifdef _DEBUG_GDB_IO_ - DEBUG("-"); + LOG_DEBUG("-"); #endif if ((retval = target->type->get_gdb_reg_list(target, ®_list, ®_list_size)) != ERROR_OK) @@ -933,7 +932,7 @@ int gdb_get_register_packet(connection_t *connection, target_t *target, char *pa if (reg_list_size <= reg_num) { - ERROR("gdb requested a non-existing register"); + LOG_ERROR("gdb requested a non-existing register"); exit(-1); } @@ -960,7 +959,7 @@ int gdb_set_register_packet(connection_t *connection, target_t *target, char *pa int retval; reg_arch_type_t *arch_type; - DEBUG("-"); + LOG_DEBUG("-"); if ((retval = target->type->get_gdb_reg_list(target, ®_list, ®_list_size)) != ERROR_OK) { @@ -969,13 +968,13 @@ int gdb_set_register_packet(connection_t *connection, target_t *target, char *pa if (reg_list_size < reg_num) { - ERROR("gdb requested a non-existing register"); + LOG_ERROR("gdb requested a non-existing register"); return ERROR_SERVER_REMOTE_CLOSED; } if (*separator != '=') { - ERROR("GDB 'set register packet', but no '=' following the register number"); + LOG_ERROR("GDB 'set register packet', but no '=' following the register number"); return ERROR_SERVER_REMOTE_CLOSED; } @@ -991,7 +990,7 @@ int gdb_set_register_packet(connection_t *connection, target_t *target, char *pa arch_type = register_get_arch_type(reg_list[reg_num]->arch_type); if (arch_type == NULL) { - ERROR("BUG: encountered unregistered arch type"); + LOG_ERROR("BUG: encountered unregistered arch type"); exit(-1); } arch_type->set(reg_list[reg_num], bin_buf); @@ -1023,7 +1022,7 @@ int gdb_error(connection_t *connection, int retval) break; default: /* This could be that the target reset itself. */ - ERROR("unexpected error %i", retval); + LOG_ERROR("unexpected error %i", retval); gdb_send_error(connection, EFAULT); break; } @@ -1054,7 +1053,7 @@ int gdb_read_memory_packet(connection_t *connection, target_t *target, char *pac if (*separator != ',') { - ERROR("incomplete read memory packet received, dropping connection"); + LOG_ERROR("incomplete read memory packet received, dropping connection"); return ERROR_SERVER_REMOTE_CLOSED; } @@ -1062,7 +1061,7 @@ int gdb_read_memory_packet(connection_t *connection, target_t *target, char *pac buffer = malloc(len); - DEBUG("addr: 0x%8.8x, len: 0x%8.8x", addr, len); + LOG_DEBUG("addr: 0x%8.8x, len: 0x%8.8x", addr, len); retval = target_read_buffer(target, addr, len, buffer); @@ -1128,7 +1127,7 @@ int gdb_write_memory_packet(connection_t *connection, target_t *target, char *pa if (*separator != ',') { - ERROR("incomplete write memory packet received, dropping connection"); + LOG_ERROR("incomplete write memory packet received, dropping connection"); return ERROR_SERVER_REMOTE_CLOSED; } @@ -1136,13 +1135,13 @@ int gdb_write_memory_packet(connection_t *connection, target_t *target, char *pa if (*(separator++) != ':') { - ERROR("incomplete write memory packet received, dropping connection"); + LOG_ERROR("incomplete write memory packet received, dropping connection"); return ERROR_SERVER_REMOTE_CLOSED; } buffer = malloc(len); - DEBUG("addr: 0x%8.8x, len: 0x%8.8x", addr, len); + LOG_DEBUG("addr: 0x%8.8x, len: 0x%8.8x", addr, len); for (i=0; i 1) { @@ -1234,14 +1234,16 @@ void gdb_step_continue_packet(connection_t *connection, target_t *target, char * if (packet[0] == 'c') { - DEBUG("continue"); - target->type->resume(target, current, address, 0, 0); /* resume at current address, don't handle breakpoints, not debugging */ + LOG_DEBUG("continue"); + target_invoke_script(connection->cmd_ctx, target, "pre_resume"); + retval=target_resume(target, current, address, 0, 0); /* resume at current address, don't handle breakpoints, not debugging */ } else if (packet[0] == 's') { - DEBUG("step"); - target->type->step(target, current, address, 0); /* step at current or address, don't handle breakpoints */ + LOG_DEBUG("step"); + retval=target->type->step(target, current, address, 0); /* step at current or address, don't handle breakpoints */ } + return retval; } int gdb_breakpoint_watchpoint_packet(connection_t *connection, target_t *target, char *packet, int packet_size) @@ -1254,7 +1256,7 @@ int gdb_breakpoint_watchpoint_packet(connection_t *connection, target_t *target, char *separator; int retval; - DEBUG("-"); + LOG_DEBUG("-"); type = strtoul(packet + 1, &separator, 16); @@ -1271,7 +1273,7 @@ int gdb_breakpoint_watchpoint_packet(connection_t *connection, target_t *target, if (*separator != ',') { - ERROR("incomplete breakpoint/watchpoint packet received, dropping connection"); + LOG_ERROR("incomplete breakpoint/watchpoint packet received, dropping connection"); return ERROR_SERVER_REMOTE_CLOSED; } @@ -1279,7 +1281,7 @@ int gdb_breakpoint_watchpoint_packet(connection_t *connection, target_t *target, if (*separator != ',') { - ERROR("incomplete breakpoint/watchpoint packet received, dropping connection"); + LOG_ERROR("incomplete breakpoint/watchpoint packet received, dropping connection"); return ERROR_SERVER_REMOTE_CLOSED; } @@ -1421,6 +1423,24 @@ int gdb_calc_blocksize(flash_bank_t *bank) return block_size; } +static int compare_bank (const void * a, const void * b) +{ + flash_bank_t *b1, *b2; + b1=*((flash_bank_t **)a); + b2=*((flash_bank_t **)b); + + if (b1->base==b2->base) + { + return 0; + } else if (b1->base>b2->base) + { + return 1; + } else + { + return -1; + } +} + int gdb_query_packet(connection_t *connection, target_t *target, char *packet, int packet_size) { command_context_t *cmd_ctx = connection->cmd_ctx; @@ -1469,7 +1489,7 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i if (*separator != ',') { - ERROR("incomplete read memory packet received, dropping connection"); + LOG_ERROR("incomplete read memory packet received, dropping connection"); return ERROR_SERVER_REMOTE_CLOSED; } @@ -1502,7 +1522,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-", - (GDB_BUFFER_SIZE - 1), gdb_use_memory_map == 1 ? '+' : '-'); + (GDB_BUFFER_SIZE - 1), ((gdb_use_memory_map == 1)&&(flash_get_bank_count()>0)) ? '+' : '-'); if (retval != ERROR_OK) { @@ -1515,7 +1535,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::")) + 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 @@ -1541,23 +1561,63 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i length = strtoul(separator + 1, &separator, 16); xml_printf(&retval, &xml, &pos, &size, "\n"); - + + /* + sort banks in ascending order, we need to make non-flash memory be ram(or rather + 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()); int i; + for (i=0; ibase) + { + xml_printf(&retval, &xml, &pos, &size, "\n", + ram_start, p->base-ram_start); + } + /* if device has uneven sector sizes, eg. str7, lpc * we pass the smallest sector size to gdb memory map */ blocksize = gdb_calc_blocksize(p); - + xml_printf(&retval, &xml, &pos, &size, "\n" \ "0x%x\n" \ "\n", \ p->base, p->size, blocksize); + ram_start=p->base+p->size; + } + if (ram_start!=0) + { + xml_printf(&retval, &xml, &pos, &size, "\n", + ram_start, 0-ram_start); + } else + { + /* a flash chip could be at the very end of the 32 bit address space, in which case + ram_start will be precisely 0 */ } + + free(banks); + banks = NULL; xml_printf(&retval, &xml, &pos, &size, "\n"); @@ -1616,7 +1676,7 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i return retval; } - gdb_put_packet(connection, xml, strlen(xml) + 1); + gdb_put_packet(connection, xml, strlen(xml)); free(xml); return ERROR_OK; @@ -1648,7 +1708,7 @@ int gdb_v_packet(connection_t *connection, target_t *target, char *packet, int p char *parse = packet + 12; if (*parse == '\0') { - ERROR("incomplete vFlashErase packet received, dropping connection"); + LOG_ERROR("incomplete vFlashErase packet received, dropping connection"); return ERROR_SERVER_REMOTE_CLOSED; } @@ -1656,7 +1716,7 @@ int gdb_v_packet(connection_t *connection, target_t *target, char *packet, int p if (*(parse++) != ',' || *parse == '\0') { - ERROR("incomplete vFlashErase packet received, dropping connection"); + LOG_ERROR("incomplete vFlashErase packet received, dropping connection"); return ERROR_SERVER_REMOTE_CLOSED; } @@ -1664,7 +1724,7 @@ int gdb_v_packet(connection_t *connection, target_t *target, char *packet, int p if (*parse != '\0') { - ERROR("incomplete vFlashErase packet received, dropping connection"); + LOG_ERROR("incomplete vFlashErase packet received, dropping connection"); return ERROR_SERVER_REMOTE_CLOSED; } @@ -1682,7 +1742,7 @@ int gdb_v_packet(connection_t *connection, target_t *target, char *packet, int p * treat a failed erase as an I/O error */ gdb_send_error(connection, EIO); - ERROR("flash_erase returned %i", result); + LOG_ERROR("flash_erase returned %i", result); } else gdb_put_packet(connection, "OK", 2); @@ -1698,13 +1758,13 @@ int gdb_v_packet(connection_t *connection, target_t *target, char *packet, int p if (*parse == '\0') { - ERROR("incomplete vFlashErase packet received, dropping connection"); + LOG_ERROR("incomplete vFlashErase packet received, dropping connection"); return ERROR_SERVER_REMOTE_CLOSED; } addr = strtoul(parse, &parse, 16); if (*(parse++) != ':') { - ERROR("incomplete vFlashErase packet received, dropping connection"); + LOG_ERROR("incomplete vFlashErase packet received, dropping connection"); return ERROR_SERVER_REMOTE_CLOSED; } length = packet_size - (parse - packet); @@ -1739,7 +1799,7 @@ int gdb_v_packet(connection_t *connection, target_t *target, char *packet, int p } else { - DEBUG("wrote %u bytes from vFlash image to flash", written); + LOG_DEBUG("wrote %u bytes from vFlash image to flash", written); gdb_put_packet(connection, "OK", 2); } @@ -1759,15 +1819,17 @@ int gdb_detach(connection_t *connection, target_t *target) switch( detach_mode ) { case GDB_DETACH_RESUME: - target->type->resume(target, 1, 0, 1, 0); + target_invoke_script(connection->cmd_ctx, target, "pre_resume"); + target_resume(target, 1, 0, 1, 0); break; case GDB_DETACH_RESET: - target_process_reset(connection->cmd_ctx); + /* FIX?? make this configurable?? */ + target_process_reset(connection->cmd_ctx, RESET_HALT); break; case GDB_DETACH_HALT: - target->type->halt(target); + target_halt(target); break; case GDB_DETACH_NOTHING: @@ -1794,11 +1856,22 @@ static void gdb_log_callback(void *priv, const char *file, int line, gdb_output_con(connection, string); } +/* Do not allocate this on the stack */ +char gdb_packet_buffer[GDB_BUFFER_SIZE]; + +static void gdb_sig_halted(connection_t *connection) +{ + char sig_reply[4]; + snprintf(sig_reply, 4, "T%2.2x", 2); + gdb_put_packet(connection, sig_reply, 3); + +} + int gdb_input_inner(connection_t *connection) { gdb_service_t *gdb_service = connection->service->priv; target_t *target = gdb_service->target; - char packet[GDB_BUFFER_SIZE]; + char *packet=gdb_packet_buffer; int packet_size; int retval; gdb_connection_t *gdb_con = connection->priv; @@ -1816,7 +1889,7 @@ int gdb_input_inner(connection_t *connection) /* terminate with zero */ packet[packet_size] = 0; - DEBUG("received packet: '%s'", packet); + LOG_DEBUG("received packet: '%s'", packet); if (packet_size > 0) { @@ -1859,12 +1932,27 @@ int gdb_input_inner(connection_t *connection) case 'c': case 's': { - /* We're running/stepping, in which case we can - * forward log output until the target is halted */ - gdb_connection_t *gdb_con = connection->priv; - gdb_con->frontend_state = TARGET_RUNNING; - log_add_callback(gdb_log_callback, connection); - gdb_step_continue_packet(connection, target, packet, packet_size); + if (target->state != TARGET_HALTED) + { + /* If the target isn't in the halted state, then we can't + * step/continue. This might be early setup, etc. + */ + gdb_sig_halted(connection); + } else + { + /* We're running/stepping, in which case we can + * forward log output until the target is halted + */ + gdb_connection_t *gdb_con = connection->priv; + gdb_con->frontend_state = TARGET_RUNNING; + log_add_callback(gdb_log_callback, connection); + 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); + } + } } break; case 'v': @@ -1890,11 +1978,11 @@ int gdb_input_inner(connection_t *connection) break; case 'R': /* handle extended restart packet */ - target_process_reset(connection->cmd_ctx); + command_run_linef(connection->cmd_ctx, "ocd_gdb_restart %d", get_num_by_target(target)); break; default: /* ignore unkown packets */ - DEBUG("ignoring 0x%2.2x packet", packet[0]); + LOG_DEBUG("ignoring 0x%2.2x packet", packet[0]); gdb_put_packet(connection, NULL, 0); break; } @@ -1908,7 +1996,7 @@ int gdb_input_inner(connection_t *connection) { if (target->state == TARGET_RUNNING) { - target->type->halt(target); + target_halt(target); gdb_con->ctrl_c = 0; } } @@ -1933,7 +2021,7 @@ int gdb_input(connection_t *connection) return ERROR_OK; } -int gdb_init() +int gdb_init(void) { gdb_service_t *gdb_service; target_t *target = targets; @@ -1941,13 +2029,13 @@ int gdb_init() if (!target) { - WARNING("no gdb ports allocated as no target has been specified"); + LOG_WARNING("no gdb ports allocated as no target has been specified"); return ERROR_OK; } if (gdb_port == 0) { - WARNING("no gdb port specified, using default port 3333"); + LOG_WARNING("no gdb port specified, using default port 3333"); gdb_port = 3333; } @@ -1962,7 +2050,7 @@ int gdb_init() add_service("gdb", CONNECTION_GDB, gdb_port + i, 1, gdb_new_connection, gdb_input, gdb_connection_closed, gdb_service); - DEBUG("gdb service for target %s at port %i", target->type->name, gdb_port + i); + LOG_DEBUG("gdb service for target %s at port %i", target->type->name, gdb_port + i); i++; target = target->next; @@ -2010,7 +2098,7 @@ int handle_gdb_detach_command(struct command_context_s *cmd_ctx, char *cmd, char } } - WARNING("invalid gdb_detach configuration directive: %s", args[0]); + LOG_WARNING("invalid gdb_detach configuration directive: %s", args[0]); return ERROR_OK; } @@ -2030,7 +2118,7 @@ int handle_gdb_memory_map_command(struct command_context_s *cmd_ctx, char *cmd, } } - WARNING("invalid gdb_memory_map configuration directive: %s", args[0]); + LOG_WARNING("invalid gdb_memory_map configuration directive: %s", args[0]); return ERROR_OK; } @@ -2050,7 +2138,7 @@ int handle_gdb_flash_program_command(struct command_context_s *cmd_ctx, char *cm } } - WARNING("invalid gdb_memory_map configuration directive: %s", args[0]); + LOG_WARNING("invalid gdb_memory_map configuration directive: %s", args[0]); return ERROR_OK; } @@ -2070,7 +2158,7 @@ int handle_gdb_report_data_abort_command(struct command_context_s *cmd_ctx, char } } - WARNING("invalid gdb_report_data_abort configuration directive: %s", args[0]); + LOG_WARNING("invalid gdb_report_data_abort configuration directive: %s", args[0]); return ERROR_OK; }