X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Foocd_trace.c;h=f4064f7872ea65035ac095d3b7af16a21169c77b;hp=3edfdc0b03b63ed676327d6b72314981258634c9;hb=e2001ba2116fe5c0c75f7953b5fbe35da65fa29d;hpb=e43979e7020ea9d05a3c0a2af444f292eacb6c53 diff --git a/src/target/oocd_trace.c b/src/target/oocd_trace.c index 3edfdc0b03..f4064f7872 100644 --- a/src/target/oocd_trace.c +++ b/src/target/oocd_trace.c @@ -21,8 +21,8 @@ #include "config.h" #endif +#include "armv4_5.h" #include "oocd_trace.h" -#include "arm7_9_common.h" /* * This is "proof of concept" code, for prototype hardware: @@ -197,7 +197,7 @@ static int oocd_trace_read_trace(etm_context_t *etm_ctx) num_frames = address; /* read data into temporary array for unpacking - * one frame from OpenOCD+trace corresponds to 16 trace cycles + * one frame from OpenOCD + trace corresponds to 16 trace cycles */ trace_data = malloc(sizeof(uint8_t) * num_frames * 16); oocd_trace_read_memory(oocd_trace, trace_data, first_frame, num_frames); @@ -242,7 +242,7 @@ static int oocd_trace_start_capture(etm_context_t *etm_ctx) if (((etm_ctx->portmode & ETM_PORT_MODE_MASK) != ETM_PORT_NORMAL) || ((etm_ctx->portmode & ETM_PORT_WIDTH_MASK) != ETM_PORT_4BIT)) { - LOG_DEBUG("OpenOCD+trace only supports normal 4-bit ETM mode"); + LOG_DEBUG("OpenOCD + trace only supports normal 4-bit ETM mode"); return ERROR_ETM_PORTMODE_NOT_SUPPORTED; } @@ -251,7 +251,7 @@ static int oocd_trace_start_capture(etm_context_t *etm_ctx) control |= 0x2; /* half rate clock, capture at twice the clock rate */ } - /* OpenOCD+trace holds up to 16 million samples, + /* OpenOCD + trace holds up to 16 million samples, * but trigger counts is set in multiples of 16 */ trigger_count = (1048576 * etm_ctx->trigger_percent) / 100; @@ -278,7 +278,7 @@ static int oocd_trace_stop_capture(etm_context_t *etm_ctx) return ERROR_OK; } -etm_capture_driver_t oocd_trace_capture_driver = +struct etm_capture_driver oocd_trace_capture_driver = { .name = "oocd_trace", .register_commands = oocd_trace_register_commands, @@ -289,73 +289,72 @@ etm_capture_driver_t oocd_trace_capture_driver = .read_trace = oocd_trace_read_trace, }; -static int handle_oocd_trace_config_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(handle_oocd_trace_config_command) { target_t *target; - armv4_5_common_t *armv4_5; - arm7_9_common_t *arm7_9; + struct arm *arm; if (argc != 2) { LOG_ERROR("incomplete 'oocd_trace config ' command"); - exit(-1); + return ERROR_FAIL; } target = get_current_target(cmd_ctx); - - if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK) + arm = target_to_arm(target); + if (!is_arm(arm)) { - command_print(cmd_ctx, "current target isn't an ARM7/ARM9 target"); - return ERROR_OK; + command_print(cmd_ctx, "current target isn't an ARM"); + return ERROR_FAIL; } - if (arm7_9->etm_ctx) + if (arm->etm) { oocd_trace_t *oocd_trace = malloc(sizeof(oocd_trace_t)); - arm7_9->etm_ctx->capture_driver_priv = oocd_trace; - oocd_trace->etm_ctx = arm7_9->etm_ctx; + arm->etm->capture_driver_priv = oocd_trace; + oocd_trace->etm_ctx = arm->etm; - /* copy name of TTY device used to communicate with OpenOCD+trace */ + /* copy name of TTY device used to communicate with OpenOCD + trace */ oocd_trace->tty = strndup(args[1], 256); } else { - LOG_ERROR("target has no ETM defined, OpenOCD+trace left unconfigured"); + LOG_ERROR("target has no ETM defined, OpenOCD + trace left unconfigured"); } return ERROR_OK; } -static int handle_oocd_trace_status_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(handle_oocd_trace_status_command) { target_t *target; - armv4_5_common_t *armv4_5; - arm7_9_common_t *arm7_9; + struct arm *arm; oocd_trace_t *oocd_trace; uint32_t status; target = get_current_target(cmd_ctx); - if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK) + arm = target_to_arm(target); + if (!is_arm(arm)) { - command_print(cmd_ctx, "current target isn't an ARM7/ARM9 target"); - return ERROR_OK; + command_print(cmd_ctx, "current target isn't an ARM"); + return ERROR_FAIL; } - if (!arm7_9->etm_ctx) + if (!arm->etm) { command_print(cmd_ctx, "current target doesn't have an ETM configured"); - return ERROR_OK; + return ERROR_FAIL; } - if (strcmp(arm7_9->etm_ctx->capture_driver->name, "oocd_trace") != 0) + if (strcmp(arm->etm->capture_driver->name, "oocd_trace") != 0) { command_print(cmd_ctx, "current target's ETM capture driver isn't 'oocd_trace'"); - return ERROR_OK; + return ERROR_FAIL; } - oocd_trace = (oocd_trace_t*)arm7_9->etm_ctx->capture_driver_priv; + oocd_trace = (oocd_trace_t*)arm->etm->capture_driver_priv; oocd_trace_read_reg(oocd_trace, OOCD_TRACE_STATUS, &status); @@ -367,36 +366,36 @@ static int handle_oocd_trace_status_command(struct command_context_s *cmd_ctx, c return ERROR_OK; } -static int handle_oocd_trace_resync_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(handle_oocd_trace_resync_command) { target_t *target; - armv4_5_common_t *armv4_5; - arm7_9_common_t *arm7_9; + struct arm *arm; oocd_trace_t *oocd_trace; size_t bytes_written; uint8_t cmd_array[1]; target = get_current_target(cmd_ctx); - if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK) + arm = target_to_arm(target); + if (!is_arm(arm)) { - command_print(cmd_ctx, "current target isn't an ARM7/ARM9 target"); - return ERROR_OK; + command_print(cmd_ctx, "current target isn't an ARM"); + return ERROR_FAIL; } - if (!arm7_9->etm_ctx) + if (!arm->etm) { command_print(cmd_ctx, "current target doesn't have an ETM configured"); - return ERROR_OK; + return ERROR_FAIL; } - if (strcmp(arm7_9->etm_ctx->capture_driver->name, "oocd_trace") != 0) + if (strcmp(arm->etm->capture_driver->name, "oocd_trace") != 0) { command_print(cmd_ctx, "current target's ETM capture driver isn't 'oocd_trace'"); - return ERROR_OK; + return ERROR_FAIL; } - oocd_trace = (oocd_trace_t*)arm7_9->etm_ctx->capture_driver_priv; + oocd_trace = (oocd_trace_t*)arm->etm->capture_driver_priv; cmd_array[0] = 0xf0; @@ -412,12 +411,12 @@ int oocd_trace_register_commands(struct command_context_s *cmd_ctx) { command_t *oocd_trace_cmd; - oocd_trace_cmd = register_command(cmd_ctx, NULL, "oocd_trace", NULL, COMMAND_ANY, "OpenOCD+trace"); + oocd_trace_cmd = register_command(cmd_ctx, NULL, "oocd_trace", NULL, COMMAND_ANY, "OpenOCD + trace"); register_command(cmd_ctx, oocd_trace_cmd, "config", handle_oocd_trace_config_command, COMMAND_CONFIG, NULL); - register_command(cmd_ctx, oocd_trace_cmd, "status", handle_oocd_trace_status_command, COMMAND_EXEC, "display OpenOCD+trace status"); - register_command(cmd_ctx, oocd_trace_cmd, "resync", handle_oocd_trace_resync_command, COMMAND_EXEC, "resync OpenOCD+trace capture clock"); + register_command(cmd_ctx, oocd_trace_cmd, "status", handle_oocd_trace_status_command, COMMAND_EXEC, "display OpenOCD + trace status"); + register_command(cmd_ctx, oocd_trace_cmd, "resync", handle_oocd_trace_resync_command, COMMAND_EXEC, "resync OpenOCD + trace capture clock"); return ERROR_OK; }