X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Ftrace.c;h=c3897a074df3e2bc6f11e2c95202eef81d7d592c;hb=e905fe6e756453daf27cd064285aa9cddf31b1ef;hp=257e8ceb8a767946fe655acf67b4b8d5d42fcbc9;hpb=2babd879165466517b3d5f0530794a3885b3eeaf;p=openocd.git diff --git a/src/target/trace.c b/src/target/trace.c index 257e8ceb8a..c3897a074d 100644 --- a/src/target/trace.c +++ b/src/target/trace.c @@ -21,22 +21,16 @@ #include "config.h" #endif -#include "replacements.h" #include "log.h" #include "trace.h" #include "target.h" -#include "command.h" -#include -#include -#include - -int trace_point(target_t *target, int number) +int trace_point(struct target *target, uint32_t number) { - trace_t *trace = target->trace_info; + struct trace *trace = target->trace_info; + + LOG_DEBUG("tracepoint: %i", (int)number); - LOG_DEBUG("tracepoint: %i", number); - if (number < trace->num_trace_points) trace->trace_points[number].hit_counter++; @@ -49,30 +43,30 @@ int trace_point(target_t *target, int number) trace->trace_history_overflowed = 1; } } - + return ERROR_OK; } -int handle_trace_point_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(handle_trace_point_command) { - target_t *target = get_current_target(cmd_ctx); - trace_t *trace = target->trace_info; - - if (argc == 0) + struct target *target = get_current_target(CMD_CTX); + struct trace *trace = target->trace_info; + + if (CMD_ARGC == 0) { - int i; - + uint32_t i; + for (i = 0; i < trace->num_trace_points; i++) { - command_print(cmd_ctx, "trace point 0x%8.8x (%"PRIi64" times hit)", + command_print(CMD_CTX, "trace point 0x%8.8" PRIx32 " (%lld times hit)", trace->trace_points[i].address, - trace->trace_points[i].hit_counter); + (long long)trace->trace_points[i].hit_counter); } return ERROR_OK; } - - if (!strcmp(args[0], "clear")) + + if (!strcmp(CMD_ARGV[0], "clear")) { if (trace->trace_points) { @@ -81,74 +75,80 @@ int handle_trace_point_command(struct command_context_s *cmd_ctx, char *cmd, cha } trace->num_trace_points = 0; trace->trace_points_size = 0; - + return ERROR_OK; } - + /* resize array if necessary */ if (!trace->trace_points || (trace->trace_points_size == trace->num_trace_points)) { - trace->trace_points = realloc(trace->trace_points, sizeof(trace_point_t) * (trace->trace_points_size + 32)); + trace->trace_points = realloc(trace->trace_points, sizeof(struct trace_point) * (trace->trace_points_size + 32)); trace->trace_points_size += 32; } - - trace->trace_points[trace->num_trace_points].address = strtoul(args[0], NULL, 0); + + uint32_t address; + COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], address); + trace->trace_points[trace->num_trace_points].address = address; trace->trace_points[trace->num_trace_points].hit_counter = 0; trace->num_trace_points++; - + return ERROR_OK; } -int handle_trace_history_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc) +COMMAND_HANDLER(handle_trace_history_command) { - target_t *target = get_current_target(cmd_ctx); - trace_t *trace = target->trace_info; - - if (argc > 0) + struct target *target = get_current_target(CMD_CTX); + struct trace *trace = target->trace_info; + + if (CMD_ARGC > 0) { trace->trace_history_pos = 0; trace->trace_history_overflowed = 0; - if (!strcmp(args[0], "clear")) + if (!strcmp(CMD_ARGV[0], "clear")) { /* clearing is implicit, we've just reset position anyway */ return ERROR_OK; } - + if (trace->trace_history) free(trace->trace_history); - - trace->trace_history_size = strtoul(args[0], NULL, 0); - trace->trace_history = malloc(sizeof(u32) * trace->trace_history_size); - - command_print(cmd_ctx, "new trace history size: %i", trace->trace_history_size); + + COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], trace->trace_history_size); + trace->trace_history = malloc(sizeof(uint32_t) * trace->trace_history_size); + + command_print(CMD_CTX, "new trace history size: %i", (int)(trace->trace_history_size)); } else { - int i; - int first = 0; - int last = trace->trace_history_pos; - + uint32_t i; + uint32_t first = 0; + uint32_t last = trace->trace_history_pos; + + if (!trace->trace_history_size) { + command_print(CMD_CTX, "trace history buffer is not allocated"); + return ERROR_OK; + } if (trace->trace_history_overflowed) { first = trace->trace_history_pos; last = trace->trace_history_pos - 1; } - + for (i = first; (i % trace->trace_history_size) != last; i++) { if (trace->trace_history[i % trace->trace_history_size] < trace->num_trace_points) { - u32 address; + uint32_t address; address = trace->trace_points[trace->trace_history[i % trace->trace_history_size]].address; - command_print(cmd_ctx, "trace point %i: 0x%8.8x", - trace->trace_history[i % trace->trace_history_size], - address); + command_print(CMD_CTX, "trace point %i: 0x%8.8" PRIx32 "", + (int)(trace->trace_history[i % trace->trace_history_size]), + address); } else { - command_print(cmd_ctx, "trace point %i: -not defined-", trace->trace_history[i % trace->trace_history_size]); + command_print(CMD_CTX, "trace point %i: -not defined-", (int)(trace->trace_history[i % trace->trace_history_size])); } } } @@ -156,15 +156,15 @@ int handle_trace_history_command(struct command_context_s *cmd_ctx, char *cmd, c return ERROR_OK; } -int trace_register_commands(struct command_context_s *cmd_ctx) +int trace_register_commands(struct command_context *cmd_ctx) { - command_t *trace_cmd = - register_command(cmd_ctx, NULL, "trace", NULL, COMMAND_ANY, "trace commands"); - - register_command(cmd_ctx, trace_cmd, "history", handle_trace_history_command, + struct command *trace_cmd = + COMMAND_REGISTER(cmd_ctx, NULL, "trace", NULL, COMMAND_ANY, "trace commands"); + + COMMAND_REGISTER(cmd_ctx, trace_cmd, "history", handle_trace_history_command, COMMAND_EXEC, "display trace history, ['clear'] history or set [size]"); - register_command(cmd_ctx, trace_cmd, "point", handle_trace_point_command, + COMMAND_REGISTER(cmd_ctx, trace_cmd, "point", handle_trace_point_command, COMMAND_EXEC, "display trace points, ['clear'] list of trace points, or add new tracepoint at [address]"); return ERROR_OK;