From e2b6de3d66bae70cb08fea17f5b66ee875dbb636 Mon Sep 17 00:00:00 2001 From: oharboe Date: Mon, 28 Jul 2008 06:08:05 +0000 Subject: retired reset run_and_init/halt git-svn-id: svn://svn.berlios.de/openocd/trunk@877 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/target/target.c | 751 +++++++++++++------------------ src/target/target.h | 3 - src/target/target/at91r40008.cfg | 2 +- src/target/target/at91sam9260.cfg | 2 +- src/target/target/at91sam9260minimal.cfg | 2 +- src/target/target/eir-sam7se512.cfg | 2 +- src/target/target/hammer.cfg | 2 +- src/target/target/ipx42x.cfg | 2 +- src/target/target/lpc2129.cfg | 2 +- src/target/target/lpc2148.cfg | 2 +- src/target/target/lpc2294.cfg | 2 +- src/target/target/mx31.cfg | 2 +- src/target/target/netx500.cfg | 2 +- src/target/target/nslu2.cfg | 2 +- src/target/target/omap5912.cfg | 2 +- src/target/target/pic32mx.cfg | 2 +- src/target/target/pxa255.cfg | 2 +- src/target/target/pxa270.cfg | 2 +- src/target/target/sam7s256.cfg | 2 +- src/target/target/sam7x256.cfg | 2 +- src/target/target/stm32.cfg | 2 +- src/target/target/stm32stick.cfg | 2 +- src/target/target/str710.cfg | 2 +- src/target/target/str730.cfg | 2 +- src/target/target/str750.cfg | 2 +- src/target/target/str912.cfg | 2 +- src/target/target/str9comstick.cfg | 2 +- src/target/target/wi-9c.cfg | 2 +- src/target/target/xba_revA3.cfg | 1 - 29 files changed, 337 insertions(+), 470 deletions(-) (limited to 'src') diff --git a/src/target/target.c b/src/target/target.c index 7c6beb0f..52a4fbba 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -55,7 +55,6 @@ int cli_target_callback_event_handler(struct target_s *target, enum target_event int handle_target_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_targets_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -int handle_run_and_halt_time_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_working_area_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_reg_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); @@ -194,8 +193,8 @@ target_t* get_target_by_num(int num) int get_num_by_target(target_t *query_target) { target_t *target = targets; - int i = 0; - + int i = 0; + while (target) { if (target == query_target) @@ -203,48 +202,23 @@ int get_num_by_target(target_t *query_target) target = target->next; i++; } - + return -1; } target_t* get_current_target(command_context_t *cmd_ctx) { target_t *target = get_target_by_num(cmd_ctx->current_target); - + if (target == NULL) { LOG_ERROR("BUG: current_target out of bounds"); exit(-1); } - - return target; -} -/* Process target initialization, when target entered debug out of reset - * the handler is unregistered at the end of this function, so it's only called once - */ -int target_init_handler(struct target_s *target, enum target_event event, void *priv) -{ - struct command_context_s *cmd_ctx = priv; - - if (event == TARGET_EVENT_HALTED) - { - target_unregister_event_callback(target_init_handler, priv); - target_invoke_script(cmd_ctx, target, "post_reset"); - jtag_execute_queue(); - } - - return ERROR_OK; + return target; } -int target_run_and_halt_handler(void *priv) -{ - target_t *target = priv; - - target_halt(target); - - return ERROR_OK; -} int target_poll(struct target_s *target) { @@ -271,21 +245,21 @@ int target_halt(struct target_s *target) int target_resume(struct target_s *target, int current, u32 address, int handle_breakpoints, int debug_execution) { int retval; - + /* We can't poll until after examine */ if (!target->type->examined) { LOG_ERROR("Target not examined yet"); return ERROR_FAIL; } - + /* note that resume *must* be asynchronous. The CPU can halt before we poll. The CPU can * even halt at the current PC as a result of a software breakpoint being inserted by (a bug?) * the application. */ if ((retval = target->type->resume(target, current, address, handle_breakpoints, debug_execution)) != ERROR_OK) return retval; - + return retval; } @@ -301,27 +275,27 @@ int target_process_reset(struct command_context_s *cmd_ctx, enum target_reset_mo target_invoke_script(cmd_ctx, target, "pre_reset"); target = target->next; } - + if ((retval = jtag_init_reset(cmd_ctx)) != ERROR_OK) return retval; - + keep_alive(); /* we might be running on a very slow JTAG clk */ - - /* First time this is executed after launching OpenOCD, it will read out + + /* First time this is executed after launching OpenOCD, it will read out * the type of CPU, etc. and init Embedded ICE registers in host - * memory. - * + * memory. + * * It will also set up ICE registers in the target. - * - * However, if we assert TRST later, we need to set up the registers again. - * + * + * However, if we assert TRST later, we need to set up the registers again. + * * For the "reset halt/init" case we must only set up the registers here. */ if ((retval = target_examine(cmd_ctx)) != ERROR_OK) return retval; - + keep_alive(); /* we might be running on a very slow JTAG clk */ - + target = targets; while (target) { @@ -338,46 +312,25 @@ int target_process_reset(struct command_context_s *cmd_ctx, enum target_reset_mo LOG_WARNING("JTAG communication failed asserting reset."); retval = ERROR_OK; } - + /* request target halt if necessary, and schedule further action */ target = targets; while (target) { - switch (reset_mode) + if (reset_mode!=RESET_RUN) { - case RESET_RUN: - /* nothing to do if target just wants to be run */ - break; - case RESET_RUN_AND_HALT: - /* schedule halt */ - target_register_timer_callback(target_run_and_halt_handler, target->run_and_halt_time, 0, target); - break; - case RESET_RUN_AND_INIT: - /* schedule halt */ - target_register_timer_callback(target_run_and_halt_handler, target->run_and_halt_time, 0, target); - target_register_event_callback(target_init_handler, cmd_ctx); - break; - case RESET_HALT: - if ((jtag_reset_config & RESET_SRST_PULLS_TRST)==0) - target_halt(target); - break; - case RESET_INIT: - if ((jtag_reset_config & RESET_SRST_PULLS_TRST)==0) - target_halt(target); - target_register_event_callback(target_init_handler, cmd_ctx); - break; - default: - LOG_ERROR("BUG: unknown target->reset_mode"); + if ((jtag_reset_config & RESET_SRST_PULLS_TRST)==0) + target_halt(target); } target = target->next; } - + if ((retval = jtag_execute_queue()) != ERROR_OK) { LOG_WARNING("JTAG communication failed while reset was asserted. Consider using srst_only for reset_config."); - retval = ERROR_OK; + retval = ERROR_OK; } - + target = targets; while (target) { @@ -389,10 +342,10 @@ int target_process_reset(struct command_context_s *cmd_ctx, enum target_reset_mo LOG_WARNING("Failed to reset target into halted mode - issuing halt"); target->type->halt(target); } - + target = target->next; } - + if ((retval = jtag_execute_queue()) != ERROR_OK) { LOG_WARNING("JTAG communication failed while deasserting reset."); @@ -404,64 +357,23 @@ int target_process_reset(struct command_context_s *cmd_ctx, enum target_reset_mo /* If TRST was asserted we need to set up registers again */ if ((retval = target_examine(cmd_ctx)) != ERROR_OK) return retval; - } - + } + LOG_DEBUG("Waiting for halted stated as appropriate"); - - /* Wait for reset to complete, maximum 5 seconds. */ - gettimeofday(&timeout, NULL); - timeval_add_time(&timeout, 5, 0); - for(;;) + + if ((reset_mode == RESET_HALT) || (reset_mode == RESET_INIT)) { - gettimeofday(&now, NULL); - - target_call_timer_callbacks_now(); - - target = targets; - while (target) + /* Wait for reset to complete, maximum 5 seconds. */ + if (((retval=target_wait_state(target, TARGET_HALTED, 5000)))==ERROR_OK) { - LOG_DEBUG("Polling target"); - target_poll(target); - if ((reset_mode == RESET_RUN_AND_INIT) || - (reset_mode == RESET_RUN_AND_HALT) || - (reset_mode == RESET_HALT) || - (reset_mode == RESET_INIT)) - { - if (target->state != TARGET_HALTED) - { - if ((now.tv_sec > timeout.tv_sec) || ((now.tv_sec == timeout.tv_sec) && (now.tv_usec >= timeout.tv_usec))) - { - LOG_USER("Timed out waiting for halt after reset"); - goto done; - } - /* this will send alive messages on e.g. GDB remote protocol. */ - usleep(500*1000); - LOG_USER_N("%s", ""); /* avoid warning about zero length formatting message*/ - goto again; - } - } - target = target->next; + if (reset_mode == RESET_INIT) + target_invoke_script(cmd_ctx, target, "post_reset"); } - /* All targets we're waiting for are halted */ - break; - - again:; } - done: - - + /* We want any events to be processed before the prompt */ target_call_timer_callbacks_now(); - /* if we timed out we need to unregister these handlers */ - target = targets; - while (target) - { - target_unregister_timer_callback(target_run_and_halt_handler, target); - target = target->next; - } - target_unregister_event_callback(target_init_handler, cmd_ctx); - return retval; } @@ -486,8 +398,8 @@ static int default_examine(struct command_context_s *cmd_ctx, struct target_s *t /* Targets that correctly implement init+examine, i.e. * no communication with target during init: - * - * XScale + * + * XScale */ int target_examine(struct command_context_s *cmd_ctx) { @@ -545,7 +457,7 @@ static int target_run_algorithm_imp(struct target_s *target, int num_mem_params, int target_init(struct command_context_s *cmd_ctx) { target_t *target = targets; - + while (target) { target->type->examined = 0; @@ -553,13 +465,13 @@ int target_init(struct command_context_s *cmd_ctx) { target->type->examine = default_examine; } - + if (target->type->init_target(cmd_ctx, target) != ERROR_OK) { LOG_ERROR("target '%s' init failed", target->type->name); exit(-1); } - + /* Set up default functions if none are provided by target */ if (target->type->virt2phys == NULL) { @@ -578,44 +490,44 @@ int target_init(struct command_context_s *cmd_ctx) target->type->run_algorithm_imp = target->type->run_algorithm; target->type->run_algorithm = target_run_algorithm_imp; - + if (target->type->mmu == NULL) { target->type->mmu = default_mmu; } target = target->next; } - + if (targets) { target_register_user_commands(cmd_ctx); target_register_timer_callback(handle_target, 100, 1, NULL); } - + return ERROR_OK; } int target_register_event_callback(int (*callback)(struct target_s *target, enum target_event event, void *priv), void *priv) { target_event_callback_t **callbacks_p = &target_event_callbacks; - + if (callback == NULL) { return ERROR_INVALID_ARGUMENTS; } - + if (*callbacks_p) { while ((*callbacks_p)->next) callbacks_p = &((*callbacks_p)->next); callbacks_p = &((*callbacks_p)->next); } - + (*callbacks_p) = malloc(sizeof(target_event_callback_t)); (*callbacks_p)->callback = callback; (*callbacks_p)->priv = priv; (*callbacks_p)->next = NULL; - + return ERROR_OK; } @@ -623,24 +535,24 @@ int target_register_timer_callback(int (*callback)(void *priv), int time_ms, int { target_timer_callback_t **callbacks_p = &target_timer_callbacks; struct timeval now; - + if (callback == NULL) { return ERROR_INVALID_ARGUMENTS; } - + if (*callbacks_p) { while ((*callbacks_p)->next) callbacks_p = &((*callbacks_p)->next); callbacks_p = &((*callbacks_p)->next); } - + (*callbacks_p) = malloc(sizeof(target_timer_callback_t)); (*callbacks_p)->callback = callback; (*callbacks_p)->periodic = periodic; (*callbacks_p)->time_ms = time_ms; - + gettimeofday(&now, NULL); (*callbacks_p)->when.tv_usec = now.tv_usec + (time_ms % 1000) * 1000; time_ms -= (time_ms % 1000); @@ -650,10 +562,10 @@ int target_register_timer_callback(int (*callback)(void *priv), int time_ms, int (*callbacks_p)->when.tv_usec = (*callbacks_p)->when.tv_usec - 1000000; (*callbacks_p)->when.tv_sec += 1; } - + (*callbacks_p)->priv = priv; (*callbacks_p)->next = NULL; - + return ERROR_OK; } @@ -661,12 +573,12 @@ int target_unregister_event_callback(int (*callback)(struct target_s *target, en { target_event_callback_t **p = &target_event_callbacks; target_event_callback_t *c = target_event_callbacks; - + if (callback == NULL) { return ERROR_INVALID_ARGUMENTS; } - + while (c) { target_event_callback_t *next = c->next; @@ -680,7 +592,7 @@ int target_unregister_event_callback(int (*callback)(struct target_s *target, en p = &(c->next); c = next; } - + return ERROR_OK; } @@ -688,12 +600,12 @@ int target_unregister_timer_callback(int (*callback)(void *priv), void *priv) { target_timer_callback_t **p = &target_timer_callbacks; target_timer_callback_t *c = target_timer_callbacks; - + if (callback == NULL) { return ERROR_INVALID_ARGUMENTS; } - + while (c) { target_timer_callback_t *next = c->next; @@ -707,7 +619,7 @@ int target_unregister_timer_callback(int (*callback)(void *priv), void *priv) p = &(c->next); c = next; } - + return ERROR_OK; } @@ -715,16 +627,16 @@ int target_call_event_callbacks(target_t *target, enum target_event event) { target_event_callback_t *callback = target_event_callbacks; target_event_callback_t *next_callback; - + LOG_DEBUG("target event %i", event); - + while (callback) { next_callback = callback->next; callback->callback(target, event, callback->priv); callback = next_callback; } - + return ERROR_OK; } @@ -735,13 +647,13 @@ static int target_call_timer_callbacks_check_time(int checktime) struct timeval now; keep_alive(); - + gettimeofday(&now, NULL); - + while (callback) { next_callback = callback->next; - + if ((!checktime&&callback->periodic)|| (((now.tv_sec >= callback->when.tv_sec) && (now.tv_usec >= callback->when.tv_usec)) || (now.tv_sec > callback->when.tv_sec))) @@ -765,10 +677,10 @@ static int target_call_timer_callbacks_check_time(int checktime) target_unregister_timer_callback(callback->callback, callback->priv); } } - + callback = next_callback; } - + return ERROR_OK; } @@ -787,7 +699,7 @@ int target_alloc_working_area(struct target_s *target, u32 size, working_area_t { working_area_t *c = target->working_areas; working_area_t *new_wa = NULL; - + /* Reevaluate working area address based on MMU state*/ if (target->working_areas == NULL) { @@ -807,14 +719,14 @@ int target_alloc_working_area(struct target_s *target, u32 size, working_area_t target->working_area = target->working_area_phys; } } - + /* only allocate multiples of 4 byte */ if (size % 4) { LOG_ERROR("BUG: code tried to allocate unaligned number of bytes, padding"); size = CEIL(size, 4); } - + /* see if there's already a matching working area */ while (c) { @@ -825,16 +737,16 @@ int target_alloc_working_area(struct target_s *target, u32 size, working_area_t } c = c->next; } - + /* if not, allocate a new one */ if (!new_wa) { working_area_t **p = &target->working_areas; u32 first_free = target->working_area; u32 free_size = target->working_area_size; - + LOG_DEBUG("allocating new working area"); - + c = target->working_areas; while (c) { @@ -843,18 +755,18 @@ int target_alloc_working_area(struct target_s *target, u32 size, working_area_t p = &c->next; c = c->next; } - + if (free_size < size) { LOG_WARNING("not enough working area available(requested %d, free %d)", size, free_size); return ERROR_TARGET_RESOURCE_NOT_AVAILABLE; } - + new_wa = malloc(sizeof(working_area_t)); new_wa->next = NULL; new_wa->size = size; new_wa->address = first_free; - + if (target->backup_working_area) { new_wa->backup = malloc(new_wa->size); @@ -864,18 +776,18 @@ int target_alloc_working_area(struct target_s *target, u32 size, working_area_t { new_wa->backup = NULL; } - + /* put new entry in list */ *p = new_wa; } - + /* mark as used, and return the new (reused) area */ new_wa->free = 0; *area = new_wa; - + /* user pointer */ new_wa->user = area; - + return ERROR_OK; } @@ -883,16 +795,16 @@ int target_free_working_area_restore(struct target_s *target, working_area_t *ar { if (area->free) return ERROR_OK; - + if (restore&&target->backup_working_area) target->type->write_memory(target, area->address, 4, area->size / 4, area->backup); - + area->free = 1; - + /* mark user pointer invalid */ *area->user = NULL; area->user = NULL; - + return ERROR_OK; } @@ -909,30 +821,29 @@ int target_free_all_working_areas_restore(struct target_s *target, int restore) { working_area_t *next = c->next; target_free_working_area_restore(target, c, restore); - + if (c->backup) free(c->backup); - + free(c); - + c = next; } - + target->working_areas = NULL; - + return ERROR_OK; } int target_free_all_working_areas(struct target_s *target) { - return target_free_all_working_areas_restore(target, 1); + return target_free_all_working_areas_restore(target, 1); } int target_register_commands(struct command_context_s *cmd_ctx) { register_command(cmd_ctx, NULL, "target", handle_target_command, COMMAND_CONFIG, "target [reset_init default - DEPRECATED] [cpu type specifc args]"); register_command(cmd_ctx, NULL, "targets", handle_targets_command, COMMAND_EXEC, NULL); - register_command(cmd_ctx, NULL, "run_and_halt_time", handle_run_and_halt_time_command, COMMAND_CONFIG, " "); register_command(cmd_ctx, NULL, "working_area", handle_working_area_command, COMMAND_ANY, "working_area
<'backup'|'nobackup'> [virtual address]"); register_command(cmd_ctx, NULL, "virt2phys", handle_virt2phys_command, COMMAND_ANY, "virt2phys "); register_command(cmd_ctx, NULL, "profile", handle_profile_command, COMMAND_EXEC, "PRELIMINARY! - profile "); @@ -952,18 +863,18 @@ int target_arch_state(struct target_s *target) LOG_USER("No target has been configured"); return ERROR_OK; } - + LOG_USER("target state: %s", target_state_strings[target->state]); - + if (target->state!=TARGET_HALTED) return ERROR_OK; - + retval=target->type->arch_state(target); return retval; } -/* Single aligned words are guaranteed to use 16 or 32 bit access - * mode respectively, otherwise data is handled as quickly as +/* Single aligned words are guaranteed to use 16 or 32 bit access + * mode respectively, otherwise data is handled as quickly as * possible */ int target_write_buffer(struct target_s *target, u32 address, u32 size, u8 *buffer) @@ -976,40 +887,40 @@ int target_write_buffer(struct target_s *target, u32 address, u32 size, u8 *buff LOG_ERROR("Target not examined yet"); return ERROR_FAIL; } - + if (address+sizetype->write_memory(target, address, 2, 1, buffer); } - + /* handle unaligned head bytes */ if (address % 4) { int unaligned = 4 - (address % 4); - + if (unaligned > size) unaligned = size; if ((retval = target->type->write_memory(target, address, 1, unaligned, buffer)) != ERROR_OK) return retval; - + buffer += unaligned; address += unaligned; size -= unaligned; } - + /* handle aligned words */ if (size >= 4) { int aligned = size - (size % 4); - + /* use bulk writes above a certain limit. This may have to be changed */ if (aligned > 128) { @@ -1021,25 +932,25 @@ int target_write_buffer(struct target_s *target, u32 address, u32 size, u8 *buff if ((retval = target->type->write_memory(target, address, 4, aligned / 4, buffer)) != ERROR_OK) return retval; } - + buffer += aligned; address += aligned; size -= aligned; } - + /* handle tail writes of less than 4 bytes */ if (size > 0) { if ((retval = target->type->write_memory(target, address, 1, size, buffer)) != ERROR_OK) return retval; } - + return ERROR_OK; } -/* Single aligned words are guaranteed to use 16 or 32 bit access - * mode respectively, otherwise data is handled as quickly as +/* Single aligned words are guaranteed to use 16 or 32 bit access + * mode respectively, otherwise data is handled as quickly as * possible */ int target_read_buffer(struct target_s *target, u32 address, u32 size, u8 *buffer) @@ -1052,55 +963,55 @@ int target_read_buffer(struct target_s *target, u32 address, u32 size, u8 *buffe LOG_ERROR("Target not examined yet"); return ERROR_FAIL; } - + if (address+sizetype->read_memory(target, address, 2, 1, buffer); } - + /* handle unaligned head bytes */ if (address % 4) { int unaligned = 4 - (address % 4); - + if (unaligned > size) unaligned = size; if ((retval = target->type->read_memory(target, address, 1, unaligned, buffer)) != ERROR_OK) return retval; - + buffer += unaligned; address += unaligned; size -= unaligned; } - + /* handle aligned words */ if (size >= 4) { int aligned = size - (size % 4); - + if ((retval = target->type->read_memory(target, address, 4, aligned / 4, buffer)) != ERROR_OK) return retval; - + buffer += aligned; address += aligned; size -= aligned; } - + /* handle tail writes of less than 4 bytes */ if (size > 0) { if ((retval = target->type->read_memory(target, address, 1, size, buffer)) != ERROR_OK) return retval; } - + return ERROR_OK; } @@ -1115,7 +1026,7 @@ int target_checksum_memory(struct target_s *target, u32 address, u32 size, u32* LOG_ERROR("Target not examined yet"); return ERROR_FAIL; } - + if ((retval = target->type->checksum_memory(target, address, size, &checksum)) == ERROR_TARGET_RESOURCE_NOT_AVAILABLE) { @@ -1143,9 +1054,9 @@ int target_checksum_memory(struct target_s *target, u32 address, u32 size, u32* retval = image_calculate_checksum( buffer, size, &checksum ); free(buffer); } - + *crc = checksum; - + return retval; } @@ -1157,12 +1068,12 @@ int target_blank_check_memory(struct target_s *target, u32 address, u32 size, u3 LOG_ERROR("Target not examined yet"); return ERROR_FAIL; } - + if (target->type->blank_check_memory == 0) return ERROR_TARGET_RESOURCE_NOT_AVAILABLE; - + retval = target->type->blank_check_memory(target, address, size, blank); - + return retval; } @@ -1176,7 +1087,7 @@ int target_read_u32(struct target_s *target, u32 address, u32 *value) } int retval = target->type->read_memory(target, address, 4, 1, value_buf); - + if (retval == ERROR_OK) { *value = target_buffer_get_u32(target, value_buf); @@ -1187,7 +1098,7 @@ int target_read_u32(struct target_s *target, u32 address, u32 *value) *value = 0x0; LOG_DEBUG("address: 0x%8.8x failed", address); } - + return retval; } @@ -1201,7 +1112,7 @@ int target_read_u16(struct target_s *target, u32 address, u16 *value) } int retval = target->type->read_memory(target, address, 2, 1, value_buf); - + if (retval == ERROR_OK) { *value = target_buffer_get_u16(target, value_buf); @@ -1212,7 +1123,7 @@ int target_read_u16(struct target_s *target, u32 address, u16 *value) *value = 0x0; LOG_DEBUG("address: 0x%8.8x failed", address); } - + return retval; } @@ -1234,7 +1145,7 @@ int target_read_u8(struct target_s *target, u32 address, u8 *value) *value = 0x0; LOG_DEBUG("address: 0x%8.8x failed", address); } - + return retval; } @@ -1250,12 +1161,12 @@ int target_write_u32(struct target_s *target, u32 address, u32 value) LOG_DEBUG("address: 0x%8.8x, value: 0x%8.8x", address, value); - target_buffer_set_u32(target, value_buf, value); + target_buffer_set_u32(target, value_buf, value); if ((retval = target->type->write_memory(target, address, 4, 1, value_buf)) != ERROR_OK) { LOG_DEBUG("failed: %i", retval); } - + return retval; } @@ -1271,12 +1182,12 @@ int target_write_u16(struct target_s *target, u32 address, u16 value) LOG_DEBUG("address: 0x%8.8x, value: 0x%8.8x", address, value); - target_buffer_set_u16(target, value_buf, value); + target_buffer_set_u16(target, value_buf, value); if ((retval = target->type->write_memory(target, address, 2, 1, value_buf)) != ERROR_OK) { LOG_DEBUG("failed: %i", retval); } - + return retval; } @@ -1295,7 +1206,7 @@ int target_write_u8(struct target_s *target, u32 address, u8 value) { LOG_DEBUG("failed: %i", retval); } - + return retval; } @@ -1307,29 +1218,29 @@ int target_register_user_commands(struct command_context_s *cmd_ctx) register_command(cmd_ctx, NULL, "halt", handle_halt_command, COMMAND_EXEC, "halt target"); register_command(cmd_ctx, NULL, "resume", handle_resume_command, COMMAND_EXEC, "resume target [addr]"); register_command(cmd_ctx, NULL, "step", handle_step_command, COMMAND_EXEC, "step one instruction from current PC or [addr]"); - register_command(cmd_ctx, NULL, "reset", handle_reset_command, COMMAND_EXEC, "reset target [run|halt|init|run_and_halt|run_and_init]"); + register_command(cmd_ctx, NULL, "reset", handle_reset_command, COMMAND_EXEC, "reset target [run|halt|init]"); register_command(cmd_ctx, NULL, "soft_reset_halt", handle_soft_reset_halt_command, COMMAND_EXEC, "halt the target and do a soft reset"); register_command(cmd_ctx, NULL, "mdw", handle_md_command, COMMAND_EXEC, "display memory words [count]"); register_command(cmd_ctx, NULL, "mdh", handle_md_command, COMMAND_EXEC, "display memory half-words [count]"); register_command(cmd_ctx, NULL, "mdb", handle_md_command, COMMAND_EXEC, "display memory bytes [count]"); - + register_command(cmd_ctx, NULL, "mww", handle_mw_command, COMMAND_EXEC, "write memory word [count]"); register_command(cmd_ctx, NULL, "mwh", handle_mw_command, COMMAND_EXEC, "write memory half-word [count]"); register_command(cmd_ctx, NULL, "mwb", handle_mw_command, COMMAND_EXEC, "write memory byte [count]"); - - register_command(cmd_ctx, NULL, "bp", handle_bp_command, COMMAND_EXEC, "set breakpoint
[hw]"); + + register_command(cmd_ctx, NULL, "bp", handle_bp_command, COMMAND_EXEC, "set breakpoint
[hw]"); register_command(cmd_ctx, NULL, "rbp", handle_rbp_command, COMMAND_EXEC, "remove breakpoint "); - register_command(cmd_ctx, NULL, "wp", handle_wp_command, COMMAND_EXEC, "set watchpoint
[value] [mask]"); + register_command(cmd_ctx, NULL, "wp", handle_wp_command, COMMAND_EXEC, "set watchpoint
[value] [mask]"); register_command(cmd_ctx, NULL, "rwp", handle_rwp_command, COMMAND_EXEC, "remove watchpoint "); - + register_command(cmd_ctx, NULL, "load_image", handle_load_image_command, COMMAND_EXEC, "load_image
['bin'|'ihex'|'elf'|'s19'] [min_address] [max_length]"); register_command(cmd_ctx, NULL, "dump_image", handle_dump_image_command, COMMAND_EXEC, "dump_image
"); register_command(cmd_ctx, NULL, "verify_image", handle_verify_image_command, COMMAND_EXEC, "verify_image [offset] [type]"); - + target_request_register_commands(cmd_ctx); trace_register_commands(cmd_ctx); - + return ERROR_OK; } @@ -1337,31 +1248,31 @@ int handle_targets_command(struct command_context_s *cmd_ctx, char *cmd, char ** { target_t *target = targets; int count = 0; - + if (argc == 1) { int num = strtoul(args[0], NULL, 0); - + while (target) { count++; target = target->next; } - + if (num < count) cmd_ctx->current_target = num; else command_print(cmd_ctx, "%i is out of bounds, only %i targets are configured", num, count); - + return ERROR_OK; } - + while (target) { command_print(cmd_ctx, "%i: %s (%s), state: %s", count++, target->type->name, target_endianess_strings[target->endianness], target_state_strings[target->state]); target = target->next; } - + return ERROR_OK; } @@ -1369,12 +1280,12 @@ int handle_target_command(struct command_context_s *cmd_ctx, char *cmd, char **a { int i; int found = 0; - + if (argc < 3) { return ERROR_COMMAND_SYNTAX_ERROR; } - + /* search for the specified target */ if (args[0] && (args[0][0] != 0)) { @@ -1383,7 +1294,7 @@ int handle_target_command(struct command_context_s *cmd_ctx, char *cmd, char **a if (strcmp(args[0], target_types[i]->name) == 0) { target_t **last_target_p = &targets; - + /* register target specific commands */ if (target_types[i]->register_commands(cmd_ctx) != ERROR_OK) { @@ -1399,11 +1310,11 @@ int handle_target_command(struct command_context_s *cmd_ctx, char *cmd, char **a } *last_target_p = malloc(sizeof(target_t)); - + /* allocate memory for each unique target type */ (*last_target_p)->type = (target_type_t*)malloc(sizeof(target_type_t)); - *((*last_target_p)->type) = *target_types[i]; - + *((*last_target_p)->type) = *target_types[i]; + if (strcmp(args[1], "big") == 0) (*last_target_p)->endianness = TARGET_BIG_ENDIAN; else if (strcmp(args[1], "little") == 0) @@ -1413,7 +1324,7 @@ int handle_target_command(struct command_context_s *cmd_ctx, char *cmd, char **a LOG_ERROR("endianness must be either 'little' or 'big', not '%s'", args[1]); return ERROR_COMMAND_SYNTAX_ERROR; } - + if (strcmp(args[2], "reset_halt") == 0) { LOG_WARNING("reset_mode argument is obsolete."); @@ -1445,13 +1356,12 @@ int handle_target_command(struct command_context_s *cmd_ctx, char *cmd, char **a args--; argc++; } - (*last_target_p)->run_and_halt_time = 1000; /* default 1s */ - + (*last_target_p)->working_area = 0x0; (*last_target_p)->working_area_size = 0x0; (*last_target_p)->working_areas = NULL; (*last_target_p)->backup_working_area = 0; - + (*last_target_p)->state = TARGET_UNKNOWN; (*last_target_p)->debug_reason = DBG_REASON_UNDEFINED; (*last_target_p)->reg_cache = NULL; @@ -1459,7 +1369,7 @@ int handle_target_command(struct command_context_s *cmd_ctx, char *cmd, char **a (*last_target_p)->watchpoints = NULL; (*last_target_p)->next = NULL; (*last_target_p)->arch_info = NULL; - + /* initialize trace information */ (*last_target_p)->trace_info = malloc(sizeof(trace_t)); (*last_target_p)->trace_info->num_trace_points = 0; @@ -1469,18 +1379,18 @@ int handle_target_command(struct command_context_s *cmd_ctx, char *cmd, char **a (*last_target_p)->trace_info->trace_history = NULL; (*last_target_p)->trace_info->trace_history_pos = 0; (*last_target_p)->trace_info->trace_history_overflowed = 0; - + (*last_target_p)->dbgmsg = NULL; (*last_target_p)->dbg_msg_enabled = 0; - + (*last_target_p)->type->target_command(cmd_ctx, cmd, args, argc, *last_target_p); - + found = 1; break; } } } - + /* no matching target found */ if (!found) { @@ -1493,54 +1403,34 @@ int handle_target_command(struct command_context_s *cmd_ctx, char *cmd, char **a int target_invoke_script(struct command_context_s *cmd_ctx, target_t *target, char *name) { - return command_run_linef(cmd_ctx, " if {[catch {info body target_%d_%s} t]==0} {target_%d_%s}", - get_num_by_target(target), name, + return command_run_linef(cmd_ctx, " if {[catch {info body target_%d_%s} t]==0} {target_%d_%s}", + get_num_by_target(target), name, get_num_by_target(target), name); } -int handle_run_and_halt_time_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) -{ - target_t *target = NULL; - - if (argc < 2) - { - return ERROR_COMMAND_SYNTAX_ERROR; - } - - target = get_target_by_num(strtoul(args[0], NULL, 0)); - if (!target) - { - return ERROR_COMMAND_SYNTAX_ERROR; - } - - target->run_and_halt_time = strtoul(args[1], NULL, 0); - - return ERROR_OK; -} - int handle_working_area_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { target_t *target = NULL; - + if ((argc < 4) || (argc > 5)) { return ERROR_COMMAND_SYNTAX_ERROR; } - + target = get_target_by_num(strtoul(args[0], NULL, 0)); if (!target) { return ERROR_COMMAND_SYNTAX_ERROR; } target_free_all_working_areas(target); - + target->working_area_phys = target->working_area_virt = strtoul(args[1], NULL, 0); if (argc == 5) { target->working_area_virt = strtoul(args[4], NULL, 0); } target->working_area_size = strtoul(args[2], NULL, 0); - + if (strcmp(args[3], "backup") == 0) { target->backup_working_area = 1; @@ -1554,7 +1444,7 @@ int handle_working_area_command(struct command_context_s *cmd_ctx, char *cmd, ch LOG_ERROR("unrecognized argument (%s)", args[3]); return ERROR_COMMAND_SYNTAX_ERROR; } - + return ERROR_OK; } @@ -1563,7 +1453,7 @@ int handle_working_area_command(struct command_context_s *cmd_ctx, char *cmd, ch int handle_target(void *priv) { target_t *target = targets; - + while (target) { if (target_continous_poll) @@ -1571,10 +1461,10 @@ int handle_target(void *priv) /* polling may fail silently until the target has been examined */ target_poll(target); } - + target = target->next; } - + return ERROR_OK; } @@ -1584,16 +1474,16 @@ int handle_reg_command(struct command_context_s *cmd_ctx, char *cmd, char **args reg_t *reg = NULL; int count = 0; char *value; - + LOG_DEBUG("-"); - + target = get_current_target(cmd_ctx); - + /* list all available registers for the current target */ if (argc == 0) { reg_cache_t *cache = target->reg_cache; - + count = 0; while(cache) { @@ -1606,16 +1496,16 @@ int handle_reg_command(struct command_context_s *cmd_ctx, char *cmd, char **args } cache = cache->next; } - + return ERROR_OK; } - + /* access a single register by its ordinal number */ if ((args[0][0] >= '0') && (args[0][0] <= '9')) { int num = strtoul(args[0], NULL, 0); reg_cache_t *cache = target->reg_cache; - + count = 0; while(cache) { @@ -1632,7 +1522,7 @@ int handle_reg_command(struct command_context_s *cmd_ctx, char *cmd, char **args break; cache = cache->next; } - + if (!reg) { command_print(cmd_ctx, "%i is out of bounds, the current target has only %i registers (0 - %i)", num, count, count - 1); @@ -1641,7 +1531,7 @@ int handle_reg_command(struct command_context_s *cmd_ctx, char *cmd, char **args } else /* access a single register by its name */ { reg = register_get_by_name(target->reg_cache, args[0], 1); - + if (!reg) { command_print(cmd_ctx, "register %s not found in current target", args[0]); @@ -1654,7 +1544,7 @@ int handle_reg_command(struct command_context_s *cmd_ctx, char *cmd, char **args { if ((argc == 2) && (strcmp(args[1], "force") == 0)) reg->valid = 0; - + if (reg->valid == 0) { reg_arch_type_t *arch_type = register_get_arch_type(reg->arch_type); @@ -1670,7 +1560,7 @@ int handle_reg_command(struct command_context_s *cmd_ctx, char *cmd, char **args free(value); return ERROR_OK; } - + /* set register value */ if (argc == 2) { @@ -1683,20 +1573,20 @@ int handle_reg_command(struct command_context_s *cmd_ctx, char *cmd, char **args LOG_ERROR("BUG: encountered unregistered arch type"); return ERROR_OK; } - + arch_type->set(reg, buf); - + value = buf_to_str(reg->value, reg->size, 16); command_print(cmd_ctx, "%s (/%i): 0x%s", reg->name, reg->size, value); free(value); - + free(buf); - + return ERROR_OK; } - + command_print(cmd_ctx, "usage: reg <#|name> [value]"); - + return ERROR_OK; } @@ -1725,15 +1615,15 @@ int handle_poll_command(struct command_context_s *cmd_ctx, char *cmd, char **arg command_print(cmd_ctx, "arg is \"on\" or \"off\""); } } - - + + return ERROR_OK; } int handle_wait_halt_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { int ms = 5000; - + if (argc > 0) { char *end; @@ -1747,7 +1637,7 @@ int handle_wait_halt_command(struct command_context_s *cmd_ctx, char *cmd, char } target_t *target = get_current_target(cmd_ctx); - return target_wait_state(target, TARGET_HALTED, ms); + return target_wait_state(target, TARGET_HALTED, ms); } int target_wait_state(target_t *target, enum target_state state, int ms) @@ -1757,7 +1647,7 @@ int target_wait_state(target_t *target, enum target_state state, int ms) int once=1; gettimeofday(&timeout, NULL); timeval_add_time(&timeout, 0, ms * 1000); - + for (;;) { if ((retval=target_poll(target))!=ERROR_OK) @@ -1772,15 +1662,15 @@ int target_wait_state(target_t *target, enum target_state state, int ms) once=0; LOG_USER("waiting for target %s...", target_state_strings[state]); } - + gettimeofday(&now, NULL); if ((now.tv_sec > timeout.tv_sec) || ((now.tv_sec == timeout.tv_sec) && (now.tv_usec >= timeout.tv_usec))) { LOG_ERROR("timed out while waiting for target %s", target_state_strings[state]); - break; + return ERROR_FAIL; } } - + return ERROR_OK; } @@ -1795,18 +1685,18 @@ int handle_halt_command(struct command_context_s *cmd_ctx, char *cmd, char **arg { return retval; } - + return handle_wait_halt_command(cmd_ctx, cmd, args, argc); } int handle_soft_reset_halt_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { target_t *target = get_current_target(cmd_ctx); - + LOG_USER("requesting target halt and executing a soft reset"); - + target->type->soft_reset_halt(target); - + return ERROR_OK; } @@ -1814,9 +1704,7 @@ int handle_reset_command(struct command_context_s *cmd_ctx, char *cmd, char **ar { target_t *target = get_current_target(cmd_ctx); enum target_reset_mode reset_mode = RESET_RUN; - - LOG_DEBUG("-"); - + if (argc >= 1) { if (strcmp("run", args[0]) == 0) @@ -1825,32 +1713,15 @@ int handle_reset_command(struct command_context_s *cmd_ctx, char *cmd, char **ar reset_mode = RESET_HALT; else if (strcmp("init", args[0]) == 0) reset_mode = RESET_INIT; - else if (strcmp("run_and_halt", args[0]) == 0) - { - reset_mode = RESET_RUN_AND_HALT; - if (argc >= 2) - { - target->run_and_halt_time = strtoul(args[1], NULL, 0); - } - } - else if (strcmp("run_and_init", args[0]) == 0) - { - reset_mode = RESET_RUN_AND_INIT; - if (argc >= 2) - { - target->run_and_halt_time = strtoul(args[1], NULL, 0); - } - } else { - command_print(cmd_ctx, "usage: reset ['run', 'halt', 'init', 'run_and_halt', 'run_and_init]"); - return ERROR_OK; + return ERROR_COMMAND_SYNTAX_ERROR; } } - + /* reset *all* targets */ target_process_reset(cmd_ctx, reset_mode); - + return ERROR_OK; } @@ -1858,9 +1729,9 @@ int handle_resume_command(struct command_context_s *cmd_ctx, char *cmd, char **a { int retval; target_t *target = get_current_target(cmd_ctx); - + target_invoke_script(cmd_ctx, target, "pre_resume"); - + if (argc == 0) retval = target_resume(target, 1, 0, 1, 0); /* current pc, addr = 0, handle breakpoints, not debugging */ else if (argc == 1) @@ -1869,22 +1740,22 @@ int handle_resume_command(struct command_context_s *cmd_ctx, char *cmd, char **a { return ERROR_COMMAND_SYNTAX_ERROR; } - + return retval; } int handle_step_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { target_t *target = get_current_target(cmd_ctx); - + LOG_DEBUG("-"); - + if (argc == 0) target->type->step(target, 1, 0, 1); /* current pc, addr = 0, handle breakpoints */ if (argc == 1) target->type->step(target, 0, strtoul(args[0], NULL, 0), 1); /* addr = args[0], handle breakpoints */ - + return ERROR_OK; } @@ -1912,7 +1783,7 @@ int handle_md_command(struct command_context_s *cmd_ctx, char *cmd, char **args, count = strtoul(args[1], NULL, 0); address = strtoul(args[0], NULL, 0); - + switch (cmd[2]) { @@ -1934,12 +1805,12 @@ int handle_md_command(struct command_context_s *cmd_ctx, char *cmd, char **args, if (retval == ERROR_OK) { output_len = 0; - + for (i = 0; i < count; i++) { if (i%line_modulo == 0) output_len += snprintf(output + output_len, 128 - output_len, "0x%8.8x: ", address + (i*size)); - + switch (size) { case 4: @@ -1952,7 +1823,7 @@ int handle_md_command(struct command_context_s *cmd_ctx, char *cmd, char **args, output_len += snprintf(output + output_len, 128 - output_len, "%2.2x ", buffer[i*1]); break; } - + if ((i%line_modulo == line_modulo-1) || (i == count - 1)) { command_print(cmd_ctx, output); @@ -1962,7 +1833,7 @@ int handle_md_command(struct command_context_s *cmd_ctx, char *cmd, char **args, } free(buffer); - + return retval; } @@ -1983,7 +1854,7 @@ int handle_mw_command(struct command_context_s *cmd_ctx, char *cmd, char **args, value = strtoul(args[1], NULL, 0); if (argc == 3) count = strtoul(args[2], NULL, 0); - + switch (cmd[2]) { case 'w': @@ -2038,18 +1909,18 @@ int handle_load_image_command(struct command_context_s *cmd_ctx, char *cmd, char int i; int retval; - image_t image; - + image_t image; + duration_t duration; char *duration_text; - + target_t *target = get_current_target(cmd_ctx); if ((argc < 1)||(argc > 5)) { return ERROR_COMMAND_SYNTAX_ERROR; } - + /* a base address isn't always necessary, default to 0x0 (i.e. don't relocate) */ if (argc >= 2) { @@ -2060,10 +1931,10 @@ int handle_load_image_command(struct command_context_s *cmd_ctx, char *cmd, char { image.base_address_set = 0; } - - + + image.start_address_set = 0; - + if (argc>=4) { min_address=strtoul(args[3], NULL, 0); @@ -2072,20 +1943,20 @@ int handle_load_image_command(struct command_context_s *cmd_ctx, char *cmd, char { max_address=strtoul(args[4], NULL, 0)+min_address; } - + if (min_address>max_address) { return ERROR_COMMAND_SYNTAX_ERROR; } - + duration_start_measure(&duration); - + if (image_open(&image, args[0], (argc >= 3) ? args[2] : NULL) != ERROR_OK) { return ERROR_OK; } - + image_size = 0x0; retval = ERROR_OK; for (i = 0; i < image.num_sections; i++) @@ -2096,19 +1967,19 @@ int handle_load_image_command(struct command_context_s *cmd_ctx, char *cmd, char command_print(cmd_ctx, "error allocating buffer for section (%d bytes)", image.sections[i].size); break; } - + if ((retval = image_read_section(&image, i, 0x0, image.sections[i].size, buffer, &buf_cnt)) != ERROR_OK) { free(buffer); break; } - + u32 offset=0; u32 length=buf_cnt; - - + + /* DANGER!!! beware of unsigned comparision here!!! */ - + if ((image.sections[i].base_address+buf_cnt>=min_address)&& (image.sections[i].base_addressmax_address) { length-=(image.sections[i].base_address+buf_cnt)-max_address; } - + if ((retval = target_write_buffer(target, image.sections[i].base_address+offset, length, buffer+offset)) != ERROR_OK) { free(buffer); @@ -2132,7 +2003,7 @@ int handle_load_image_command(struct command_context_s *cmd_ctx, char *cmd, char image_size += length; command_print(cmd_ctx, "%u byte written at address 0x%8.8x", length, image.sections[i].base_address+offset); } - + free(buffer); } @@ -2142,7 +2013,7 @@ int handle_load_image_command(struct command_context_s *cmd_ctx, char *cmd, char command_print(cmd_ctx, "downloaded %u byte in %s", image_size, duration_text); } free(duration_text); - + image_close(&image); return retval; @@ -2152,15 +2023,15 @@ int handle_load_image_command(struct command_context_s *cmd_ctx, char *cmd, char int handle_dump_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { fileio_t fileio; - + u32 address; u32 size; u8 buffer[560]; int retval=ERROR_OK; - + duration_t duration; char *duration_text; - + target_t *target = get_current_target(cmd_ctx); if (argc != 3) @@ -2177,31 +2048,31 @@ int handle_dump_image_command(struct command_context_s *cmd_ctx, char *cmd, char command_print(cmd_ctx, "only 32-bit aligned address and size are supported"); return ERROR_OK; } - + if (fileio_open(&fileio, args[0], FILEIO_WRITE, FILEIO_BINARY) != ERROR_OK) { return ERROR_OK; } - + duration_start_measure(&duration); - + while (size > 0) { u32 size_written; u32 this_run_size = (size > 560) ? 560 : size; - + retval = target->type->read_memory(target, address, 4, this_run_size / 4, buffer); if (retval != ERROR_OK) { break; } - + retval = fileio_write(&fileio, this_run_size, buffer, &size_written); if (retval != ERROR_OK) { break; } - + size -= this_run_size; address += this_run_size; } @@ -2214,7 +2085,7 @@ int handle_dump_image_command(struct command_context_s *cmd_ctx, char *cmd, char command_print(cmd_ctx, "dumped %"PRIi64" byte in %s", fileio.size, duration_text); } free(duration_text); - + return ERROR_OK; } @@ -2228,26 +2099,26 @@ int handle_verify_image_command(struct command_context_s *cmd_ctx, char *cmd, ch u32 checksum = 0; u32 mem_checksum = 0; - image_t image; - + image_t image; + duration_t duration; char *duration_text; - + target_t *target = get_current_target(cmd_ctx); - + if (argc < 1) { return ERROR_COMMAND_SYNTAX_ERROR; } - + if (!target) { LOG_ERROR("no target selected"); return ERROR_FAIL; } - + duration_start_measure(&duration); - + if (argc >= 2) { image.base_address_set = 1; @@ -2265,7 +2136,7 @@ int handle_verify_image_command(struct command_context_s *cmd_ctx, char *cmd, ch { return retval; } - + image_size = 0x0; retval=ERROR_OK; for (i = 0; i < image.num_sections; i++) @@ -2281,26 +2152,26 @@ int handle_verify_image_command(struct command_context_s *cmd_ctx, char *cmd, ch free(buffer); break; } - + /* calculate checksum of image */ image_calculate_checksum( buffer, buf_cnt, &checksum ); - + retval = target_checksum_memory(target, image.sections[i].base_address, buf_cnt, &mem_checksum); if( retval != ERROR_OK ) { free(buffer); break; } - + if( checksum != mem_checksum ) { /* failed crc checksum, fall back to a binary compare */ u8 *data; - + command_print(cmd_ctx, "checksum mismatch - attempting binary compare"); - + data = (u8*)malloc(buf_cnt); - + /* Can we use 32bit word accesses? */ int size = 1; int count = buf_cnt; @@ -2325,23 +2196,23 @@ int handle_verify_image_command(struct command_context_s *cmd_ctx, char *cmd, ch } } } - + free(data); } - + free(buffer); image_size += buf_cnt; } -done: +done: duration_stop_measure(&duration, &duration_text); if (retval==ERROR_OK) { command_print(cmd_ctx, "verified %u bytes in %s", image_size, duration_text); } free(duration_text); - + image_close(&image); - + return retval; } @@ -2375,7 +2246,7 @@ int handle_bp_command(struct command_context_s *cmd_ctx, char *cmd, char **args, u32 length = 0; length = strtoul(args[1], NULL, 0); - + if (argc >= 3) if (strcmp(args[2], "hw") == 0) hw = BKPT_HARD; @@ -2421,13 +2292,13 @@ int handle_wp_command(struct command_context_s *cmd_ctx, char *cmd, char **args, command_print(cmd_ctx, "address: 0x%8.8x, len: 0x%8.8x, r/w/a: %i, value: 0x%8.8x, mask: 0x%8.8x", watchpoint->address, watchpoint->length, watchpoint->rw, watchpoint->value, watchpoint->mask); watchpoint = watchpoint->next; } - } + } else if (argc >= 2) { enum watchpoint_rw type = WPT_ACCESS; u32 data_value = 0x0; u32 data_mask = 0xffffffff; - + if (argc >= 3) { switch(args[2][0]) @@ -2454,7 +2325,7 @@ int handle_wp_command(struct command_context_s *cmd_ctx, char *cmd, char **args, { data_mask = strtoul(args[4], NULL, 0); } - + if ((retval = watchpoint_add(target, strtoul(args[0], NULL, 0), strtoul(args[1], NULL, 0), type, data_value, data_mask)) != ERROR_OK) { @@ -2465,7 +2336,7 @@ int handle_wp_command(struct command_context_s *cmd_ctx, char *cmd, char **args, { command_print(cmd_ctx, "usage: wp
[r/w/a] [value] [mask]"); } - + return ERROR_OK; } @@ -2475,7 +2346,7 @@ int handle_rwp_command(struct command_context_s *cmd_ctx, char *cmd, char **args if (argc > 0) watchpoint_remove(target, strtoul(args[0], NULL, 0)); - + return ERROR_OK; } @@ -2499,8 +2370,8 @@ int handle_virt2phys_command(command_context_t *cmd_ctx, char *cmd, char **args, } else { - /* lower levels will have logged a detailed error which is - * forwarded to telnet/GDB session. + /* lower levels will have logged a detailed error which is + * forwarded to telnet/GDB session. */ } return retval; @@ -2511,13 +2382,13 @@ static void writeLong(FILE *f, int l) for (i=0; i<4; i++) { char c=(l>>(i*8))&0xff; - fwrite(&c, 1, 1, f); + fwrite(&c, 1, 1, f); } - + } static void writeString(FILE *f, char *s) { - fwrite(s, 1, strlen(s), f); + fwrite(s, 1, strlen(s), f); } @@ -2534,8 +2405,8 @@ static void writeGmon(u32 *samples, int sampleNum, char *filename) writeLong(f, 0); // padding writeLong(f, 0); // padding writeLong(f, 0); // padding - - fwrite("", 1, 1, f); // GMON_TAG_TIME_HIST + + fwrite("", 1, 1, f); // GMON_TAG_TIME_HIST // figure out bucket size u32 min=samples[0]; @@ -2553,12 +2424,12 @@ static void writeGmon(u32 *samples, int sampleNum, char *filename) } int addressSpace=(max-min+1); - + static int const maxBuckets=256*1024; // maximum buckets. int length=addressSpace; if (length > maxBuckets) { - length=maxBuckets; + length=maxBuckets; } int *buckets=malloc(sizeof(int)*length); if (buckets==NULL) @@ -2573,10 +2444,10 @@ static void writeGmon(u32 *samples, int sampleNum, char *filename) long long a=address-min; long long b=length-1; long long c=addressSpace-1; - int index=(a*b)/c; // danger!!!! int32 overflows + int index=(a*b)/c; // danger!!!! int32 overflows buckets[index]++; } - + // append binary memory gmon.out &profile_hist_hdr ((char*)&profile_hist_hdr + sizeof(struct gmon_hist_hdr)) writeLong(f, min); // low_pc writeLong(f, max); // high_pc @@ -2588,9 +2459,9 @@ static void writeGmon(u32 *samples, int sampleNum, char *filename) fwrite("", 1, 1, f); // padding } writeString(f, "s"); - + // append binary memory gmon.out profile_hist_data (profile_hist_data + profile_hist_hdr.hist_size) - + char *data=malloc(2*length); if (data!=NULL) { @@ -2621,7 +2492,7 @@ int handle_profile_command(struct command_context_s *cmd_ctx, char *cmd, char ** { target_t *target = get_current_target(cmd_ctx); struct timeval timeout, now; - + gettimeofday(&timeout, NULL); if (argc!=2) { @@ -2629,23 +2500,23 @@ int handle_profile_command(struct command_context_s *cmd_ctx, char *cmd, char ** } char *end; timeval_add_time(&timeout, strtoul(args[0], &end, 0), 0); - if (*end) + if (*end) { return ERROR_OK; } - + command_print(cmd_ctx, "Starting profiling. Halting and resuming the target as often as we can..."); static const int maxSample=10000; u32 *samples=malloc(sizeof(u32)*maxSample); if (samples==NULL) return ERROR_OK; - + int numSamples=0; int retval=ERROR_OK; // hopefully it is safe to cache! We want to stop/restart as quickly as possible. reg_t *reg = register_get_by_name(target->reg_cache, "pc", 1); - + for (;;) { target_poll(target); @@ -2670,7 +2541,7 @@ int handle_profile_command(struct command_context_s *cmd_ctx, char *cmd, char ** { break; } - + gettimeofday(&now, NULL); if ((numSamples>=maxSample) || ((now.tv_sec >= timeout.tv_sec) && (now.tv_usec >= timeout.tv_usec))) { @@ -2687,7 +2558,7 @@ int handle_profile_command(struct command_context_s *cmd_ctx, char *cmd, char ** } } free(samples); - + return ERROR_OK; } @@ -2700,7 +2571,7 @@ static int new_int_array_element(Jim_Interp * interp, const char *varname, int i namebuf = alloc_printf("%s(%d)", varname, idx); if (!namebuf) return JIM_ERR; - + nameObjPtr = Jim_NewStringObj(interp, namebuf, -1); valObjPtr = Jim_NewIntObj(interp, val); if (!nameObjPtr || !valObjPtr) @@ -2735,7 +2606,7 @@ static int jim_mem2array(Jim_Interp *interp, int argc, Jim_Obj *const *argv) /* argv[1] = name of array to receive the data * argv[2] = desired width - * argv[3] = memory address + * argv[3] = memory address * argv[4] = count of times to read */ if (argc != 5) { @@ -2750,7 +2621,7 @@ static int jim_mem2array(Jim_Interp *interp, int argc, Jim_Obj *const *argv) if (e != JIM_OK) { return e; } - + e = Jim_GetLong(interp, argv[3], &l); addr = l; if (e != JIM_OK) { @@ -2791,8 +2662,8 @@ static int jim_mem2array(Jim_Interp *interp, int argc, Jim_Obj *const *argv) Jim_SetResult(interp, Jim_NewEmptyStringObj(interp)); Jim_AppendStrings(interp, Jim_GetResult(interp), "mem2array: absurd > 64K item request", NULL); return JIM_ERR; - } - + } + if ((width == 1) || ((width == 2) && ((addr & 1) == 0)) || ((width == 4) && ((addr & 3) == 0))) { @@ -2800,7 +2671,7 @@ static int jim_mem2array(Jim_Interp *interp, int argc, Jim_Obj *const *argv) } else { char buf[100]; Jim_SetResult(interp, Jim_NewEmptyStringObj(interp)); - sprintf(buf, "mem2array address: 0x%08x is not aligned for %d byte reads", addr, width); + sprintf(buf, "mem2array address: 0x%08x is not aligned for %d byte reads", addr, width); Jim_AppendStrings(interp, Jim_GetResult(interp), buf , NULL); return JIM_ERR; } @@ -2817,7 +2688,7 @@ static int jim_mem2array(Jim_Interp *interp, int argc, Jim_Obj *const *argv) LOG_ERROR("mem2array: no current target"); return JIM_ERR; } - + /* Transfer loop */ /* index counter */ @@ -2826,12 +2697,12 @@ static int jim_mem2array(Jim_Interp *interp, int argc, Jim_Obj *const *argv) e = JIM_OK; while (len) { /* Slurp... in buffer size chunks */ - + count = len; /* in objects.. */ if (count > (sizeof(buffer)/width)) { count = (sizeof(buffer)/width); } - + retval = target->type->read_memory( target, addr, width, count, buffer ); if (retval != ERROR_OK) { /* BOO !*/ @@ -2859,7 +2730,7 @@ static int jim_mem2array(Jim_Interp *interp, int argc, Jim_Obj *const *argv) len -= count; } } - + Jim_SetResult(interp, Jim_NewEmptyStringObj(interp)); return JIM_OK; @@ -2912,7 +2783,7 @@ static int jim_array2mem(Jim_Interp *interp, int argc, Jim_Obj *const *argv) /* argv[1] = name of array to get the data * argv[2] = desired width - * argv[3] = memory address + * argv[3] = memory address * argv[4] = count to write */ if (argc != 5) { @@ -2927,7 +2798,7 @@ static int jim_array2mem(Jim_Interp *interp, int argc, Jim_Obj *const *argv) if (e != JIM_OK) { return e; } - + e = Jim_GetLong(interp, argv[3], &l); addr = l; if (e != JIM_OK) { @@ -2968,8 +2839,8 @@ static int jim_array2mem(Jim_Interp *interp, int argc, Jim_Obj *const *argv) Jim_SetResult(interp, Jim_NewEmptyStringObj(interp)); Jim_AppendStrings(interp, Jim_GetResult(interp), "array2mem: absurd > 64K item request", NULL); return JIM_ERR; - } - + } + if ((width == 1) || ((width == 2) && ((addr & 1) == 0)) || ((width == 4) && ((addr & 3) == 0))) { @@ -2977,7 +2848,7 @@ static int jim_array2mem(Jim_Interp *interp, int argc, Jim_Obj *const *argv) } else { char buf[100]; Jim_SetResult(interp, Jim_NewEmptyStringObj(interp)); - sprintf(buf, "array2mem address: 0x%08x is not aligned for %d byte reads", addr, width); + sprintf(buf, "array2mem address: 0x%08x is not aligned for %d byte reads", addr, width); Jim_AppendStrings(interp, Jim_GetResult(interp), buf , NULL); return JIM_ERR; } @@ -2994,7 +2865,7 @@ static int jim_array2mem(Jim_Interp *interp, int argc, Jim_Obj *const *argv) LOG_ERROR("array2mem: no current target"); return JIM_ERR; } - + /* Transfer loop */ /* index counter */ @@ -3003,7 +2874,7 @@ static int jim_array2mem(Jim_Interp *interp, int argc, Jim_Obj *const *argv) e = JIM_OK; while (len) { /* Slurp... in buffer size chunks */ - + count = len; /* in objects.. */ if (count > (sizeof(buffer)/width)) { count = (sizeof(buffer)/width); @@ -3036,7 +2907,7 @@ static int jim_array2mem(Jim_Interp *interp, int argc, Jim_Obj *const *argv) len = 0; } } - + Jim_SetResult(interp, Jim_NewEmptyStringObj(interp)); return JIM_OK; diff --git a/src/target/target.h b/src/target/target.h index 51a9dfc4..5d1e5773 100644 --- a/src/target/target.h +++ b/src/target/target.h @@ -62,8 +62,6 @@ enum target_reset_mode RESET_RUN = 0, /* reset and let target run */ RESET_HALT = 1, /* reset and halt target out of reset */ RESET_INIT = 2, /* reset and halt target out of reset, then run init script */ - RESET_RUN_AND_HALT = 3, /* reset and let target run, halt after n milliseconds */ - RESET_RUN_AND_INIT = 4, /* reset and let target run, halt after n milliseconds, then run init script */ }; enum target_debug_reason @@ -202,7 +200,6 @@ typedef struct target_s { target_type_t *type; /* target type definition (name, access functions) */ int reset_halt; /* attempt resetting the CPU into the halted mode? */ - int run_and_halt_time; /* how long the target should run after a run_and_halt reset */ u32 working_area; /* working area (initialized RAM). Evaluated upon first allocation from virtual/physical address. */ u32 working_area_virt; /* virtual address */ diff --git a/src/target/target/at91r40008.cfg b/src/target/target/at91r40008.cfg index 54c99006..efcbd1c0 100644 --- a/src/target/target/at91r40008.cfg +++ b/src/target/target/at91r40008.cfg @@ -11,7 +11,7 @@ jtag_device 4 0x1 0xf 0xe #target #target arm7tdmi target arm7tdmi little 0 arm7tdmi -run_and_halt_time 0 30 + target_script 0 reset event/at91r40008_reset.script diff --git a/src/target/target/at91sam9260.cfg b/src/target/target/at91sam9260.cfg index 41d7b1ff..21f92d79 100644 --- a/src/target/target/at91sam9260.cfg +++ b/src/target/target/at91sam9260.cfg @@ -18,7 +18,7 @@ jtag_ntrst_delay 0 target arm926ejs little 0 arm926ejs target_script 0 reset event/at91sam9260_reset.script -run_and_halt_time 0 30 + #working area
working_area 0 0x00300000 0x1000 backup diff --git a/src/target/target/at91sam9260minimal.cfg b/src/target/target/at91sam9260minimal.cfg index 9b06f143..70e88749 100644 --- a/src/target/target/at91sam9260minimal.cfg +++ b/src/target/target/at91sam9260minimal.cfg @@ -16,5 +16,5 @@ jtag_ntrst_delay 200 #target target arm926ejs little 0 arm926ejs -run_and_halt_time 0 30 + diff --git a/src/target/target/eir-sam7se512.cfg b/src/target/target/eir-sam7se512.cfg index 52ba9e45..c33b4298 100644 --- a/src/target/target/eir-sam7se512.cfg +++ b/src/target/target/eir-sam7se512.cfg @@ -6,7 +6,7 @@ reset_config srst_only srst_pulls_trst jtag_device 4 0x1 0xf 0xe target arm7tdmi little 0 arm7tdmi -run_and_halt_time 0 30 + target_script 0 reset event/eir-sam7se512_reset.script diff --git a/src/target/target/hammer.cfg b/src/target/target/hammer.cfg index 8e450cfc..9daef590 100644 --- a/src/target/target/hammer.cfg +++ b/src/target/target/hammer.cfg @@ -18,7 +18,7 @@ arm7_9 dcc_downloads enable target_script 0 reset event/hammer_reset.script working_area 0 0x30800000 0x20000 nobackup -run_and_halt_time 0 1000 + #flash configuration #flash bank [driver_options ...] diff --git a/src/target/target/ipx42x.cfg b/src/target/target/ipx42x.cfg index c1518b17..9445992c 100644 --- a/src/target/target/ipx42x.cfg +++ b/src/target/target/ipx42x.cfg @@ -6,4 +6,4 @@ reset_config srst_only srst_pulls_trst #format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE) jtag_device 7 0x1 0x7f 0x7e target xscale big 0 IXP42x -run_and_halt_time 0 30 + diff --git a/src/target/target/lpc2129.cfg b/src/target/target/lpc2129.cfg index 8294a8e5..b9a33089 100644 --- a/src/target/target/lpc2129.cfg +++ b/src/target/target/lpc2129.cfg @@ -5,7 +5,7 @@ reset_config trst_and_srst srst_pulls_trst #format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE) jtag_device 4 0x1 0xf 0xe target arm7tdmi little 0 arm7tdmi-s_r4 -run_and_halt_time 0 30 + working_area 0 0x40000000 0x4000 nobackup #flash bank flash bank lpc2000 0x0 0x40000 0 0 0 lpc2000_v1 14765 calc_checksum diff --git a/src/target/target/lpc2148.cfg b/src/target/target/lpc2148.cfg index e30a3c85..64e65b12 100644 --- a/src/target/target/lpc2148.cfg +++ b/src/target/target/lpc2148.cfg @@ -16,7 +16,7 @@ jtag_device 4 0x1 0xf 0xe #target #target arm7tdmi target arm7tdmi little 0 arm7tdmi-s_r4 -run_and_halt_time 0 30 + target_script 0 reset event/lpc2148_reset.script diff --git a/src/target/target/lpc2294.cfg b/src/target/target/lpc2294.cfg index bc365523..4a2adcbc 100644 --- a/src/target/target/lpc2294.cfg +++ b/src/target/target/lpc2294.cfg @@ -8,7 +8,7 @@ jtag_device 4 0x1 0xf 0xe #target #target arm7tdmi target arm7tdmi little 0 arm7tdmi-s_r4 -run_and_halt_time 0 30 + working_area 0 0x40000000 0x4000 nobackup diff --git a/src/target/target/mx31.cfg b/src/target/target/mx31.cfg index 71d249d2..71dd5e59 100644 --- a/src/target/target/mx31.cfg +++ b/src/target/target/mx31.cfg @@ -12,5 +12,5 @@ jtag_device 5 0x1 0x0 0x1e #target target arm11 little 1 -run_and_halt_time 0 0 + diff --git a/src/target/target/netx500.cfg b/src/target/target/netx500.cfg index 84c24b9c..21a0e10c 100644 --- a/src/target/target/netx500.cfg +++ b/src/target/target/netx500.cfg @@ -7,4 +7,4 @@ jtag_device 4 0x1 0xf 0xe jtag_nsrst_delay 100 jtag_ntrst_delay 100 target arm926ejs little 0 arm926ejs -run_and_halt_time 0 500 + diff --git a/src/target/target/nslu2.cfg b/src/target/target/nslu2.cfg index 7f8ea281..53907bc5 100644 --- a/src/target/target/nslu2.cfg +++ b/src/target/target/nslu2.cfg @@ -7,7 +7,7 @@ jtag_device 7 0x1 0x7f 0x7e # target configuration target xscale big 0 ixp42x -run_and_halt_time 0 30 + # maps to PXA internal RAM. If you are using a PXA255 # you must initialize SDRAM or leave this option off diff --git a/src/target/target/omap5912.cfg b/src/target/target/omap5912.cfg index c7fd6509..3a8f4154 100644 --- a/src/target/target/omap5912.cfg +++ b/src/target/target/omap5912.cfg @@ -12,7 +12,7 @@ jtag_device 8 0x0 0x0 0x0 target arm926ejs little 1 arm926ejs target_script 0 reset event/omap5912_reset.script -run_and_halt_time 0 30 + # omap5912 lcd frame buffer as working area working_area 0 0x20000000 0x3e800 nobackup diff --git a/src/target/target/pic32mx.cfg b/src/target/target/pic32mx.cfg index 25ef0294..6ebf882e 100644 --- a/src/target/target/pic32mx.cfg +++ b/src/target/target/pic32mx.cfg @@ -11,7 +11,7 @@ jtag_device 5 0x1 0x1 0x1e #target #target arm7tdmi target mips_m4k little 0 -run_and_halt_time 0 30 + working_area 0 0xa0000000 16384 nobackup diff --git a/src/target/target/pxa255.cfg b/src/target/target/pxa255.cfg index 50d0bafc..b712cf37 100644 --- a/src/target/target/pxa255.cfg +++ b/src/target/target/pxa255.cfg @@ -3,7 +3,7 @@ jtag_nsrst_delay 200 jtag_ntrst_delay 200 target xscale little 0 pxa255 reset_config trst_and_srst -run_and_halt_time 0 30 + target_script 0 reset event/pxa255_reset.script diff --git a/src/target/target/pxa270.cfg b/src/target/target/pxa270.cfg index deb31dd8..5818dc2d 100644 --- a/src/target/target/pxa270.cfg +++ b/src/target/target/pxa270.cfg @@ -14,7 +14,7 @@ target xscale little 0 pxa27x # maps to PXA internal RAM. If you are using a PXA255 # you must initialize SDRAM or leave this option off working_area 0 0x5c000000 0x10000 nobackup -run_and_halt_time 0 30 + #flash bank # works for P30 flash flash bank cfi 0x00000000 0x1000000 2 4 0 diff --git a/src/target/target/sam7s256.cfg b/src/target/target/sam7s256.cfg index 2be0ec52..e96c4f13 100644 --- a/src/target/target/sam7s256.cfg +++ b/src/target/target/sam7s256.cfg @@ -8,7 +8,7 @@ jtag_device 4 0x1 0xf 0xe #target #target arm7tdmi target arm7tdmi little 0 arm7tdmi -run_and_halt_time 0 30 + target_script 0 reset event/sam7s256_reset.script diff --git a/src/target/target/sam7x256.cfg b/src/target/target/sam7x256.cfg index fa332ce8..1d61b4cc 100644 --- a/src/target/target/sam7x256.cfg +++ b/src/target/target/sam7x256.cfg @@ -8,7 +8,7 @@ jtag_device 4 0x1 0xf 0xe #target #target arm7tdmi target arm7tdmi little 0 arm7tdmi -run_and_halt_time 0 30 + target_script 0 reset event/sam7x256_reset.script diff --git a/src/target/target/stm32.cfg b/src/target/target/stm32.cfg index 8bdfdff0..0b97278a 100644 --- a/src/target/target/stm32.cfg +++ b/src/target/target/stm32.cfg @@ -17,7 +17,7 @@ jtag_device 5 0x1 0x1 0x1e #target #target arm7tdmi target cortex_m3 little 0 -run_and_halt_time 0 30 + working_area 0 0x20000000 16384 nobackup diff --git a/src/target/target/stm32stick.cfg b/src/target/target/stm32stick.cfg index 745c6234..3f224a73 100644 --- a/src/target/target/stm32stick.cfg +++ b/src/target/target/stm32stick.cfg @@ -18,7 +18,7 @@ jtag_device 4 0x1 0xf 0xe #target #target arm7tdmi target cortex_m3 little 0 -run_and_halt_time 0 30 + working_area 0 0x20000000 16384 nobackup diff --git a/src/target/target/str710.cfg b/src/target/target/str710.cfg index 8eb8775d..b765fa76 100644 --- a/src/target/target/str710.cfg +++ b/src/target/target/str710.cfg @@ -17,7 +17,7 @@ jtag_device 4 0x1 0xf 0xe #target #target arm7tdmi target arm7tdmi little 0 arm7tdmi -run_and_halt_time 0 30 + target_script 0 gdb_program_config event/str710_program.script diff --git a/src/target/target/str730.cfg b/src/target/target/str730.cfg index 491a3a59..837dbcf4 100644 --- a/src/target/target/str730.cfg +++ b/src/target/target/str730.cfg @@ -24,7 +24,7 @@ jtag_ntrst_delay 500 target arm7tdmi little 0 arm7tdmi -run_and_halt_time 0 30 + target_script 0 gdb_program_config event/str730_program.script diff --git a/src/target/target/str750.cfg b/src/target/target/str750.cfg index d00eae09..8572e1bd 100644 --- a/src/target/target/str750.cfg +++ b/src/target/target/str750.cfg @@ -25,7 +25,7 @@ jtag_ntrst_delay 500 #target arm7tdmi target arm7tdmi little 0 arm7tdmi -run_and_halt_time 0 30 + target_script 0 gdb_program_config event/str750_program.script diff --git a/src/target/target/str912.cfg b/src/target/target/str912.cfg index 14bb4973..c9bef81b 100644 --- a/src/target/target/str912.cfg +++ b/src/target/target/str912.cfg @@ -37,7 +37,7 @@ jtag_device 5 0x1 0x1 0x1e #target #target arm7tdmi target arm966e little 1 arm966e -run_and_halt_time 0 30 + working_area 0 0x50000000 16384 nobackup diff --git a/src/target/target/str9comstick.cfg b/src/target/target/str9comstick.cfg index b601a653..f9dbe01c 100644 --- a/src/target/target/str9comstick.cfg +++ b/src/target/target/str9comstick.cfg @@ -13,7 +13,7 @@ jtag_device 8 0x1 0x1 0xfe jtag_device 4 0x1 0xf 0xe jtag_device 5 0x1 0x1 0x1e target arm966e little 1 arm966e -run_and_halt_time 0 30 + working_area 0 0x50000000 16384 nobackup #flash bank flash bank str9x 0x00000000 0x00080000 0 0 0 diff --git a/src/target/target/wi-9c.cfg b/src/target/target/wi-9c.cfg index 02a10932..eccb8fa4 100644 --- a/src/target/target/wi-9c.cfg +++ b/src/target/target/wi-9c.cfg @@ -18,7 +18,7 @@ jtag_ntrst_delay 0 target arm926ejs big 0 arm926ejs target_script 0 reset event/wi-9c_reset.script -run_and_halt_time 0 30 + #working area
working_area 0 0x00000000 0x1000 backup diff --git a/src/target/target/xba_revA3.cfg b/src/target/target/xba_revA3.cfg index 7741b0f6..c65f7350 100644 --- a/src/target/target/xba_revA3.cfg +++ b/src/target/target/xba_revA3.cfg @@ -12,7 +12,6 @@ jtag_device 7 0x1 0x7f 0x7e target xscale big 0 ixp42x target_script 0 reset event/xba_revA3.script -run_and_halt_time 0 100 flash bank cfi 0x50000000 0x400000 2 2 0 working_area 0 0x20010000 0x8060 nobackup -- cgit v1.2.3 6 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 2823 2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 2925 2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 3092 3093 3094 3095 3096 3097 3098 3099 3100 3101 3102 3103 3104 3105 3106 3107 3108 3109 3110 3111 3112 3113 3114 3115 3116 3117 3118 3119 3120 3121 3122 3123 3124 3125 3126 3127 3128 3129 3130 3131 3132 3133 3134 3135 3136 3137 3138 3139 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 3160 3161 3162 3163 3164 3165 3166 3167 3168 3169 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 3190 3191 3192 3193 3194 3195 3196 3197 3198 3199 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 3220 3221 3222 3223 3224 3225 3226 3227 3228 3229 3230 3231 3232 3233 3234 3235 3236 3237 3238 3239 3240 3241 3242 3243 3244 3245 3246 3247 3248 3249 3250 3251 3252 3253 3254 3255 3256 3257 3258 3259 3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 3280 3281 3282 3283 3284 3285 3286 3287 3288 3289 3290 3291 3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 3310 3311 3312 3313 3314 3315 3316 3317 3318 3319 3320 3321 3322 3323 3324 3325 3326 3327 3328 3329 3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 3353 3354 3355 3356 3357 3358 3359 3360 3361 3362 3363 3364 3365 3366 3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377 3378 3379 3380 3381 3382 3383 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439 3440 3441 3442 3443 3444 3445 3446 3447 3448 3449 3450 3451 3452 3453 3454 3455 3456 3457 3458 3459 3460 3461 3462 3463 3464 3465 3466 3467 3468 3469 3470 3471 3472 3473 3474 3475 3476 3477 3478 3479 3480 3481 3482 3483 3484 3485 3486 3487 3488 3489 3490 3491 3492 3493 3494 3495 3496 3497 3498 3499 3500 3501 3502 3503 3504 3505 3506 3507 3508 3509 3510 3511 3512 3513 3514 3515 3516 3517 3518 3519 3520 3521 3522 3523 3524 3525 3526 3527 3528 3529 3530 3531 3532 3533 3534 3535 3536 3537 3538 3539 3540 3541 3542 3543 3544 3545 3546 3547 3548 3549 3550 3551 3552 3553 3554 3555 3556 3557 3558 3559 3560 3561 3562 3563 3564 3565 3566 3567 3568 3569 3570 3571 3572 3573 3574 3575 3576 3577 3578 3579 3580 3581 3582 3583 3584 3585 3586 3587 3588 3589 3590 3591 3592 3593 3594 3595 3596 3597 3598 3599 3600 3601 3602 3603 3604 3605 3606 3607 3608 3609 3610 3611 3612 3613 3614 3615 3616 3617 3618 3619 3620 3621 3622 3623 3624 3625 3626 3627 3628 3629 3630 3631 3632 3633 3634 3635 3636 3637 3638 3639 3640 3641 3642 3643 3644 3645 3646 3647 3648 3649 3650 3651 3652 3653 3654 3655 3656 3657 3658 3659 3660 3661 3662 3663 3664 3665 3666 3667 3668 3669 3670 3671 3672 3673 3674 3675 3676 3677 3678 3679 3680 3681 3682 3683 3684 3685 3686 3687 3688 3689 3690 3691 3692 3693 3694 3695 3696 3697 3698 3699 3700 3701 3702 3703 3704 3705 3706 3707 3708 3709 3710 3711 3712 3713 3714 3715 3716 3717 3718 3719 3720 3721 3722 3723 3724 3725 3726 3727 3728 3729 3730 3731 3732 3733 3734 3735 3736 3737 3738 3739 3740 3741 3742 3743 3744 3745 3746 3747 3748 3749 3750 3751 3752 3753 3754 3755 3756 3757 3758 3759 3760 3761 3762 3763 3764 3765 3766 3767 3768 3769 3770 3771 3772 3773 3774 3775 3776 3777 3778 3779 3780 3781 3782 3783 3784 3785 3786 3787 3788 3789 3790 3791 3792 3793 3794 3795 3796 3797 3798 3799 3800 3801 3802 3803 3804 3805 3806 3807 3808 3809 3810 3811 3812 3813 3814 3815 3816 3817 3818 3819 3820 3821 3822 3823 3824 3825 3826 3827 3828 3829 3830 3831 3832 3833 3834 3835 3836 3837 3838 3839 3840 3841 3842 3843 3844 3845 3846 3847 3848 3849 3850 3851 3852 3853 3854 3855 3856 3857 3858 3859 3860 3861 3862 3863 3864 3865 3866 3867 3868 3869 3870 3871 3872 3873 3874 3875 3876 3877 3878 3879 3880 3881 3882 3883 3884 3885 3886 3887 3888 3889 3890 3891 3892 3893 3894 3895 3896 3897 3898 3899 3900 3901 3902 3903 3904 3905 3906 3907 3908 3909 3910 3911 3912 3913 3914 3915 3916 3917 3918 3919 3920 3921 3922 3923 3924 3925 3926 3927 3928 3929 3930 3931 3932 3933 3934 3935 3936 3937 3938 3939 3940 3941 3942 3943 3944 3945 3946 3947 3948 3949 3950 3951 3952 3953 3954 3955 3956 3957 3958 3959 3960 3961 3962 3963 3964 3965 3966 3967 3968 3969 3970 3971 3972 3973 3974 3975 3976 3977 3978 3979 3980 3981 3982 3983 3984 3985 3986 3987 3988 3989 3990 3991 3992 3993 3994 3995 3996 3997 3998 3999 4000 4001 4002 4003 4004 4005 4006 4007 4008 4009 4010 4011 4012 4013 4014 4015 4016 4017 4018 4019 4020 4021 4022 4023 4024 4025 4026 4027 4028 4029 4030 4031 4032 4033 4034 4035 4036 4037 4038 4039 4040 4041 4042 4043 4044 4045 4046 4047 4048 4049 4050 4051 4052 4053 4054 4055 4056 4057 4058 4059 4060 4061 4062 4063 4064 4065 4066 4067 4068 4069 4070 4071 4072 4073 4074 4075 4076 4077 4078 4079 4080 4081 4082 4083 4084 4085 4086 4087 4088 4089 4090 4091 4092 4093 4094 4095 4096 4097 4098 4099 4100 4101 4102 4103 4104 4105 4106 4107 4108 4109 4110 4111 4112 4113 4114 4115 4116 4117 4118 4119 4120 4121 4122 4123 4124 4125 4126 4127 4128 4129 4130 4131 4132 4133 4134 4135 4136 4137 4138 4139 4140 4141 4142 4143 4144 4145 4146 4147 4148 4149 4150 4151 4152 4153 4154 4155 4156 4157 4158 4159 4160 4161 4162 4163 4164 4165 4166 4167 4168 4169 4170 4171 4172 4173 4174 4175 4176 4177 4178 4179 4180 4181 4182 4183 4184 4185 4186 4187 4188 4189 4190 4191 4192 4193 4194 4195 4196 4197 4198 4199 4200 4201 4202 4203 4204 4205 4206 4207 4208 4209 4210 4211 4212 4213 4214 4215 4216 4217 4218 4219 4220 4221 4222 4223 4224 4225 4226 4227 4228 4229 4230 4231 4232 4233 4234 4235 4236 4237 4238 4239 4240 4241 4242 4243 4244 4245 4246 4247 4248 4249 4250 4251 4252 4253 4254 4255 4256 4257 4258 4259 4260 4261 4262 4263 4264 4265 4266 4267 4268 4269 4270 4271 4272 4273 4274 4275 4276 4277 4278 4279 4280 4281 4282 4283 4284 4285 4286 4287 4288 4289 4290 4291 4292 4293 4294 4295 4296 4297 4298 4299 4300 4301 4302 4303 4304 4305 4306 4307 4308 4309 4310 4311 4312 4313 4314 4315 4316 4317 4318 4319 4320 4321 4322 4323 4324 4325 4326 4327 4328 4329 4330 4331 4332 4333 4334 4335 4336 4337 4338 4339 4340 4341 4342 4343