- reworked presto.c to allow use of either FTD2XX or libftdi (libftdi not functional yet). Configure option changed from --enable-presto to

--enable-presto_ftd2xx and --enable-presto_libftdi
- completed trace point support for use with ARM7/9 DCC
- completed debug message output with support for HEX dumps (1, 2 or 4 byte quantities)
- fixed bug in delete_debug_msg_receiver (thanks to Pavel Chromy)
- fixed bug in image_add_section (thanks to Pavel Chromy)
- at91sam7 sector erase reworked (thanks to Pavel Chromy)
- merge consecutive sections during flash image write to work around possible section alignment issues with LPC2000 targets



git-svn-id: svn://svn.berlios.de/openocd/trunk@194 b42882b7-edfa-0310-969c-e2dbd0fdcd60

src/target/trace.c

@@ -25,8 +25,76 @@
 #include "log.h"
 #include "trace.h"
 #include "target.h"
+#include "command.h"
 
 #include <stdlib.h>
+#include <string.h>
+#include <inttypes.h>
+
+int trace_point(target_t *target, int number)
+{
+	trace_t *trace = target->trace_info;
+
+	DEBUG("tracepoint: %i", 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;
+}
+
+int handle_trace_point_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+{
+	target_t *target = get_current_target(cmd_ctx);
+	trace_t *trace = target->trace_info;
+	
+	if (argc == 0)
+	{
+		int i;
+		
+		for (i = 0; i < trace->num_trace_points; i++)
+		{
+			command_print(cmd_ctx, "trace point 0x%8.8x (%"PRIi64" times hit)",
+					trace->trace_points[i].address,
+					trace->trace_points[i].hit_counter);
+		}
+
+		return ERROR_OK;
+	}
+	
+	if (!strcmp(args[0], "clear"))
+	{
+		if (trace->trace_points)
+			free(trace->trace_points);
+		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_size += 32;
+	}
+	
+	trace->trace_points[trace->num_trace_points].address = strtoul(args[0], NULL, 0);
+	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)
 {
@@ -35,6 +103,15 @@ int handle_trace_history_command(struct command_context_s *cmd_ctx, char *cmd, c
 	
 	if (argc > 0)
 	{
+		trace->trace_history_pos = 0;
+		trace->trace_history_overflowed = 0;
+
+		if (!strcmp(args[0], "clear"))
+		{
+			/* clearing is implicit, we've just reset position anyway */
+			return ERROR_OK;
+		}
+		
 		if (trace->trace_history)
 			free(trace->trace_history);
 		
@@ -46,24 +123,46 @@ int handle_trace_history_command(struct command_context_s *cmd_ctx, char *cmd, c
 	else
 	{
 		int i;
+		int first = 0;
+		int last = trace->trace_history_pos;
 		
-		for (i = 0; i < trace->trace_history_size; i++)
+		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;
+				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[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-", 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]");
+
+	return ERROR_OK;
+}