X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Ftrace.c;h=bc6eec7c8ccbef3eb58879daad7868bf423ee201;hp=50f526a949acdd965dc55d3307e04b4b2c315044;hb=4952eadd8f04ca3755c30013abc3ea85e35d8654;hpb=8c1ec4f0e1a7dd37a2549d83b6cd5c8c57eb34aa

diff --git a/src/target/trace.c b/src/target/trace.c
index 50f526a949..bc6eec7c8c 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 <stdlib.h>
-#include <string.h>
-#include <inttypes.h>
-
-int trace_point(target_t *target, u32 number)
+int trace_point(target_t *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,29 +43,29 @@ int trace_point(target_t *target, u32 number)
 			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;
-	
+	struct trace *trace = target->trace_info;
+
 	if (argc == 0)
 	{
-		u32 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 (trace->trace_points)
@@ -81,29 +75,31 @@ static int handle_trace_point_command(struct command_context_s *cmd_ctx, char *c
 		}
 		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, args[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 trace *trace = target->trace_info;
+
 	if (argc > 0)
 	{
 		trace->trace_history_pos = 0;
@@ -114,22 +110,22 @@ static int handle_trace_history_command(struct command_context_s *cmd_ctx, char
 			/* 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, args[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
 	{
-		u32 i;
-		u32 first = 0;
-		u32 last = trace->trace_history_pos;
+		uint32_t i;
+		uint32_t first = 0;
+		uint32_t last = trace->trace_history_pos;
 
-		if ( !trace->trace_history_size ) {
+		if (!trace->trace_history_size) {
 			command_print(cmd_ctx, "trace history buffer is not allocated");
 			return ERROR_OK;
 		}
@@ -138,21 +134,21 @@ static int handle_trace_history_command(struct command_context_s *cmd_ctx, char
 			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]));
 			}
 		}
 	}
@@ -164,7 +160,7 @@ 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]");