X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Ftarget.c;h=aaad831700b7ef9101a6ec7e4ae2728ffacc5672;hp=bd334da25700ff80e6420ee0501622fb8eb945a8;hb=8d73c2a9b0c00c870694a57f7cfbc23e354855ac;hpb=a6a65f17f344ac3252075da18fb7cb3c6ae502d4 diff --git a/src/target/target.c b/src/target/target.c index bd334da257..aaad831700 100644 --- a/src/target/target.c +++ b/src/target/target.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 * @@ -52,8 +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_target_script_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); @@ -75,9 +76,16 @@ int handle_wp_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int handle_rwp_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_virt2phys_command(command_context_t *cmd_ctx, char *cmd, char **args, int argc); int handle_profile_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +static int jim_array2mem(Jim_Interp *interp, int argc, Jim_Obj *const *argv); +static int jim_mem2array(Jim_Interp *interp, int argc, Jim_Obj *const *argv); -/* targets - */ + +static int target_array2mem(Jim_Interp *interp, target_t *target, int argc, Jim_Obj *const *argv); +static int target_mem2array(Jim_Interp *interp, target_t *target, int argc, Jim_Obj *const *argv); + + + +/* targets */ extern target_type_t arm7tdmi_target; extern target_type_t arm720t_target; extern target_type_t arm9tdmi_target; @@ -88,6 +96,7 @@ extern target_type_t feroceon_target; extern target_type_t xscale_target; extern target_type_t cortexm3_target; extern target_type_t arm11_target; +extern target_type_t mips_m4k_target; target_type_t *target_types[] = { @@ -101,35 +110,109 @@ target_type_t *target_types[] = &xscale_target, &cortexm3_target, &arm11_target, + &mips_m4k_target, NULL, }; -target_t *targets = NULL; +target_t *all_targets = NULL; target_event_callback_t *target_event_callbacks = NULL; target_timer_callback_t *target_timer_callbacks = NULL; -char *target_state_strings[] = -{ - "unknown", - "running", - "halted", - "reset", - "debug_running", +const Jim_Nvp nvp_assert[] = { + { .name = "assert", NVP_ASSERT }, + { .name = "deassert", NVP_DEASSERT }, + { .name = "T", NVP_ASSERT }, + { .name = "F", NVP_DEASSERT }, + { .name = "t", NVP_ASSERT }, + { .name = "f", NVP_DEASSERT }, + { .name = NULL, .value = -1 } }; -char *target_debug_reason_strings[] = -{ - "debug request", "breakpoint", "watchpoint", - "watchpoint and breakpoint", "single step", - "target not halted", "undefined" +const Jim_Nvp nvp_target_event[] = { + { .value = TARGET_EVENT_HALTED, .name = "halted" }, + { .value = TARGET_EVENT_RESUMED, .name = "resumed" }, + { .value = TARGET_EVENT_RESUME_START, .name = "resume-start" }, + { .value = TARGET_EVENT_RESUME_END, .name = "resume-end" }, + + /* historical name */ + { .value = TARGET_EVENT_RESET_START , .name = "pre_reset" }, + { .value = TARGET_EVENT_RESET_START, .name = "reset-start" }, + /* historical name */ + { .value = TARGET_EVENT_RESET , .name = "reset" }, + { .value = TARGET_EVENT_RESET_INIT , .name = "reset-init" }, + { .value = TARGET_EVENT_RESET_END, .name = "reset-end" }, + + { .value = TARGET_EVENT_DEBUG_HALTED, .name = "debug-halted" }, + { .value = TARGET_EVENT_DEBUG_RESUMED, .name = "debug-resumed" }, + + { .value = TARGET_EVENT_GDB_ATTACH, .name = "gdb-attach" }, + { .value = TARGET_EVENT_GDB_DETACH, .name = "gdb-detach" }, + + { .value = TARGET_EVENT_GDB_FLASH_WRITE_START, .name = "gdb-flash-write-start" }, + { .value = TARGET_EVENT_GDB_FLASH_WRITE_END , .name = "gdb-flash-write-end" }, + + { .value = TARGET_EVENT_GDB_FLASH_ERASE_START , .name = "gdb_program_config" }, + + { .value = TARGET_EVENT_GDB_FLASH_ERASE_START, .name = "gdb-flash-erase-start" }, + { .value = TARGET_EVENT_GDB_FLASH_ERASE_END , .name = "gdb-flash-erase-end" }, + + { .value = TARGET_EVENT_RESUME_START, .name = "resume-start" }, + { .value = TARGET_EVENT_RESUMED , .name = "resume-ok" }, + { .value = TARGET_EVENT_RESUME_END , .name = "resume-end" }, + + { .name = NULL, .value = -1 } }; -char *target_endianess_strings[] = -{ - "big endian", - "little endian", +const Jim_Nvp nvp_target_state[] = { + { .name = "unknown", .value = TARGET_UNKNOWN }, + { .name = "running", .value = TARGET_RUNNING }, + { .name = "halted", .value = TARGET_HALTED }, + { .name = "reset", .value = TARGET_RESET }, + { .name = "debug-running", .value = TARGET_DEBUG_RUNNING }, + { .name = NULL, .value = -1 }, }; + +const Jim_Nvp nvp_target_debug_reason [] = { + { .name = "debug-request" , .value = DBG_REASON_DBGRQ }, + { .name = "breakpoint" , .value = DBG_REASON_BREAKPOINT }, + { .name = "watchpoint" , .value = DBG_REASON_WATCHPOINT }, + { .name = "watchpoint-and-breakpoint", .value = DBG_REASON_WPTANDBKPT }, + { .name = "single-step" , .value = DBG_REASON_SINGLESTEP }, + { .name = "target-not-halted" , .value = DBG_REASON_NOTHALTED }, + { .name = "undefined" , .value = DBG_REASON_UNDEFINED }, + { .name = NULL, .value = -1 }, +}; + + +const Jim_Nvp nvp_target_endian[] = { + { .name = "big", .value = TARGET_BIG_ENDIAN }, + { .name = "little", .value = TARGET_LITTLE_ENDIAN }, + { .name = "be", .value = TARGET_BIG_ENDIAN }, + { .name = "le", .value = TARGET_LITTLE_ENDIAN }, + { .name = NULL, .value = -1 }, +}; + + +/* determine the number of the new target */ +static int +new_target_number( void ) +{ + target_t *t; + int x; + + /* number is 0 based */ + x = -1; + t = all_targets; + while(t){ + if( x < t->target_number ){ + x = t->target_number; + } + t = t->next; + } + return x+1; +} + static int target_continous_poll = 1; /* read a u32 from a buffer in target memory endianness */ @@ -150,6 +233,12 @@ u16 target_buffer_get_u16(target_t *target, u8 *buffer) return be_to_h_u16(buffer); } +/* read a u8 from a buffer in target memory endianness */ +u8 target_buffer_get_u8(target_t *target, u8 *buffer) +{ + return *buffer & 0x0ff; +} + /* write a u32 to a buffer in target memory endianness */ void target_buffer_set_u32(target_t *target, u8 *buffer, u32 value) { @@ -168,18 +257,22 @@ void target_buffer_set_u16(target_t *target, u8 *buffer, u16 value) h_u16_to_be(buffer, value); } +/* write a u8 to a buffer in target memory endianness */ +void target_buffer_set_u8(target_t *target, u8 *buffer, u8 value) +{ + *buffer = value; +} + /* returns a pointer to the n-th configured target */ target_t* get_target_by_num(int num) { - target_t *target = targets; - int i = 0; + target_t *target = all_targets; - while (target) - { - if (num == i) + while (target){ + if( target->target_number == num ){ return target; + } target = target->next; - i++; } return NULL; @@ -187,58 +280,22 @@ target_t* get_target_by_num(int num) int get_num_by_target(target_t *query_target) { - target_t *target = targets; - int i = 0; - - while (target) - { - if (target == query_target) - return i; - target = target->next; - i++; - } - - return -1; + return query_target->target_number; } 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) { @@ -265,225 +322,118 @@ 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; - int timeout_ms = 5000; - + /* 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; - - /* only check for resume event if normal resume */ - if (!debug_execution) - { - /* wait for target to exit halted mode - not debug resume*/ - target_poll(target); - - while (target->state != TARGET_RUNNING) - { - usleep(10000); - target_poll(target); - if ((timeout_ms -= 10) <= 0) - { - LOG_ERROR("timeout waiting for target resume"); - return ERROR_TARGET_TIMEOUT; - } - } - } - + return retval; } -int target_process_reset(struct command_context_s *cmd_ctx) +int target_process_reset(struct command_context_s *cmd_ctx, enum target_reset_mode reset_mode) { int retval = ERROR_OK; target_t *target; - struct timeval timeout, now; - - jtag->speed(jtag_speed); - target = targets; + target = all_targets; while (target) { target_invoke_script(cmd_ctx, target, "pre_reset"); target = target->next; } - + if ((retval = jtag_init_reset(cmd_ctx)) != ERROR_OK) return retval; - - /* First time this is executed after launching OpenOCD, it will read out + + keep_alive(); /* we might be running on a very slow JTAG clk */ + + /* 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) + if ((retval = target_examine()) != ERROR_OK) return retval; - - /* prepare reset_halt where necessary */ - target = targets; - while (target) - { - if (jtag_reset_config & RESET_SRST_PULLS_TRST) - { - switch (target->reset_mode) - { - case RESET_HALT: - command_print(cmd_ctx, "nSRST pulls nTRST, falling back to \"reset run_and_halt\""); - target->reset_mode = RESET_RUN_AND_HALT; - break; - case RESET_INIT: - command_print(cmd_ctx, "nSRST pulls nTRST, falling back to \"reset run_and_init\""); - target->reset_mode = RESET_RUN_AND_INIT; - break; - default: - break; - } - } - target = target->next; - } - - target = targets; + + keep_alive(); /* we might be running on a very slow JTAG clk */ + + target = all_targets; while (target) { /* we have no idea what state the target is in, so we * have to drop working areas */ target_free_all_working_areas_restore(target, 0); - target->type->assert_reset(target); + target->reset_halt=((reset_mode==RESET_HALT)||(reset_mode==RESET_INIT)); + if ((retval = target->type->assert_reset(target))!=ERROR_OK) + return retval; target = target->next; } - if ((retval = jtag_execute_queue()) != ERROR_OK) - { - LOG_WARNING("JTAG communication failed asserting reset."); - retval = ERROR_OK; - } - - /* request target halt if necessary, and schedule further action */ - target = targets; + + target = all_targets; while (target) { - switch (target->reset_mode) - { - 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: - target_halt(target); - break; - case RESET_INIT: - target_halt(target); - target_register_event_callback(target_init_handler, cmd_ctx); - break; - default: - LOG_ERROR("BUG: unknown target->reset_mode"); - } + if ((retval = target->type->deassert_reset(target))!=ERROR_OK) + return retval; 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; - } - - target = targets; + + target = all_targets; while (target) { - target->type->deassert_reset(target); + /* We can fail to bring the target into the halted state, try after reset has been deasserted */ + if (target->reset_halt) + { + /* wait up to 1 second for halt. */ + target_wait_state(target, TARGET_HALTED, 1000); + if (target->state != TARGET_HALTED) + { + LOG_WARNING("Failed to reset target into halted mode - issuing halt"); + if ((retval = target->type->halt(target))!=ERROR_OK) + return retval; + } + } + target = target->next; } - - if ((retval = jtag_execute_queue()) != ERROR_OK) - { - LOG_WARNING("JTAG communication failed while deasserting reset."); - retval = ERROR_OK; - } - if (jtag_reset_config & RESET_SRST_PULLS_TRST) - { - /* 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 approperiate"); - - /* Wait for reset to complete, maximum 5 seconds. */ - gettimeofday(&timeout, NULL); - timeval_add_time(&timeout, 5, 0); - for(;;) + + LOG_DEBUG("Waiting for halted stated as appropriate"); + + if ((reset_mode == RESET_HALT) || (reset_mode == RESET_INIT)) { - gettimeofday(&now, NULL); - - target_call_timer_callbacks_now(); - - target = targets; + target = all_targets; while (target) { - LOG_DEBUG("Polling target"); - target_poll(target); - if ((target->reset_mode == RESET_RUN_AND_INIT) || - (target->reset_mode == RESET_RUN_AND_HALT) || - (target->reset_mode == RESET_HALT) || - (target->reset_mode == RESET_INIT)) + /* Wait for reset to complete, maximum 5 seconds. */ + if (((retval=target_wait_state(target, TARGET_HALTED, 5000)))==ERROR_OK) { - 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; - } + if (reset_mode == RESET_INIT) + target_invoke_script(cmd_ctx, target, "post_reset"); + } target = target->next; } - /* 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); - - jtag->speed(jtag_speed_post_reset); - return retval; } @@ -499,7 +449,7 @@ static int default_mmu(struct target_s *target, int *enabled) return ERROR_OK; } -static int default_examine(struct command_context_s *cmd_ctx, struct target_s *target) +static int default_examine(struct target_s *target) { target->type->examined = 1; return ERROR_OK; @@ -508,16 +458,16 @@ 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) +int target_examine(void) { int retval = ERROR_OK; - target_t *target = targets; + target_t *target = all_targets; while (target) { - if ((retval = target->type->examine(cmd_ctx, target))!=ERROR_OK) + if ((retval = target->type->examine(target))!=ERROR_OK) return retval; target = target->next; } @@ -566,8 +516,8 @@ 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; - + target_t *target = all_targets; + while (target) { target->type->examined = 0; @@ -575,13 +525,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) { @@ -600,44 +550,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) + + if (all_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; } @@ -645,24 +595,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); @@ -672,10 +622,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; } @@ -683,12 +633,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; @@ -702,7 +652,7 @@ int target_unregister_event_callback(int (*callback)(struct target_s *target, en p = &(c->next); c = next; } - + return ERROR_OK; } @@ -710,12 +660,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; @@ -729,7 +679,7 @@ int target_unregister_timer_callback(int (*callback)(void *priv), void *priv) p = &(c->next); c = next; } - + return ERROR_OK; } @@ -737,16 +687,17 @@ 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; } @@ -756,12 +707,14 @@ static int target_call_timer_callbacks_check_time(int checktime) target_timer_callback_t *next_callback; 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))) @@ -785,29 +738,29 @@ static int target_call_timer_callbacks_check_time(int checktime) target_unregister_timer_callback(callback->callback, callback->priv); } } - + callback = next_callback; } - + return ERROR_OK; } -int target_call_timer_callbacks() +int target_call_timer_callbacks(void) { return target_call_timer_callbacks_check_time(1); } /* invoke periodic callbacks immediately */ -int target_call_timer_callbacks_now() +int target_call_timer_callbacks_now(void) { - return target_call_timer_callbacks(0); + return target_call_timer_callbacks(); } int target_alloc_working_area(struct target_s *target, u32 size, working_area_t **area) { 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) { @@ -827,14 +780,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) { @@ -845,16 +798,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) { @@ -863,18 +816,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); @@ -884,18 +837,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; } @@ -903,16 +856,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; } @@ -929,36 +882,38 @@ 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, "target_script", handle_target_script_command, COMMAND_CONFIG, - "target_script "); - 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 "); + + + /* script procedures */ + register_jim(cmd_ctx, "ocd_mem2array", jim_mem2array, "read memory and return as a TCL array for script processing"); + register_jim(cmd_ctx, "ocd_array2mem", jim_array2mem, "convert a TCL array to memory locations and write the values"); return ERROR_OK; } @@ -970,57 +925,65 @@ 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]); - + + LOG_USER("target state: %s", + Jim_Nvp_value2name_simple(nvp_target_state,target->state)->name); + 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) { int retval; + LOG_DEBUG("writing buffer of %i byte at 0x%8.8x", size, address); + if (!target->type->examined) { LOG_ERROR("Target not examined yet"); return ERROR_FAIL; } - - LOG_DEBUG("writing buffer of %i byte at 0x%8.8x", size, address); - + + if ((address + size - 1) < address) + { + /* GDB can request this when e.g. PC is 0xfffffffc*/ + LOG_ERROR("address+size wrapped(0x%08x, 0x%08x)", address, size); + return ERROR_FAIL; + } + if (((address % 2) == 0) && (size == 2)) { return target->type->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) { @@ -1032,79 +995,86 @@ 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) { int retval; + LOG_DEBUG("reading buffer of %i byte at 0x%8.8x", size, address); + if (!target->type->examined) { LOG_ERROR("Target not examined yet"); return ERROR_FAIL; } - LOG_DEBUG("reading buffer of %i byte at 0x%8.8x", size, address); - + if ((address + size - 1) < address) + { + /* GDB can request this when e.g. PC is 0xfffffffc*/ + LOG_ERROR("address+size wrapped(0x%08x, 0x%08x)", address, size); + return ERROR_FAIL; + } + if (((address % 2) == 0) && (size == 2)) { return target->type->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; } @@ -1119,7 +1089,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) { @@ -1147,9 +1117,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; } @@ -1161,12 +1131,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; } @@ -1180,7 +1150,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); @@ -1191,7 +1161,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; } @@ -1205,7 +1175,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); @@ -1216,7 +1186,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; } @@ -1238,7 +1208,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; } @@ -1254,12 +1224,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; } @@ -1275,12 +1245,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; } @@ -1299,7 +1269,7 @@ int target_write_u8(struct target_s *target, u32 address, u8 value) { LOG_DEBUG("failed: %i", retval); } - + return retval; } @@ -1311,63 +1281,82 @@ 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] - default is run"); 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']"); + + 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]"); - register_command(cmd_ctx, NULL, "load_binary", handle_load_image_command, COMMAND_EXEC, "[DEPRECATED] load_binary
"); - register_command(cmd_ctx, NULL, "dump_binary", handle_dump_image_command, COMMAND_EXEC, "[DEPRECATED] dump_binary
"); - + target_request_register_commands(cmd_ctx); trace_register_commands(cmd_ctx); - + return ERROR_OK; } int handle_targets_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { - target_t *target = targets; - int count = 0; - + char *cp; + target_t *target = all_targets; + if (argc == 1) { - int num = strtoul(args[0], NULL, 0); - - while (target) - { - count++; - target = target->next; + /* try as tcltarget name */ + for( target = all_targets ; target ; target++ ){ + if( target->cmd_name ){ + if( 0 == strcmp( args[0], target->cmd_name ) ){ + /* MATCH */ + goto Match; + } + } } + /* no match, try as number */ - 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); + int num = strtoul(args[0], &cp, 0 ); + if( *cp != 0 ){ + /* then it was not a number */ + command_print( cmd_ctx, "Target: %s unknown, try one of:\n", args[0] ); + goto DumpTargets; + } + target = get_target_by_num( num ); + if( target == NULL ){ + command_print(cmd_ctx,"Target: %s is unknown, try one of:\n", args[0] ); + goto DumpTargets; + } + Match: + cmd_ctx->current_target = target->target_number; return ERROR_OK; } - + DumpTargets: + + command_print(cmd_ctx, " CmdName Type Endian State "); + command_print(cmd_ctx, "-- ---------- ---------- ---------- ----------"); 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]); + /* XX: abcdefghij abcdefghij abcdefghij abcdefghij */ + command_print(cmd_ctx, "%2d: %-10s %-10s %-10s %s", + target->target_number, + "", // future: target->cmd_name + target->type->name, + Jim_Nvp_value2name_simple( nvp_target_endian, target->endianness )->name, + Jim_Nvp_value2name_simple( nvp_target_state, target->state )->name ); target = target->next; } - + return ERROR_OK; } @@ -1375,12 +1364,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)) { @@ -1388,8 +1377,8 @@ 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; - + target_t **last_target_p = &all_targets; + /* register target specific commands */ if (target_types[i]->register_commands(cmd_ctx) != ERROR_OK) { @@ -1404,12 +1393,18 @@ int handle_target_command(struct command_context_s *cmd_ctx, char *cmd, char **a last_target_p = &((*last_target_p)->next); } - *last_target_p = malloc(sizeof(target_t)); - + // get target number *before* adding new target to the list */ + i = new_target_number(); + // calloc will init the memory to zero for us + *last_target_p = calloc(1,sizeof(target_t)); + // save target number. + (*last_target_p)->cmd_name = NULL; + (*last_target_p)->target_number = i; + /* 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) @@ -1419,32 +1414,44 @@ 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; } - - /* what to do on a target reset */ - (*last_target_p)->reset_mode = RESET_INIT; /* default */ + if (strcmp(args[2], "reset_halt") == 0) - (*last_target_p)->reset_mode = RESET_HALT; + { + LOG_WARNING("reset_mode argument is obsolete."); + return ERROR_COMMAND_SYNTAX_ERROR; + } else if (strcmp(args[2], "reset_run") == 0) - (*last_target_p)->reset_mode = RESET_RUN; + { + LOG_WARNING("reset_mode argument is obsolete."); + return ERROR_COMMAND_SYNTAX_ERROR; + } else if (strcmp(args[2], "reset_init") == 0) - (*last_target_p)->reset_mode = RESET_INIT; + { + LOG_WARNING("reset_mode argument is obsolete."); + return ERROR_COMMAND_SYNTAX_ERROR; + } else if (strcmp(args[2], "run_and_halt") == 0) - (*last_target_p)->reset_mode = RESET_RUN_AND_HALT; + { + LOG_WARNING("reset_mode argument is obsolete."); + return ERROR_COMMAND_SYNTAX_ERROR; + } else if (strcmp(args[2], "run_and_init") == 0) - (*last_target_p)->reset_mode = RESET_RUN_AND_INIT; + { + LOG_WARNING("reset_mode argument is obsolete."); + return ERROR_COMMAND_SYNTAX_ERROR; + } else { /* Kludge! we want to make this reset arg optional while remaining compatible! */ 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; @@ -1452,7 +1459,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; @@ -1462,18 +1469,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) { @@ -1486,90 +1493,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_%s_%d} t]==0} {target_%s_%d}", - name, get_num_by_target(target), - name, get_num_by_target(target)); -} - -int handle_target_script_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) -{ - target_t *target = NULL; - - if (argc < 3) - { - LOG_ERROR("incomplete target_script command"); - return ERROR_COMMAND_SYNTAX_ERROR; - } - - target = get_target_by_num(strtoul(args[0], NULL, 0)); - - if (!target) - { - return ERROR_COMMAND_SYNTAX_ERROR; - } - - const char *event=args[1]; - if (strcmp("reset", event)==0) - { - /* synonymous */ - event="post_reset"; - } - - /* Define a tcl procedure which we'll invoke upon some event */ - command_run_linef(cmd_ctx, - "proc target_%s_%d {} {" - "openocd {script %s} ; return \"\"" - "}", - event, - get_num_by_target(target), - args[2]); - - return ERROR_OK; -} - -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; + 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_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; @@ -1583,7 +1534,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; } @@ -1591,8 +1542,8 @@ int handle_working_area_command(struct command_context_s *cmd_ctx, char *cmd, ch /* process target state changes */ int handle_target(void *priv) { - target_t *target = targets; - + target_t *target = all_targets; + while (target) { if (target_continous_poll) @@ -1600,10 +1551,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; } @@ -1613,16 +1564,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) { @@ -1635,16 +1586,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) { @@ -1661,7 +1612,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); @@ -1670,7 +1621,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]); @@ -1683,7 +1634,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); @@ -1699,7 +1650,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) { @@ -1712,24 +1663,23 @@ 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; } -static int wait_state(struct command_context_s *cmd_ctx, char *cmd, enum target_state state, int ms); int handle_poll_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { @@ -1755,15 +1705,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; @@ -1775,24 +1725,24 @@ int handle_wait_halt_command(struct command_context_s *cmd_ctx, char *cmd, char return ERROR_OK; } } + target_t *target = get_current_target(cmd_ctx); - return wait_state(cmd_ctx, cmd, TARGET_HALTED, ms); + return target_wait_state(target, TARGET_HALTED, ms); } -static int wait_state(struct command_context_s *cmd_ctx, char *cmd, enum target_state state, int ms) +int target_wait_state(target_t *target, enum target_state state, int ms) { int retval; struct timeval timeout, now; int once=1; gettimeofday(&timeout, NULL); timeval_add_time(&timeout, 0, ms * 1000); - - target_t *target = get_current_target(cmd_ctx); + for (;;) { if ((retval=target_poll(target))!=ERROR_OK) return retval; - target_call_timer_callbacks_now(); + keep_alive(); if (target->state == state) { break; @@ -1800,17 +1750,19 @@ static int wait_state(struct command_context_s *cmd_ctx, char *cmd, enum target_ if (once) { once=0; - command_print(cmd_ctx, "waiting for target %s...", target_state_strings[state]); + LOG_DEBUG("waiting for target %s...", + Jim_Nvp_value2name_simple(nvp_target_state,state)->name); } - + 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; + LOG_ERROR("timed out while waiting for target %s", + Jim_Nvp_value2name_simple(nvp_target_state,state)->name); + return ERROR_FAIL; } } - + return ERROR_OK; } @@ -1825,79 +1777,50 @@ 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; } int handle_reset_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { - target_t *target = get_current_target(cmd_ctx); - enum target_reset_mode reset_mode = target->reset_mode; - enum target_reset_mode save = target->reset_mode; - - LOG_DEBUG("-"); - + enum target_reset_mode reset_mode = RESET_RUN; + if (argc >= 1) { if (strcmp("run", args[0]) == 0) reset_mode = RESET_RUN; else if (strcmp("halt", args[0]) == 0) 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 if (strcmp("init", args[0]) == 0) + reset_mode = RESET_INIT; else { - command_print(cmd_ctx, "usage: reset ['run', 'halt', 'init', 'run_and_halt', 'run_and_init]"); - return ERROR_OK; + return ERROR_COMMAND_SYNTAX_ERROR; } } - - /* temporarily modify mode of current reset target */ - target->reset_mode = reset_mode; /* reset *all* targets */ - target_process_reset(cmd_ctx); - - /* Restore default reset mode for this target */ - target->reset_mode = save; - - return ERROR_OK; + return target_process_reset(cmd_ctx, reset_mode); } int handle_resume_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { 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) @@ -1906,22 +1829,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; } @@ -1949,7 +1872,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]) { @@ -1971,12 +1894,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: @@ -1989,7 +1912,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); @@ -1999,7 +1922,7 @@ int handle_md_command(struct command_context_s *cmd_ctx, char *cmd, char **args, } free(buffer); - + return retval; } @@ -2020,7 +1943,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': @@ -2070,22 +1993,23 @@ int handle_load_image_command(struct command_context_s *cmd_ctx, char *cmd, char u8 *buffer; u32 buf_cnt; u32 image_size; + u32 min_address=0; + u32 max_address=0xffffffff; 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) + if ((argc < 1)||(argc > 5)) { - command_print(cmd_ctx, "usage: load_image [address] [type]"); - return ERROR_OK; + return ERROR_COMMAND_SYNTAX_ERROR; } - + /* a base address isn't always necessary, default to 0x0 (i.e. don't relocate) */ if (argc >= 2) { @@ -2096,16 +2020,32 @@ 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); + } + if (argc>=5) + { + 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++) @@ -2116,20 +2056,43 @@ 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; } - if ((retval = target_write_buffer(target, image.sections[i].base_address, buf_cnt, buffer)) != ERROR_OK) + + 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); + break; + } + image_size += length; + command_print(cmd_ctx, "%u byte written at address 0x%8.8x", length, image.sections[i].base_address+offset); } - image_size += buf_cnt; - command_print(cmd_ctx, "%u byte written at address 0x%8.8x", buf_cnt, image.sections[i].base_address); - + free(buffer); } @@ -2139,7 +2102,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; @@ -2149,15 +2112,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) @@ -2174,31 +2137,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; } @@ -2211,7 +2174,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; } @@ -2225,26 +2188,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; @@ -2262,7 +2225,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++) @@ -2278,26 +2241,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; @@ -2322,23 +2285,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; } @@ -2372,7 +2335,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; @@ -2418,13 +2381,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]) @@ -2451,7 +2414,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) { @@ -2462,7 +2425,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; } @@ -2472,7 +2435,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; } @@ -2496,8 +2459,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; @@ -2508,13 +2471,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); } @@ -2531,8 +2494,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]; @@ -2550,12 +2513,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) @@ -2570,10 +2533,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 @@ -2585,9 +2548,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) { @@ -2618,7 +2581,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) { @@ -2626,23 +2589,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); @@ -2652,7 +2615,7 @@ int handle_profile_command(struct command_context_s *cmd_ctx, char *cmd, char ** samples[numSamples++]=t; retval = target_resume(target, 1, 0, 0, 0); /* current pc, addr = 0, do not handle breakpoints, not debugging */ target_poll(target); - usleep(10*1000); // sleep 10ms, i.e. <100 samples/second. + alive_sleep(10); // sleep 10ms, i.e. <100 samples/second. } else if (target->state == TARGET_RUNNING) { // We want to quickly sample the PC. @@ -2667,7 +2630,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))) { @@ -2684,6 +2647,377 @@ int handle_profile_command(struct command_context_s *cmd_ctx, char *cmd, char ** } } free(samples); - + return ERROR_OK; } + +static int new_int_array_element(Jim_Interp * interp, const char *varname, int idx, u32 val) +{ + char *namebuf; + Jim_Obj *nameObjPtr, *valObjPtr; + int result; + + 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) + { + free(namebuf); + return JIM_ERR; + } + + Jim_IncrRefCount(nameObjPtr); + Jim_IncrRefCount(valObjPtr); + result = Jim_SetVariable(interp, nameObjPtr, valObjPtr); + Jim_DecrRefCount(interp, nameObjPtr); + Jim_DecrRefCount(interp, valObjPtr); + free(namebuf); + /* printf("%s(%d) <= 0%08x\n", varname, idx, val); */ + return result; +} + +static int jim_mem2array(Jim_Interp *interp, int argc, Jim_Obj *const *argv) +{ + command_context_t *context; + target_t *target; + + context = Jim_GetAssocData(interp, "context"); + if (context == NULL) + { + LOG_ERROR("mem2array: no command context"); + return JIM_ERR; + } + target = get_current_target(context); + if (target == NULL) + { + LOG_ERROR("mem2array: no current target"); + return JIM_ERR; + } + + return target_mem2array(interp, target, argc,argv); +} + +static int target_mem2array(Jim_Interp *interp, target_t *target, int argc, Jim_Obj *const *argv) +{ + long l; + u32 width; + u32 len; + u32 addr; + u32 count; + u32 v; + const char *varname; + u8 buffer[4096]; + int i, n, e, retval; + + /* argv[1] = name of array to receive the data + * argv[2] = desired width + * argv[3] = memory address + * argv[4] = count of times to read + */ + if (argc != 5) { + Jim_WrongNumArgs(interp, 1, argv, "varname width addr nelems"); + return JIM_ERR; + } + varname = Jim_GetString(argv[1], &len); + /* given "foo" get space for worse case "foo(%d)" .. add 20 */ + + e = Jim_GetLong(interp, argv[2], &l); + width = l; + if (e != JIM_OK) { + return e; + } + + e = Jim_GetLong(interp, argv[3], &l); + addr = l; + if (e != JIM_OK) { + return e; + } + e = Jim_GetLong(interp, argv[4], &l); + len = l; + if (e != JIM_OK) { + return e; + } + switch (width) { + case 8: + width = 1; + break; + case 16: + width = 2; + break; + case 32: + width = 4; + break; + default: + Jim_SetResult(interp, Jim_NewEmptyStringObj(interp)); + Jim_AppendStrings( interp, Jim_GetResult(interp), "Invalid width param, must be 8/16/32", NULL ); + return JIM_ERR; + } + if (len == 0) { + Jim_SetResult(interp, Jim_NewEmptyStringObj(interp)); + Jim_AppendStrings(interp, Jim_GetResult(interp), "mem2array: zero width read?", NULL); + return JIM_ERR; + } + if ((addr + (len * width)) < addr) { + Jim_SetResult(interp, Jim_NewEmptyStringObj(interp)); + Jim_AppendStrings(interp, Jim_GetResult(interp), "mem2array: addr + len - wraps to zero?", NULL); + return JIM_ERR; + } + /* absurd transfer size? */ + if (len > 65536) { + 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))) { + /* all is well */ + } 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); + Jim_AppendStrings(interp, Jim_GetResult(interp), buf , NULL); + return JIM_ERR; + } + + /* Transfer loop */ + + /* index counter */ + n = 0; + /* assume ok */ + 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 !*/ + LOG_ERROR("mem2array: Read @ 0x%08x, w=%d, cnt=%d, failed", addr, width, count); + Jim_SetResult(interp, Jim_NewEmptyStringObj(interp)); + Jim_AppendStrings(interp, Jim_GetResult(interp), "mem2array: cannot read memory", NULL); + e = JIM_ERR; + len = 0; + } else { + v = 0; /* shut up gcc */ + for (i = 0 ;i < count ;i++, n++) { + switch (width) { + case 4: + v = target_buffer_get_u32(target, &buffer[i*width]); + break; + case 2: + v = target_buffer_get_u16(target, &buffer[i*width]); + break; + case 1: + v = buffer[i] & 0x0ff; + break; + } + new_int_array_element(interp, varname, n, v); + } + len -= count; + } + } + + Jim_SetResult(interp, Jim_NewEmptyStringObj(interp)); + + return JIM_OK; +} + +static int get_int_array_element(Jim_Interp * interp, const char *varname, int idx, u32 *val) +{ + char *namebuf; + Jim_Obj *nameObjPtr, *valObjPtr; + int result; + long l; + + namebuf = alloc_printf("%s(%d)", varname, idx); + if (!namebuf) + return JIM_ERR; + + nameObjPtr = Jim_NewStringObj(interp, namebuf, -1); + if (!nameObjPtr) + { + free(namebuf); + return JIM_ERR; + } + + Jim_IncrRefCount(nameObjPtr); + valObjPtr = Jim_GetVariable(interp, nameObjPtr, JIM_ERRMSG); + Jim_DecrRefCount(interp, nameObjPtr); + free(namebuf); + if (valObjPtr == NULL) + return JIM_ERR; + + result = Jim_GetLong(interp, valObjPtr, &l); + /* printf("%s(%d) => 0%08x\n", varname, idx, val); */ + *val = l; + return result; +} + +static int jim_array2mem(Jim_Interp *interp, int argc, Jim_Obj *const *argv) +{ + command_context_t *context; + target_t *target; + + context = Jim_GetAssocData(interp, "context"); + if (context == NULL){ + LOG_ERROR("array2mem: no command context"); + return JIM_ERR; + } + target = get_current_target(context); + if (target == NULL){ + LOG_ERROR("array2mem: no current target"); + return JIM_ERR; + } + + return target_array2mem( interp,target, argc, argv ); +} + + +static int target_array2mem(Jim_Interp *interp, target_t *target, int argc, Jim_Obj *const *argv) +{ + long l; + u32 width; + u32 len; + u32 addr; + u32 count; + u32 v; + const char *varname; + u8 buffer[4096]; + int i, n, e, retval; + + /* argv[1] = name of array to get the data + * argv[2] = desired width + * argv[3] = memory address + * argv[4] = count to write + */ + if (argc != 5) { + Jim_WrongNumArgs(interp, 1, argv, "varname width addr nelems"); + return JIM_ERR; + } + varname = Jim_GetString(argv[1], &len); + /* given "foo" get space for worse case "foo(%d)" .. add 20 */ + + e = Jim_GetLong(interp, argv[2], &l); + width = l; + if (e != JIM_OK) { + return e; + } + + e = Jim_GetLong(interp, argv[3], &l); + addr = l; + if (e != JIM_OK) { + return e; + } + e = Jim_GetLong(interp, argv[4], &l); + len = l; + if (e != JIM_OK) { + return e; + } + switch (width) { + case 8: + width = 1; + break; + case 16: + width = 2; + break; + case 32: + width = 4; + break; + default: + Jim_SetResult(interp, Jim_NewEmptyStringObj(interp)); + Jim_AppendStrings( interp, Jim_GetResult(interp), "Invalid width param, must be 8/16/32", NULL ); + return JIM_ERR; + } + if (len == 0) { + Jim_SetResult(interp, Jim_NewEmptyStringObj(interp)); + Jim_AppendStrings(interp, Jim_GetResult(interp), "array2mem: zero width read?", NULL); + return JIM_ERR; + } + if ((addr + (len * width)) < addr) { + Jim_SetResult(interp, Jim_NewEmptyStringObj(interp)); + Jim_AppendStrings(interp, Jim_GetResult(interp), "array2mem: addr + len - wraps to zero?", NULL); + return JIM_ERR; + } + /* absurd transfer size? */ + if (len > 65536) { + 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))) { + /* all is well */ + } 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); + Jim_AppendStrings(interp, Jim_GetResult(interp), buf , NULL); + return JIM_ERR; + } + + + /* Transfer loop */ + + /* index counter */ + n = 0; + /* assume ok */ + e = JIM_OK; + while (len) { + /* Slurp... in buffer size chunks */ + + count = len; /* in objects.. */ + if (count > (sizeof(buffer)/width)) { + count = (sizeof(buffer)/width); + } + + v = 0; /* shut up gcc */ + for (i = 0 ;i < count ;i++, n++) { + get_int_array_element(interp, varname, n, &v); + switch (width) { + case 4: + target_buffer_set_u32(target, &buffer[i*width], v); + break; + case 2: + target_buffer_set_u16(target, &buffer[i*width], v); + break; + case 1: + buffer[i] = v & 0x0ff; + break; + } + } + len -= count; + + retval = target->type->write_memory(target, addr, width, count, buffer); + if (retval != ERROR_OK) { + /* BOO !*/ + LOG_ERROR("array2mem: Write @ 0x%08x, w=%d, cnt=%d, failed", addr, width, count); + Jim_SetResult(interp, Jim_NewEmptyStringObj(interp)); + Jim_AppendStrings(interp, Jim_GetResult(interp), "array2mem: cannot read memory", NULL); + e = JIM_ERR; + len = 0; + } + } + + Jim_SetResult(interp, Jim_NewEmptyStringObj(interp)); + + return JIM_OK; +} + + +/* + * Local Variables: *** + * c-basic-offset: 4 *** + * tab-width: 4 *** + * End: *** + */