X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Ftrace.c;h=7604db8b49908bd80a9e7365247035d3d323d3f4;hp=9387f8304bde72b008021ef2cb37bd62037db6cd;hb=54d6330b78f46678e78d1ffb265c65fcc8991e83;hpb=2e779198535580515dfa9c8bfe1f3fe08abdb84b

diff --git a/src/target/trace.c b/src/target/trace.c
index 9387f8304b..7604db8b49 100644
--- a/src/target/trace.c
+++ b/src/target/trace.c
@@ -21,13 +21,13 @@
 #include "config.h"
 #endif
 
-#include "log.h"
+#include <helper/log.h>
 #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);
 
@@ -47,18 +47,18 @@ int trace_point(target_t *target, uint32_t number)
 	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;
+	struct target *target = get_current_target(CMD_CTX);
+	struct trace *trace = target->trace_info;
 
-	if (argc == 0)
+	if (CMD_ARGC == 0)
 	{
 		uint32_t i;
 
 		for (i = 0; i < trace->num_trace_points; i++)
 		{
-			command_print(cmd_ctx, "trace point 0x%8.8" PRIx32 " (%lld times hit)",
+			command_print(CMD_CTX, "trace point 0x%8.8" PRIx32 " (%lld times hit)",
 					trace->trace_points[i].address,
 					(long long)trace->trace_points[i].hit_counter);
 		}
@@ -66,7 +66,7 @@ static int handle_trace_point_command(struct command_context_s *cmd_ctx, char *c
 		return ERROR_OK;
 	}
 
-	if (!strcmp(args[0], "clear"))
+	if (!strcmp(CMD_ARGV[0], "clear"))
 	{
 		if (trace->trace_points)
 		{
@@ -82,28 +82,30 @@ static int handle_trace_point_command(struct command_context_s *cmd_ctx, char *c
 	/* 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;
 }
 
-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;
+	struct target *target = get_current_target(CMD_CTX);
+	struct trace *trace = target->trace_info;
 
-	if (argc > 0)
+	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;
@@ -112,10 +114,10 @@ static int handle_trace_history_command(struct command_context_s *cmd_ctx, char
 		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", (int)(trace->trace_history_size));
+		command_print(CMD_CTX, "new trace history size: %i", (int)(trace->trace_history_size));
 	}
 	else
 	{
@@ -124,7 +126,7 @@ static int handle_trace_history_command(struct command_context_s *cmd_ctx, char
 		uint32_t last = trace->trace_history_pos;
 
 		if (!trace->trace_history_size) {
-			command_print(cmd_ctx, "trace history buffer is not allocated");
+			command_print(CMD_CTX, "trace history buffer is not allocated");
 			return ERROR_OK;
 		}
 		if (trace->trace_history_overflowed)
@@ -139,14 +141,14 @@ static int handle_trace_history_command(struct command_context_s *cmd_ctx, char
 			{
 				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.8" PRIx32 "",
+				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]));
+				command_print(CMD_CTX, "trace point %i: -not defined-", (int)(trace->trace_history[i % trace->trace_history_size]));
 			}
 		}
 	}
@@ -154,16 +156,36 @@ static int handle_trace_history_command(struct command_context_s *cmd_ctx, char
 	return ERROR_OK;
 }
 
-int trace_register_commands(struct command_context_s *cmd_ctx)
+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
+};
+
+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,
-		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]");
-
-	return ERROR_OK;
+	return register_commands(cmd_ctx, NULL, trace_command_handlers);
 }