X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Ftrace.c;h=63c477fbfcad2ee0904ba780b4cf817a7d900a0d;hp=79bb599022b3d909741472d69c9ecad9a00f9473;hb=d0e763ac7ef6aa17b17bd00ccdfbccfb4eacda69;hpb=3c2eabd20f5182c53f0bfb0c6f2a9f2595434e87
diff --git a/src/target/trace.c b/src/target/trace.c
index 79bb599022..63c477fbfc 100644
--- a/src/target/trace.c
+++ b/src/target/trace.c
@@ -13,157 +13,163 @@
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * along with this program. If not, see . *
***************************************************************************/
+
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
-#include "log.h"
+#include
#include "trace.h"
#include "target.h"
-int trace_point(target_t *target, uint32_t 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++;
- if (trace->trace_history_size)
- {
+ if (trace->trace_history_size) {
trace->trace_history[trace->trace_history_pos++] = number;
- if (trace->trace_history_pos == trace->trace_history_size)
- {
+ if (trace->trace_history_pos == trace->trace_history_size) {
trace->trace_history_pos = 0;
trace->trace_history_overflowed = 1;
}
}
-
+
return ERROR_OK;
}
-static 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) {
uint32_t i;
-
- for (i = 0; i < trace->num_trace_points; i++)
- {
- command_print(cmd_ctx, "trace point 0x%8.8x (%lld times hit)",
+
+ for (i = 0; i < trace->num_trace_points; i++) {
+ 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 (trace->trace_points)
- {
+
+ if (!strcmp(CMD_ARGV[0], "clear")) {
+ if (trace->trace_points) {
free(trace->trace_points);
trace->trace_points = NULL;
}
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));
+ if (!trace->trace_points || (trace->trace_points_size == trace->num_trace_points)) {
+ 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;
}
-static 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);
+
+ 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", trace->trace_history_size);
- }
- else
- {
+
+ command_print(CMD_CTX, "new trace history size: %i", (int)(trace->trace_history_size));
+ } else {
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");
+ if (!trace->trace_history_size) {
+ command_print(CMD_CTX, "trace history buffer is not allocated");
return ERROR_OK;
}
- if (trace->trace_history_overflowed)
- {
+
+ 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)
- {
+
+ for (i = first; (i % trace->trace_history_size) != last; i++) {
+ if (trace->trace_history[i % trace->trace_history_size] < trace->num_trace_points) {
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);
- }
-
- 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: 0x%8.8" PRIx32 "",
+ (int)(trace->trace_history[i % trace->trace_history_size]),
+ address);
+ } else
+ command_print(CMD_CTX, "trace point %i: -not defined-",
+ (int)(trace->trace_history[i % trace->trace_history_size]));
}
}
return ERROR_OK;
}
-int trace_register_commands(struct command_context_s *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,
- COMMAND_EXEC, "display trace history, ['clear'] history or set [size]");
-
- register_command(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]");
+static const struct command_registration trace_exec_command_handlers[] = {
+ {
+ .name = "history",
+ .handler = handle_trace_history_command,
+ .mode = COMMAND_EXEC,
+ .help = "display trace history, clear history or set size",
+ .usage = "['clear'|size]",
+ },
+ {
+ .name = "point",
+ .handler = handle_trace_point_command,
+ .mode = COMMAND_EXEC,
+ .help = "display trace points, clear list of trace points, "
+ "or add new tracepoint at address",
+ .usage = "['clear'|address]",
+ },
+ COMMAND_REGISTRATION_DONE
+};
+static const struct command_registration trace_command_handlers[] = {
+ {
+ .name = "trace",
+ .mode = COMMAND_EXEC,
+ .help = "trace command group",
+ .usage = "",
+ .chain = trace_exec_command_handlers,
+ },
+ COMMAND_REGISTRATION_DONE
+};
- return ERROR_OK;
+int trace_register_commands(struct command_context *cmd_ctx)
+{
+ return register_commands(cmd_ctx, NULL, trace_command_handlers);
}