From cb582796539d35920e918bec2d0118eb3736d40e Mon Sep 17 00:00:00 2001 From: drath Date: Thu, 15 Mar 2007 13:36:44 +0000 Subject: - reworked file i/o. every fileaccess (target, flash, nand, in future configuration, too) should now go through the fileio subsystem - added support for reading IHEX files (through fileio) - load/dump_binary renamed to the more generic load/dump_image
['bin'|'ihex'] - added NAND framework (preliminary) - added support for the LPC3180 SLC and MLC NAND controllers (preliminary) - fix initialization for parport - gw16012 fixes/cleanups - added EmbeddedICE version 7 (preliminary, reported on two LPC23xx devices so far) - added 'arm7_9 etm ' configuration command to enable access to the ETM registers git-svn-id: svn://svn.berlios.de/openocd/trunk@132 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/target/arm7_9_common.c | 34 +++++++++++ src/target/arm7tdmi.c | 3 - src/target/arm9tdmi.c | 20 ++----- src/target/embeddedice.c | 6 ++ src/target/target.c | 146 ++++++++++++++++++++++++++++----------------- 5 files changed, 136 insertions(+), 73 deletions(-) (limited to 'src/target') diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c index 8e74deda..a3ef8dea 100644 --- a/src/target/arm7_9_common.c +++ b/src/target/arm7_9_common.c @@ -54,6 +54,7 @@ int handle_arm7_9_force_hw_bkpts_command(struct command_context_s *cmd_ctx, char int handle_arm7_9_dbgrq_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_arm7_9_fast_memory_access_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_arm7_9_dcc_downloads_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +int handle_arm7_9_etm_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int arm7_9_reinit_embeddedice(target_t *target) { @@ -2049,6 +2050,8 @@ int arm7_9_register_commands(struct command_context_s *cmd_ctx) command_t *arm7_9_cmd; arm7_9_cmd = register_command(cmd_ctx, NULL, "arm7_9", NULL, COMMAND_ANY, "arm7/9 specific commands"); + + register_command(cmd_ctx, arm7_9_cmd, "etm", handle_arm7_9_etm_command, COMMAND_CONFIG, NULL); register_command(cmd_ctx, arm7_9_cmd, "write_xpsr", handle_arm7_9_write_xpsr_command, COMMAND_EXEC, "write program status register "); register_command(cmd_ctx, arm7_9_cmd, "write_xpsr_im8", handle_arm7_9_write_xpsr_im8_command, COMMAND_EXEC, "write program status register <8bit immediate> "); @@ -2376,6 +2379,37 @@ int handle_arm7_9_dcc_downloads_command(struct command_context_s *cmd_ctx, char return ERROR_OK; } +int handle_arm7_9_etm_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +{ + target_t *target; + armv4_5_common_t *armv4_5; + arm7_9_common_t *arm7_9; + + if (argc != 1) + { + ERROR("incomplete 'arm7_9 etm ' command"); + exit(-1); + } + + target = get_target_by_num(strtoul(args[0], NULL, 0)); + + if (!target) + { + ERROR("target number '%s' not defined", args[0]); + exit(-1); + } + + if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK) + { + command_print(cmd_ctx, "current target isn't an ARM7/ARM9 target"); + return ERROR_OK; + } + + arm7_9->has_etm = 1; + + return ERROR_OK; +} + int arm7_9_init_arch_info(target_t *target, arm7_9_common_t *arm7_9) { armv4_5_common_t *armv4_5 = &arm7_9->armv4_5_common; diff --git a/src/target/arm7tdmi.c b/src/target/arm7tdmi.c index 5d925e21..a87b8a4a 100644 --- a/src/target/arm7tdmi.c +++ b/src/target/arm7tdmi.c @@ -736,8 +736,6 @@ void arm7tdmi_build_reg_cache(target_t *target) armv4_5_common_t *armv4_5 = target->arch_info; arm7_9_common_t *arm7_9 = armv4_5->arch_info; arm_jtag_t *jtag_info = &arm7_9->jtag_info; - arm7tdmi_common_t *arch_info = arm7_9->arch_info; - (*cache_p) = armv4_5_build_reg_cache(target, armv4_5); armv4_5->core_cache = (*cache_p); @@ -771,7 +769,6 @@ int arm7tdmi_init_arch_info(target_t *target, arm7tdmi_common_t *arm7tdmi, int c { armv4_5_common_t *armv4_5; arm7_9_common_t *arm7_9; - int has_etm = 0; arm7_9 = &arm7tdmi->arm7_9_common; armv4_5 = &arm7_9->armv4_5_common; diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c index ef978956..434b5c99 100644 --- a/src/target/arm9tdmi.c +++ b/src/target/arm9tdmi.c @@ -28,6 +28,7 @@ #include "target.h" #include "armv4_5.h" #include "embeddedice.h" +#include "etm.h" #include "log.h" #include "jtag.h" #include "arm_jtag.h" @@ -824,9 +825,6 @@ void arm9tdmi_build_reg_cache(target_t *target) armv4_5_common_t *armv4_5 = target->arch_info; arm7_9_common_t *arm7_9 = armv4_5->arch_info; arm_jtag_t *jtag_info = &arm7_9->jtag_info; - arm9tdmi_common_t *arm9tdmi = arm7_9->arch_info; - - embeddedice_reg_t *vec_catch_arch_info; (*cache_p) = armv4_5_build_reg_cache(target, armv4_5); armv4_5->core_cache = (*cache_p); @@ -835,17 +833,11 @@ void arm9tdmi_build_reg_cache(target_t *target) (*cache_p)->next = embeddedice_build_reg_cache(target, arm7_9); arm7_9->eice_cache = (*cache_p)->next; -#if 0 - (*cache_p)->next->reg_list[EICE_VEC_CATCH].name = "vector catch"; - (*cache_p)->next->reg_list[EICE_VEC_CATCH].dirty = 0; - (*cache_p)->next->reg_list[EICE_VEC_CATCH].valid = 0; - (*cache_p)->next->reg_list[EICE_VEC_CATCH].bitfield_desc = NULL; - (*cache_p)->next->reg_list[EICE_VEC_CATCH].num_bitfields = 0; - (*cache_p)->next->reg_list[EICE_VEC_CATCH].size = 8; - (*cache_p)->next->reg_list[EICE_VEC_CATCH].value = calloc(1, 4); - vec_catch_arch_info = (*cache_p)->next->reg_list[EICE_VEC_CATCH].arch_info; - vec_catch_arch_info->addr = 0x2; -#endif + if (arm7_9->has_etm) + { + (*cache_p)->next->next = etm_build_reg_cache(target, jtag_info, 0); + arm7_9->etm_cache = (*cache_p)->next->next; + } } int arm9tdmi_init_target(struct command_context_s *cmd_ctx, struct target_s *target) diff --git a/src/target/embeddedice.c b/src/target/embeddedice.c index 200a5390..b7e14b61 100644 --- a/src/target/embeddedice.c +++ b/src/target/embeddedice.c @@ -171,6 +171,12 @@ reg_cache_t* embeddedice_build_reg_cache(target_t *target, arm7_9_common_t *arm7 reg_list[EICE_DBG_STAT].size = 10; arm7_9->has_monitor_mode = 1; break; + case 7: + WARNING("EmbeddedICE version 7 detected, EmbeddedICE handling might be broken"); + reg_list[EICE_DBG_CTRL].size = 6; + reg_list[EICE_DBG_STAT].size = 5; + arm7_9->has_monitor_mode = 1; + break; default: ERROR("unknown EmbeddedICE version (comms ctrl: 0x%4.4x)", buf_get_u32(reg_list[EICE_COMMS_CTRL].value, 0, 32)); } diff --git a/src/target/target.c b/src/target/target.c index e2e0530f..40205642 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -42,6 +42,8 @@ #include +#include + int cli_target_callback_event_handler(struct target_s *target, enum target_event event, void *priv); int handle_target_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); @@ -62,8 +64,8 @@ int handle_resume_command(struct command_context_s *cmd_ctx, char *cmd, char **a int handle_step_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_md_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_mw_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -int handle_load_binary_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); -int handle_dump_binary_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +int handle_load_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); +int handle_dump_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_bp_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_rbp_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); int handle_wp_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc); @@ -732,6 +734,8 @@ void target_read_u32(struct target_s *target, u32 address, u32 *value) target->type->read_memory(target, address, 4, 1, value_buf); *value = target_buffer_get_u32(target, value_buf); + + DEBUG("address: 0x%8.8x, value: 0x%8.8x", address, *value); } void target_read_u16(struct target_s *target, u32 address, u16 *value) @@ -741,17 +745,23 @@ void target_read_u16(struct target_s *target, u32 address, u16 *value) target->type->read_memory(target, address, 2, 1, value_buf); *value = target_buffer_get_u16(target, value_buf); + + DEBUG("address: 0x%8.8x, value: 0x%4.4x", address, *value); } void target_read_u8(struct target_s *target, u32 address, u8 *value) { target->type->read_memory(target, address, 1, 1, value); + + DEBUG("address: 0x%8.8x, value: 0x%2.2x", address, *value); } void target_write_u32(struct target_s *target, u32 address, u32 value) { u8 value_buf[4]; + DEBUG("address: 0x%8.8x, value: 0x%8.8x", address, value); + target_buffer_set_u32(target, value_buf, value); target->type->write_memory(target, address, 4, 1, value_buf); } @@ -760,12 +770,16 @@ void target_write_u16(struct target_s *target, u32 address, u16 value) { u8 value_buf[2]; + DEBUG("address: 0x%8.8x, value: 0x%8.8x", address, value); + target_buffer_set_u16(target, value_buf, value); target->type->write_memory(target, address, 2, 1, value_buf); } void target_write_u8(struct target_s *target, u32 address, u8 value) { + DEBUG("address: 0x%8.8x, value: 0x%2.2x", address, value); + target->type->read_memory(target, address, 1, 1, &value); } @@ -773,7 +787,7 @@ int target_register_user_commands(struct command_context_s *cmd_ctx) { register_command(cmd_ctx, NULL, "reg", handle_reg_command, COMMAND_EXEC, NULL); register_command(cmd_ctx, NULL, "poll", handle_poll_command, COMMAND_EXEC, "poll target state"); - register_command(cmd_ctx, NULL, "wait_halt", handle_wait_halt_command, COMMAND_EXEC, "wait for target halt"); + register_command(cmd_ctx, NULL, "wait_halt", handle_wait_halt_command, COMMAND_EXEC, "wait for target halt [time (s)]"); 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"); @@ -793,8 +807,10 @@ int target_register_user_commands(struct command_context_s *cmd_ctx) 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_binary", handle_load_binary_command, COMMAND_EXEC, "load binary
"); - register_command(cmd_ctx, NULL, "dump_binary", handle_dump_binary_command, COMMAND_EXEC, "dump binary
"); + register_command(cmd_ctx, NULL, "load_image", handle_load_image_command, COMMAND_EXEC, "load_image
['bin'|'ihex']"); + register_command(cmd_ctx, NULL, "dump_image", handle_dump_image_command, COMMAND_EXEC, "dump_image
"); + 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
"); return ERROR_OK; } @@ -1223,7 +1239,17 @@ int handle_wait_halt_command(struct command_context_s *cmd_ctx, char *cmd, char struct timeval timeout, now; gettimeofday(&timeout, NULL); - timeval_add_time(&timeout, 5, 0); + if (!argc) + timeval_add_time(&timeout, 5, 0); + else { + char *end; + + timeval_add_time(&timeout, strtoul(args[0], &end, 0), 0); + if (*end) { + command_print(cmd_ctx, "usage: wait_halt [seconds]"); + return ERROR_OK; + } + } command_print(cmd_ctx, "waiting for target halted..."); @@ -1560,118 +1586,126 @@ int handle_mw_command(struct command_context_s *cmd_ctx, char *cmd, char **args, } -int handle_load_binary_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +int handle_load_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { - FILE *binary; u32 address; - struct stat binary_stat; - u32 binary_size; - u8 *buffer; u32 buf_cnt; + u32 binary_size; + + fileio_t file; + enum fileio_pri_type pri_type = FILEIO_IMAGE; + fileio_image_t image_info; + enum fileio_sec_type sec_type; + + duration_t duration; + char *duration_text; - struct timeval start, end, duration; - target_t *target = get_current_target(cmd_ctx); - if (argc != 2) + if (argc < 2) { - command_print(cmd_ctx, "usage: load_binary
"); + command_print(cmd_ctx, "usage: load_image
[type]"); return ERROR_OK; } + + memset(&file, 0, sizeof(fileio_t)); + fileio_identify_image_type(&sec_type, (argc == 3) ? args[2] : NULL); - address = strtoul(args[1], NULL, 0); - - if (stat(args[0], &binary_stat) == -1) - { - ERROR("couldn't stat() %s: %s", args[0], strerror(errno)); - command_print(cmd_ctx, "error accessing file %s", args[0]); - return ERROR_OK; - } + image_info.base_address = strtoul(args[1], NULL, 0); + image_info.has_start_address = 0; + + buffer = malloc(128 * 1024); - if (!(binary = fopen(args[0], "rb"))) + duration_start_measure(&duration); + + if (fileio_open(&file, args[0], FILEIO_READ, + pri_type, &image_info, sec_type) != ERROR_OK) { - ERROR("couldn't open %s: %s", args[0], strerror(errno)); - command_print(cmd_ctx, "error accessing file %s", args[0]); + command_print(cmd_ctx, "load_image error: %s", file.error_str); return ERROR_OK; } - buffer = malloc(128 * 1024); - - gettimeofday(&start, NULL); - - binary_size = binary_stat.st_size; - while (binary_size > 0) + binary_size = file.size; + address = image_info.base_address; + while ((binary_size > 0) && + (fileio_read(&file, 128 * 1024, buffer, &buf_cnt) == ERROR_OK)) { - buf_cnt = fread(buffer, 1, 128*1024, binary); target_write_buffer(target, address, buf_cnt, buffer); address += buf_cnt; binary_size -= buf_cnt; } - gettimeofday(&end, NULL); - free(buffer); - timeval_subtract(&duration, &end, &start); - command_print(cmd_ctx, "downloaded %lli byte in %is %ius", (long long) binary_stat.st_size, duration.tv_sec, duration.tv_usec); + duration_stop_measure(&duration, &duration_text); + command_print(cmd_ctx, "downloaded %lli byte in %s", file.size, duration_text); + free(duration_text); - fclose(binary); + fileio_close(&file); return ERROR_OK; } -int handle_dump_binary_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +int handle_dump_image_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) { - FILE *binary; + fileio_t file; + fileio_image_t image_info; + u32 address; u32 size; u8 buffer[560]; - struct timeval start, end, duration; + duration_t duration; + char *duration_text; target_t *target = get_current_target(cmd_ctx); if (argc != 3) { - command_print(cmd_ctx, "usage: dump_binary
"); + command_print(cmd_ctx, "usage: dump_image
"); return ERROR_OK; } address = strtoul(args[1], NULL, 0); size = strtoul(args[2], NULL, 0); - if (!(binary = fopen(args[0], "wb"))) + if ((address & 3) || (size & 3)) { - ERROR("couldn't open %s for writing: %s", args[0], strerror(errno)); - command_print(cmd_ctx, "error accessing file %s", args[0]); + command_print(cmd_ctx, "only 32-bit aligned address and size are supported"); return ERROR_OK; } - - if ((address & 3) || (size & 3)) + + image_info.base_address = address; + image_info.has_start_address = 0; + + if (fileio_open(&file, args[0], FILEIO_WRITE, + FILEIO_IMAGE, &image_info, FILEIO_PLAIN) != ERROR_OK) { - command_print(cmd_ctx, "only 32-bit aligned address and size are supported"); + command_print(cmd_ctx, "dump_image error: %s", file.error_str); return ERROR_OK; } - - gettimeofday(&start, NULL); + + duration_start_measure(&duration); while (size > 0) { + u32 size_written; u32 this_run_size = (size > 560) ? 560 : size; + target->type->read_memory(target, address, 4, this_run_size / 4, buffer); - fwrite(buffer, 1, this_run_size, binary); + fileio_write(&file, this_run_size, buffer, &size_written); + size -= this_run_size; address += this_run_size; } - fclose(binary); - - gettimeofday(&end, NULL); + fileio_close(&file); - timeval_subtract(&duration, &end, &start); - command_print(cmd_ctx, "dumped %i byte in %is %ius", strtoul(args[2], NULL, 0), duration.tv_sec, duration.tv_usec); + duration_stop_measure(&duration, &duration_text); + command_print(cmd_ctx, "dumped %lli byte in %s", file.size, duration_text); + free(duration_text); return ERROR_OK; -- cgit v1.2.3