X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Ftrace.c;h=7604db8b49908bd80a9e7365247035d3d323d3f4;hp=3eec3d8335300244dd25d2e90fc3243623152a24;hb=3a550e5b5fe011e526b150a5d234b48e8e2aaad6;hpb=20e4e77cdf366dedac21ff5670c54291feadfc05

diff --git a/src/target/trace.c b/src/target/trace.c
index 3eec3d8335..7604db8b49 100644
--- a/src/target/trace.c
+++ b/src/target/trace.c
@@ -21,49 +21,171 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-#include "log.h"
+#include <helper/log.h>
 #include "trace.h"
 #include "target.h"
 
-#include <stdlib.h>
+int trace_point(struct target *target, uint32_t number)
+{
+	struct trace *trace = target->trace_info;
+
+	LOG_DEBUG("tracepoint: %i", (int)number);
+
+	if (number < trace->num_trace_points)
+		trace->trace_points[number].hit_counter++;
+
+	if (trace->trace_history_size)
+	{
+		trace->trace_history[trace->trace_history_pos++] = number;
+		if (trace->trace_history_pos == trace->trace_history_size)
+		{
+			trace->trace_history_pos = 0;
+			trace->trace_history_overflowed = 1;
+		}
+	}
+
+	return ERROR_OK;
+}
+
+COMMAND_HANDLER(handle_trace_point_command)
+{
+	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.8" PRIx32 " (%lld times hit)",
+					trace->trace_points[i].address,
+					(long long)trace->trace_points[i].hit_counter);
+		}
+
+		return ERROR_OK;
+	}
+
+	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;
+	}
 
-int handle_trace_history_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+	/* resize array if necessary */
+	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;
+	}
+
+	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;
+}
+
+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(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;
-		
-		for (i = 0; i < trace->trace_history_size; i++)
+		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)
 		{
-			if (trace->trace_history[i] < trace->num_trace_points)
+			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;
-				address = trace->trace_points[trace->trace_history[i]].address;
-				command_print(cmd_ctx, "trace point %i: 0x%8.8x",
-					trace->trace_history[i],
-					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.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]);
+				command_print(CMD_CTX, "trace point %i: -not defined-", (int)(trace->trace_history[i % trace->trace_history_size]));
 			}
 		}
 	}
 
 	return ERROR_OK;
 }
+
+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)
+{
+	return register_commands(cmd_ctx, NULL, trace_command_handlers);
+}