Remove whitespace at end of lines, step 1.

[fw/openocd] / src / target / trace.c

diff --git a/src/target/trace.c b/src/target/trace.c
index 3eec3d8335300244dd25d2e90fc3243623152a24..9387f8304bde72b008021ef2cb37bd62037db6cd 100644 (file)
--- a/src/target/trace.c
+++ b/src/target/trace.c
@@ -21,49 +21,149 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
 #include "log.h"
 #include "trace.h"
 #include "target.h"
 
-#include <stdlib.h>
+int trace_point(target_t *target, uint32_t number)
+{
+       trace_t *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;
+               }
+       }
 
-int handle_trace_history_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+       return ERROR_OK;
+}
+
+static 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)
+       {
+               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(args[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));
+               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;
+}
+
+static int handle_trace_history_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)
        {
+               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);
-               
+
                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);
+               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;
 }
+
+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;
+}