Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
ARM: use <target/arm.h> not armv4_5.h
[openocd.git] / src / target / etm.c
diff --git a/src/target/etm.c b/src/target/etm.c
index 6df354a5de84c371a56f92c3d060873e9dc4dda1..3aace81ecd1a3c521539b86097f18dd468aab70c 100644 (file)
--- a/src/target/etm.c
+++ b/src/target/etm.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #endif
 
-#include "armv4_5.h"
+#include "arm.h"
 #include "etm.h"
 #include "etb.h"
 #include "image.h"
@@ -221,8 +221,6 @@ static int etm_register_user_commands(struct command_context *cmd_ctx);
 static int etm_set_reg_w_exec(struct reg *reg, uint8_t *buf);
 static int etm_write_reg(struct reg *reg, uint32_t value);
 
-static struct command *etm_cmd;
-
 static const struct reg_arch_type etm_scan6_type = {
        .get = etm_get_reg,
        .set = etm_set_reg_w_exec,
@@ -661,7 +659,7 @@ static int etm_read_instruction(struct etm_context *ctx, struct arm_instruction
                return ERROR_TRACE_INSTRUCTION_UNAVAILABLE;
        }
 
-       if (ctx->core_state == ARMV4_5_STATE_ARM)
+       if (ctx->core_state == ARM_STATE_ARM)
        {
                uint8_t buf[4];
                if ((retval = image_read_section(ctx->image, section,
@@ -674,7 +672,7 @@ static int etm_read_instruction(struct etm_context *ctx, struct arm_instruction
                opcode = target_buffer_get_u32(ctx->target, buf);
                arm_evaluate_opcode(opcode, ctx->current_pc, instruction);
        }
-       else if (ctx->core_state == ARMV4_5_STATE_THUMB)
+       else if (ctx->core_state == ARM_STATE_THUMB)
        {
                uint8_t buf[2];
                if ((retval = image_read_section(ctx->image, section,
@@ -687,7 +685,7 @@ static int etm_read_instruction(struct etm_context *ctx, struct arm_instruction
                opcode = target_buffer_get_u16(ctx->target, buf);
                thumb_evaluate_opcode(opcode, ctx->current_pc, instruction);
        }
-       else if (ctx->core_state == ARMV4_5_STATE_JAZELLE)
+       else if (ctx->core_state == ARM_STATE_JAZELLE)
        {
                LOG_ERROR("BUG: tracing of jazelle code not supported");
                return ERROR_FAIL;
@@ -831,7 +829,7 @@ static int etmv1_branch_address(struct etm_context *ctx)
        /* if a full address was output, we might have branched into Jazelle state */
        if ((shift == 32) && (packet & 0x80))
        {
-               ctx->core_state = ARMV4_5_STATE_JAZELLE;
+               ctx->core_state = ARM_STATE_JAZELLE;
        }
        else
        {
@@ -839,12 +837,12 @@ static int etmv1_branch_address(struct etm_context *ctx)
                 * encoded in bit 0 of the branch target address */
                if (ctx->last_branch & 0x1)
                {
-                       ctx->core_state = ARMV4_5_STATE_THUMB;
+                       ctx->core_state = ARM_STATE_THUMB;
                        ctx->last_branch &= ~0x1;
                }
                else
                {
-                       ctx->core_state = ARMV4_5_STATE_ARM;
+                       ctx->core_state = ARM_STATE_ARM;
                        ctx->last_branch &= ~0x3;
                }
        }
@@ -1128,12 +1126,12 @@ static int etmv1_analyze_trace(struct etm_context *ctx, struct command_context *
                        }
                        else
                        {
-                               next_pc += (ctx->core_state == ARMV4_5_STATE_ARM) ? 4 : 2;
+                               next_pc += (ctx->core_state == ARM_STATE_ARM) ? 4 : 2;
                        }
                }
                else if (pipestat == STAT_IN)
                {
-                       next_pc += (ctx->core_state == ARMV4_5_STATE_ARM) ? 4 : 2;
+                       next_pc += (ctx->core_state == ARM_STATE_ARM) ? 4 : 2;
                }
 
                if ((pipestat != STAT_TD) && (pipestat != STAT_WT))
@@ -1376,7 +1374,8 @@ COMMAND_HANDLER(handle_etm_config_command)
        arm = target_to_arm(target);
        if (!is_arm(arm)) {
                command_print(CMD_CTX, "target '%s' is '%s'; not an ARM",
-                               target->cmd_name, target_get_name(target));
+                               target_name(target),
+                               target_type_name(target));
                return ERROR_FAIL;
        }
 
@@ -1473,8 +1472,9 @@ COMMAND_HANDLER(handle_etm_config_command)
        {
                if (strcmp(CMD_ARGV[4], etm_capture_drivers[i]->name) == 0)
                {
-                       int retval;
-                       if ((retval = etm_capture_drivers[i]->register_commands(CMD_CTX)) != ERROR_OK)
+                       int retval = register_commands(CMD_CTX, NULL,
+                                       etm_capture_drivers[i]->commands);
+                       if (ERROR_OK != retval)
                        {
                                free(etm_ctx);
                                return retval;
@@ -1498,7 +1498,7 @@ COMMAND_HANDLER(handle_etm_config_command)
        etm_ctx->trigger_percent = 50;
        etm_ctx->trace_data = NULL;
        etm_ctx->portmode = portmode;
-       etm_ctx->core_state = ARMV4_5_STATE_ARM;
+       etm_ctx->core_state = ARM_STATE_ARM;
 
        arm->etm = etm_ctx;
 
@@ -2095,45 +2095,94 @@ COMMAND_HANDLER(handle_etm_analyze_command)
        return retval;
 }
 
-int etm_register_commands(struct command_context *cmd_ctx)
-{
-       etm_cmd = COMMAND_REGISTER(cmd_ctx, NULL, "etm", NULL, COMMAND_ANY, "Embedded Trace Macrocell");
-
-       COMMAND_REGISTER(cmd_ctx, etm_cmd, "config", handle_etm_config_command,
-               COMMAND_CONFIG, "etm config <target> <port_width> <port_mode> <clocking> <capture_driver>");
+static const struct command_registration etm_config_command_handlers[] = {
+       {
+               .name = "config",
+               .handler = &handle_etm_config_command,
+               .mode = COMMAND_CONFIG,
+               .usage = "<target> <port_width> <port_mode> "
+                       "<clocking> <capture_driver>",
+       },
+       COMMAND_REGISTRATION_DONE
+};
+const struct command_registration etm_command_handlers[] = {
+       {
+               .name = "etm",
+               .mode = COMMAND_ANY,
+               .help = "Emebdded Trace Macrocell command group",
+               .chain = etm_config_command_handlers,
+       },
+       COMMAND_REGISTRATION_DONE
+};
 
-       return ERROR_OK;
-}
+static const struct command_registration etm_exec_command_handlers[] = {
+       {
+               .name = "tracemode", handle_etm_tracemode_command,
+               .mode = COMMAND_EXEC,
+               .help = "configure/display trace mode",
+               .usage = "<none | data | address | all> "
+                       "<context_id_bits> <cycle_accurate> <branch_output>",
+       },
+       {
+               .name = "info",
+               .handler = &handle_etm_info_command,
+               .mode = COMMAND_EXEC,
+               .help = "display info about the current target's ETM",
+       },
+       {
+               .name = "trigger_percent",
+               .handler = &handle_etm_trigger_percent_command,
+               .mode = COMMAND_EXEC,
+               .help = "amount (<percent>) of trace buffer "
+                       "to be filled after the trigger occured",
+       },
+       {
+               .name = "status",
+               .handler = &handle_etm_status_command,
+               .mode = COMMAND_EXEC,
+               .help = "display current target's ETM status",
+       },
+       {
+               .name = "start",
+               .handler = &handle_etm_start_command,
+               .mode = COMMAND_EXEC,
+               .help = "start ETM trace collection",
+       },
+       {
+               .name = "stop",
+               .handler = &handle_etm_stop_command,
+               .mode = COMMAND_EXEC,
+               .help = "stop ETM trace collection",
+       },
+       {
+               .name = "analyze",
+               .handler = &handle_etm_analyze_command,
+               .mode = COMMAND_EXEC,
+               .help = "anaylze collected ETM trace",
+       },
+       {
+               .name = "image",
+               .handler = &handle_etm_image_command,
+               .mode = COMMAND_EXEC,
+               .help = "load image from <file> [base address]",
+       },
+       {
+               .name = "dump",
+               .handler = &handle_etm_dump_command,
+               .mode = COMMAND_EXEC,
+               .help = "dump captured trace data <file>",
+       },
+       {
+               .name = "load",
+               .handler = &handle_etm_load_command,
+               .mode = COMMAND_EXEC,
+               .help = "load trace data for analysis <file>",
+       },
+       COMMAND_REGISTRATION_DONE
+};
 
 static int etm_register_user_commands(struct command_context *cmd_ctx)
 {
-       COMMAND_REGISTER(cmd_ctx, etm_cmd, "tracemode", handle_etm_tracemode_command,
-               COMMAND_EXEC, "configure/display trace mode: "
-                       "<none | data | address | all> "
-                       "<context_id_bits> <cycle_accurate> <branch_output>");
-
-       COMMAND_REGISTER(cmd_ctx, etm_cmd, "info", handle_etm_info_command,
-               COMMAND_EXEC, "display info about the current target's ETM");
-
-       COMMAND_REGISTER(cmd_ctx, etm_cmd, "trigger_percent", handle_etm_trigger_percent_command,
-               COMMAND_EXEC, "amount (<percent>) of trace buffer to be filled after the trigger occured");
-       COMMAND_REGISTER(cmd_ctx, etm_cmd, "status", handle_etm_status_command,
-               COMMAND_EXEC, "display current target's ETM status");
-       COMMAND_REGISTER(cmd_ctx, etm_cmd, "start", handle_etm_start_command,
-               COMMAND_EXEC, "start ETM trace collection");
-       COMMAND_REGISTER(cmd_ctx, etm_cmd, "stop", handle_etm_stop_command,
-               COMMAND_EXEC, "stop ETM trace collection");
-
-       COMMAND_REGISTER(cmd_ctx, etm_cmd, "analyze", handle_etm_analyze_command,
-               COMMAND_EXEC, "anaylze collected ETM trace");
-
-       COMMAND_REGISTER(cmd_ctx, etm_cmd, "image", handle_etm_image_command,
-               COMMAND_EXEC, "load image from <file> [base address]");
-
-       COMMAND_REGISTER(cmd_ctx, etm_cmd, "dump", handle_etm_dump_command,
-               COMMAND_EXEC, "dump captured trace data <file>");
-       COMMAND_REGISTER(cmd_ctx, etm_cmd, "load", handle_etm_load_command,
-               COMMAND_EXEC, "load trace data for analysis <file>");
-
-       return ERROR_OK;
+       struct command *etm_cmd = command_find_in_context(cmd_ctx, "etm");
+       return register_commands(cmd_ctx, etm_cmd, etm_exec_command_handlers);
 }
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)