Make ETM itself use the new toplevel ETM handle, instead
of the to-be-removed lower level one. As of this patch,
nothing should be using the old ARM7/ARM9-specific handle.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
{
int retval;
uint32_t etm_ctrl_value;
{
int retval;
uint32_t etm_ctrl_value;
- struct arm7_9_common_s *arm7_9 = target_to_arm7_9(target);
- etm_context_t *etm_ctx = arm7_9->etm_ctx;
+ struct arm *arm = target_to_arm(target);
+ etm_context_t *etm_ctx = arm->etm;
reg_t *etm_ctrl_reg;
etm_ctrl_reg = etm_reg_lookup(etm_ctx, ETM_CTRL);
reg_t *etm_ctrl_reg;
etm_ctrl_reg = etm_reg_lookup(etm_ctx, ETM_CTRL);
char *cmd, char **args, int argc)
{
target_t *target = get_current_target(cmd_ctx);
char *cmd, char **args, int argc)
{
target_t *target = get_current_target(cmd_ctx);
- armv4_5_common_t *armv4_5;
- arm7_9_common_t *arm7_9;
+ struct arm *arm = target_to_arm(target);
- if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK)
- {
command_print(cmd_ctx, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
command_print(cmd_ctx, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
if (!etm) {
command_print(cmd_ctx, "current target doesn't have an ETM configured");
return ERROR_FAIL;
if (!etm) {
command_print(cmd_ctx, "current target doesn't have an ETM configured");
return ERROR_FAIL;
{
target_t *target;
struct arm *arm;
{
target_t *target;
struct arm *arm;
- arm7_9_common_t *arm7_9;
etm_portmode_t portmode = 0x0;
struct etm *etm_ctx;
int i;
etm_portmode_t portmode = 0x0;
struct etm *etm_ctx;
int i;
- if (arm7_9_get_arch_pointers(target, &arm, &arm7_9) != ERROR_OK)
- {
+ 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));
return ERROR_FAIL;
command_print(cmd_ctx, "target '%s' is '%s'; not an ARM",
target->cmd_name, target_get_name(target));
return ERROR_FAIL;
etm_ctx->portmode = portmode;
etm_ctx->core_state = ARMV4_5_STATE_ARM;
etm_ctx->portmode = portmode;
etm_ctx->core_state = ARMV4_5_STATE_ARM;
- arm7_9->etm_ctx = etm_ctx;
arm->etm = etm_ctx;
return etm_register_user_commands(cmd_ctx);
arm->etm = etm_ctx;
return etm_register_user_commands(cmd_ctx);
char *cmd, char **args, int argc)
{
target_t *target;
char *cmd, char **args, int argc)
{
target_t *target;
- armv4_5_common_t *armv4_5;
- arm7_9_common_t *arm7_9;
etm_context_t *etm;
reg_t *etm_sys_config_reg;
etm_context_t *etm;
reg_t *etm_sys_config_reg;
int max_port_size;
target = get_current_target(cmd_ctx);
int max_port_size;
target = get_current_target(cmd_ctx);
-
- if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK)
+ arm = target_to_arm(target);
+ if (!is_arm(arm))
{
command_print(cmd_ctx, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
{
command_print(cmd_ctx, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
if (!etm)
{
command_print(cmd_ctx, "current target doesn't have an ETM configured");
if (!etm)
{
command_print(cmd_ctx, "current target doesn't have an ETM configured");
char *cmd, char **args, int argc)
{
target_t *target;
char *cmd, char **args, int argc)
{
target_t *target;
- armv4_5_common_t *armv4_5;
- arm7_9_common_t *arm7_9;
etm_context_t *etm;
trace_status_t trace_status;
target = get_current_target(cmd_ctx);
etm_context_t *etm;
trace_status_t trace_status;
target = get_current_target(cmd_ctx);
-
- if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK)
+ arm = target_to_arm(target);
+ if (!is_arm(arm))
{
command_print(cmd_ctx, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
{
command_print(cmd_ctx, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
+ etm = arm->etm;
+ if (!etm)
{
command_print(cmd_ctx, "current target doesn't have an ETM configured");
return ERROR_FAIL;
}
{
command_print(cmd_ctx, "current target doesn't have an ETM configured");
return ERROR_FAIL;
}
/* ETM status */
if (etm->bcd_vers >= 0x11) {
/* ETM status */
if (etm->bcd_vers >= 0x11) {
char *cmd, char **args, int argc)
{
target_t *target;
char *cmd, char **args, int argc)
{
target_t *target;
- armv4_5_common_t *armv4_5;
- arm7_9_common_t *arm7_9;
etm_context_t *etm_ctx;
if (argc < 1)
etm_context_t *etm_ctx;
if (argc < 1)
}
target = get_current_target(cmd_ctx);
}
target = get_current_target(cmd_ctx);
-
- if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK)
+ arm = target_to_arm(target);
+ if (!is_arm(arm))
{
command_print(cmd_ctx, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
{
command_print(cmd_ctx, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
- if (!(etm_ctx = arm7_9->etm_ctx))
+ etm_ctx = arm->etm;
+ if (!etm_ctx)
{
command_print(cmd_ctx, "current target doesn't have an ETM configured");
return ERROR_FAIL;
{
command_print(cmd_ctx, "current target doesn't have an ETM configured");
return ERROR_FAIL;
{
fileio_t file;
target_t *target;
{
fileio_t file;
target_t *target;
- armv4_5_common_t *armv4_5;
- arm7_9_common_t *arm7_9;
etm_context_t *etm_ctx;
uint32_t i;
etm_context_t *etm_ctx;
uint32_t i;
}
target = get_current_target(cmd_ctx);
}
target = get_current_target(cmd_ctx);
-
- if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK)
+ arm = target_to_arm(target);
+ if (!is_arm(arm))
{
command_print(cmd_ctx, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
{
command_print(cmd_ctx, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
- if (!(etm_ctx = arm7_9->etm_ctx))
+ etm_ctx = arm->etm;
+ if (!etm_ctx)
{
command_print(cmd_ctx, "current target doesn't have an ETM configured");
return ERROR_FAIL;
{
command_print(cmd_ctx, "current target doesn't have an ETM configured");
return ERROR_FAIL;
{
fileio_t file;
target_t *target;
{
fileio_t file;
target_t *target;
- armv4_5_common_t *armv4_5;
- arm7_9_common_t *arm7_9;
etm_context_t *etm_ctx;
uint32_t i;
etm_context_t *etm_ctx;
uint32_t i;
}
target = get_current_target(cmd_ctx);
}
target = get_current_target(cmd_ctx);
-
- if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK)
+ arm = target_to_arm(target);
+ if (!is_arm(arm))
{
command_print(cmd_ctx, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
{
command_print(cmd_ctx, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
- if (!(etm_ctx = arm7_9->etm_ctx))
+ etm_ctx = arm->etm;
+ if (!etm_ctx)
{
command_print(cmd_ctx, "current target doesn't have an ETM configured");
return ERROR_FAIL;
{
command_print(cmd_ctx, "current target doesn't have an ETM configured");
return ERROR_FAIL;
char *cmd, char **args, int argc)
{
target_t *target;
char *cmd, char **args, int argc)
{
target_t *target;
- armv4_5_common_t *armv4_5;
- arm7_9_common_t *arm7_9;
etm_context_t *etm_ctx;
target = get_current_target(cmd_ctx);
etm_context_t *etm_ctx;
target = get_current_target(cmd_ctx);
-
- if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK)
+ arm = target_to_arm(target);
+ if (!is_arm(arm))
{
command_print(cmd_ctx, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
{
command_print(cmd_ctx, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
- if (!(etm_ctx = arm7_9->etm_ctx))
+ etm_ctx = arm->etm;
+ if (!etm_ctx)
{
command_print(cmd_ctx, "current target doesn't have an ETM configured");
return ERROR_FAIL;
{
command_print(cmd_ctx, "current target doesn't have an ETM configured");
return ERROR_FAIL;
char *cmd, char **args, int argc)
{
target_t *target;
char *cmd, char **args, int argc)
{
target_t *target;
- armv4_5_common_t *armv4_5;
- arm7_9_common_t *arm7_9;
etm_context_t *etm_ctx;
reg_t *etm_ctrl_reg;
target = get_current_target(cmd_ctx);
etm_context_t *etm_ctx;
reg_t *etm_ctrl_reg;
target = get_current_target(cmd_ctx);
-
- if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK)
+ arm = target_to_arm(target);
+ if (!is_arm(arm))
{
command_print(cmd_ctx, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
{
command_print(cmd_ctx, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
- etm_ctx = arm7_9->etm_ctx;
if (!etm_ctx)
{
command_print(cmd_ctx, "current target doesn't have an ETM configured");
if (!etm_ctx)
{
command_print(cmd_ctx, "current target doesn't have an ETM configured");
char *cmd, char **args, int argc)
{
target_t *target;
char *cmd, char **args, int argc)
{
target_t *target;
- armv4_5_common_t *armv4_5;
- arm7_9_common_t *arm7_9;
etm_context_t *etm_ctx;
reg_t *etm_ctrl_reg;
target = get_current_target(cmd_ctx);
etm_context_t *etm_ctx;
reg_t *etm_ctrl_reg;
target = get_current_target(cmd_ctx);
-
- if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK)
+ arm = target_to_arm(target);
+ if (!is_arm(arm))
{
command_print(cmd_ctx, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
{
command_print(cmd_ctx, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
- if (!(etm_ctx = arm7_9->etm_ctx))
+ etm_ctx = arm->etm;
+ if (!etm_ctx)
{
command_print(cmd_ctx, "current target doesn't have an ETM configured");
return ERROR_FAIL;
{
command_print(cmd_ctx, "current target doesn't have an ETM configured");
return ERROR_FAIL;
char *cmd, char **args, int argc)
{
target_t *target;
char *cmd, char **args, int argc)
{
target_t *target;
- armv4_5_common_t *armv4_5;
- arm7_9_common_t *arm7_9;
etm_context_t *etm_ctx;
int retval;
target = get_current_target(cmd_ctx);
etm_context_t *etm_ctx;
int retval;
target = get_current_target(cmd_ctx);
-
- if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK)
+ arm = target_to_arm(target);
+ if (!is_arm(arm))
{
command_print(cmd_ctx, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
{
command_print(cmd_ctx, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
- if (!(etm_ctx = arm7_9->etm_ctx))
+ etm_ctx = arm->etm;
+ if (!etm_ctx)
{
command_print(cmd_ctx, "current target doesn't have an ETM configured");
return ERROR_FAIL;
{
command_print(cmd_ctx, "current target doesn't have an ETM configured");
return ERROR_FAIL;
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)