projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use COMMAND_REGISTER macro
[fw/openocd]
/
src
/
target
/
etm.c
diff --git
a/src/target/etm.c
b/src/target/etm.c
index 864346326e46ad1b96c858fb7cca9200742134e3..6df354a5de84c371a56f92c3d060873e9dc4dda1 100644
(file)
--- a/
src/target/etm.c
+++ b/
src/target/etm.c
@@
-22,9
+22,11
@@
#endif
#include "armv4_5.h"
#endif
#include "armv4_5.h"
+#include "etm.h"
#include "etb.h"
#include "image.h"
#include "arm_disassembler.h"
#include "etb.h"
#include "image.h"
#include "arm_disassembler.h"
+#include "register.h"
/*
/*
@@
-49,8
+51,6
@@
* ARM IHI 0014O ... Embedded Trace Macrocell, Architecture Specification
*/
* ARM IHI 0014O ... Embedded Trace Macrocell, Architecture Specification
*/
-#define ARRAY_SIZE(x) ((int)(sizeof(x)/sizeof((x)[0])))
-
enum {
RO, /* read/only */
WO, /* write/only */
enum {
RO, /* read/only */
WO, /* write/only */
@@
-214,28
+214,30
@@
static const struct etm_reg_info etm_outputs[] = {
{ 0x6f, 32, RO, 0x20, "ETM_contextid_comparator_mask", }
#endif
{ 0x6f, 32, RO, 0x20, "ETM_contextid_comparator_mask", }
#endif
-static int etm_reg_arch_type = -1;
-
-static int etm_get_reg(reg_t *reg);
-static int etm_read_reg_w_check(reg_t *reg,
+static int etm_get_reg(struct reg *reg);
+static int etm_read_reg_w_check(struct reg *reg,
uint8_t* check_value, uint8_t* check_mask);
uint8_t* check_value, uint8_t* check_mask);
-static int etm_register_user_commands(struct command_context
_s
*cmd_ctx);
-static int etm_set_reg_w_exec(
reg_t
*reg, uint8_t *buf);
-static int etm_write_reg(
reg_t
*reg, uint32_t value);
+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
command_t
*etm_cmd;
+static
struct command
*etm_cmd;
+static const struct reg_arch_type etm_scan6_type = {
+ .get = etm_get_reg,
+ .set = etm_set_reg_w_exec,
+};
/* Look up register by ID ... most ETM instances only
* support a subset of the possible registers.
*/
/* Look up register by ID ... most ETM instances only
* support a subset of the possible registers.
*/
-static
reg_t *etm_reg_lookup(etm_context_
t *etm_ctx, unsigned id)
+static
struct reg *etm_reg_lookup(struct etm_contex
t *etm_ctx, unsigned id)
{
{
-
reg_cache_t
*cache = etm_ctx->reg_cache;
-
int
i;
+
struct reg_cache
*cache = etm_ctx->reg_cache;
+
unsigned
i;
for (i = 0; i < cache->num_regs; i++) {
for (i = 0; i < cache->num_regs; i++) {
- struct etm_reg
_s
*reg = cache->reg_list[i].arch_info;
+ struct etm_reg *reg = cache->reg_list[i].arch_info;
if (reg->reg_info->addr == id)
return &cache->reg_list[i];
if (reg->reg_info->addr == id)
return &cache->reg_list[i];
@@
-248,10
+250,10
@@
static reg_t *etm_reg_lookup(etm_context_t *etm_ctx, unsigned id)
}
static void etm_reg_add(unsigned bcd_vers, struct arm_jtag *jtag_info,
}
static void etm_reg_add(unsigned bcd_vers, struct arm_jtag *jtag_info,
-
reg_cache_t *cache, etm_reg_t
*ereg,
+
struct reg_cache *cache, struct etm_reg
*ereg,
const struct etm_reg_info *r, unsigned nreg)
{
const struct etm_reg_info *r, unsigned nreg)
{
-
reg_t
*reg = cache->reg_list;
+
struct reg
*reg = cache->reg_list;
reg += cache->num_regs;
ereg += cache->num_regs;
reg += cache->num_regs;
ereg += cache->num_regs;
@@
-269,7
+271,7
@@
static void etm_reg_add(unsigned bcd_vers, struct arm_jtag *jtag_info,
reg->size = r->size;
reg->value = &ereg->value;
reg->arch_info = ereg;
reg->size = r->size;
reg->value = &ereg->value;
reg->arch_info = ereg;
- reg->
arch_type = etm_reg_arch
_type;
+ reg->
type = &etm_scan6
_type;
reg++;
cache->num_regs++;
reg++;
cache->num_regs++;
@@
-279,22
+281,17
@@
static void etm_reg_add(unsigned bcd_vers, struct arm_jtag *jtag_info,
}
}
}
}
-
reg_cache_t *etm_build_reg_cache(target_
t *target,
- struct arm_jtag *jtag_info,
etm_context_
t *etm_ctx)
+
struct reg_cache *etm_build_reg_cache(struct targe
t *target,
+ struct arm_jtag *jtag_info,
struct etm_contex
t *etm_ctx)
{
{
-
reg_cache_t *reg_cache = malloc(sizeof(reg_cache_t
));
-
reg_t
*reg_list = NULL;
-
etm_reg_t
*arch_info = NULL;
+
struct reg_cache *reg_cache = malloc(sizeof(struct reg_cache
));
+
struct reg
*reg_list = NULL;
+
struct etm_reg
*arch_info = NULL;
unsigned bcd_vers, config;
unsigned bcd_vers, config;
- /* register a register arch-type for etm registers only once */
- if (etm_reg_arch_type == -1)
- etm_reg_arch_type = register_reg_arch_type(etm_get_reg,
- etm_set_reg_w_exec);
-
/* the actual registers are kept in two arrays */
/* the actual registers are kept in two arrays */
- reg_list = calloc(128, sizeof(
reg_t
));
- arch_info = calloc(128, sizeof(
etm_reg_t
));
+ reg_list = calloc(128, sizeof(
struct reg
));
+ arch_info = calloc(128, sizeof(
struct etm_reg
));
/* fill in values for the reg cache */
reg_cache->name = "etm registers";
/* fill in values for the reg cache */
reg_cache->name = "etm registers";
@@
-349,10
+346,7
@@
reg_cache_t *etm_build_reg_cache(target_t *target,
break;
default:
LOG_WARNING("Bad ETMv1 protocol %d", config >> 28);
break;
default:
LOG_WARNING("Bad ETMv1 protocol %d", config >> 28);
- free(reg_cache);
- free(reg_list);
- free(arch_info);
- return ERROR_OK;
+ goto fail;
}
}
etm_ctx->bcd_vers = bcd_vers;
}
}
etm_ctx->bcd_vers = bcd_vers;
@@
-391,15
+385,12
@@
reg_cache_t *etm_build_reg_cache(target_t *target,
/* the ETM might have an ETB connected */
if (strcmp(etm_ctx->capture_driver->name, "etb") == 0)
{
/* the ETM might have an ETB connected */
if (strcmp(etm_ctx->capture_driver->name, "etb") == 0)
{
-
etb_t
*etb = etm_ctx->capture_driver_priv;
+
struct etb
*etb = etm_ctx->capture_driver_priv;
if (!etb)
{
LOG_ERROR("etb selected as etm capture driver, but no ETB configured");
if (!etb)
{
LOG_ERROR("etb selected as etm capture driver, but no ETB configured");
- free(reg_cache);
- free(reg_list);
- free(arch_info);
- return ERROR_OK;
+ goto fail;
}
reg_cache->next = etb_build_reg_cache(etb);
}
reg_cache->next = etb_build_reg_cache(etb);
@@
-409,25
+400,31
@@
reg_cache_t *etm_build_reg_cache(target_t *target,
etm_ctx->reg_cache = reg_cache;
return reg_cache;
etm_ctx->reg_cache = reg_cache;
return reg_cache;
+
+fail:
+ free(reg_cache);
+ free(reg_list);
+ free(arch_info);
+ return NULL;
}
}
-static int etm_read_reg(
reg_t
*reg)
+static int etm_read_reg(
struct reg
*reg)
{
return etm_read_reg_w_check(reg, NULL, NULL);
}
{
return etm_read_reg_w_check(reg, NULL, NULL);
}
-static int etm_store_reg(
reg_t
*reg)
+static int etm_store_reg(
struct reg
*reg)
{
return etm_write_reg(reg, buf_get_u32(reg->value, 0, reg->size));
}
{
return etm_write_reg(reg, buf_get_u32(reg->value, 0, reg->size));
}
-int etm_setup(
target_
t *target)
+int etm_setup(
struct targe
t *target)
{
int retval;
uint32_t etm_ctrl_value;
struct arm *arm = target_to_arm(target);
{
int retval;
uint32_t etm_ctrl_value;
struct arm *arm = target_to_arm(target);
-
etm_context_
t *etm_ctx = arm->etm;
-
reg_t
*etm_ctrl_reg;
+
struct etm_contex
t *etm_ctx = arm->etm;
+
struct reg
*etm_ctrl_reg;
etm_ctrl_reg = etm_reg_lookup(etm_ctx, ETM_CTRL);
if (!etm_ctrl_reg)
etm_ctrl_reg = etm_reg_lookup(etm_ctx, ETM_CTRL);
if (!etm_ctrl_reg)
@@
-467,7
+464,7
@@
int etm_setup(target_t *target)
return ERROR_OK;
}
return ERROR_OK;
}
-static int etm_get_reg(
reg_t
*reg)
+static int etm_get_reg(
struct reg
*reg)
{
int retval;
{
int retval;
@@
-486,10
+483,10
@@
static int etm_get_reg(reg_t *reg)
return ERROR_OK;
}
return ERROR_OK;
}
-static int etm_read_reg_w_check(
reg_t
*reg,
+static int etm_read_reg_w_check(
struct reg
*reg,
uint8_t* check_value, uint8_t* check_mask)
{
uint8_t* check_value, uint8_t* check_mask)
{
-
etm_reg_t
*etm_reg = reg->arch_info;
+
struct etm_reg
*etm_reg = reg->arch_info;
const struct etm_reg_info *r = etm_reg->reg_info;
uint8_t reg_addr = r->addr & 0x7f;
struct scan_field fields[3];
const struct etm_reg_info *r = etm_reg->reg_info;
uint8_t reg_addr = r->addr & 0x7f;
struct scan_field fields[3];
@@
-542,7
+539,7
@@
static int etm_read_reg_w_check(reg_t *reg,
return ERROR_OK;
}
return ERROR_OK;
}
-static int etm_set_reg(
reg_t
*reg, uint32_t value)
+static int etm_set_reg(
struct reg
*reg, uint32_t value)
{
int retval;
{
int retval;
@@
-559,7
+556,7
@@
static int etm_set_reg(reg_t *reg, uint32_t value)
return ERROR_OK;
}
return ERROR_OK;
}
-static int etm_set_reg_w_exec(
reg_t
*reg, uint8_t *buf)
+static int etm_set_reg_w_exec(
struct reg
*reg, uint8_t *buf)
{
int retval;
{
int retval;
@@
-573,9
+570,9
@@
static int etm_set_reg_w_exec(reg_t *reg, uint8_t *buf)
return ERROR_OK;
}
return ERROR_OK;
}
-static int etm_write_reg(
reg_t
*reg, uint32_t value)
+static int etm_write_reg(
struct reg
*reg, uint32_t value)
{
{
-
etm_reg_t
*etm_reg = reg->arch_info;
+
struct etm_reg
*etm_reg = reg->arch_info;
const struct etm_reg_info *r = etm_reg->reg_info;
uint8_t reg_addr = r->addr & 0x7f;
struct scan_field fields[3];
const struct etm_reg_info *r = etm_reg->reg_info;
uint8_t reg_addr = r->addr & 0x7f;
struct scan_field fields[3];
@@
-621,12
+618,12
@@
static int etm_write_reg(reg_t *reg, uint32_t value)
/* ETM trace analysis functionality
*
*/
/* ETM trace analysis functionality
*
*/
-extern
etm_capture_driver_t
etm_dummy_capture_driver;
+extern
struct etm_capture_driver
etm_dummy_capture_driver;
#if BUILD_OOCD_TRACE == 1
#if BUILD_OOCD_TRACE == 1
-extern
etm_capture_driver_t
oocd_trace_capture_driver;
+extern
struct etm_capture_driver
oocd_trace_capture_driver;
#endif
#endif
-static
etm_capture_driver_t
*etm_capture_drivers[] =
+static
struct etm_capture_driver
*etm_capture_drivers[] =
{
&etb_capture_driver,
&etm_dummy_capture_driver,
{
&etb_capture_driver,
&etm_dummy_capture_driver,
@@
-636,11
+633,11
@@
static etm_capture_driver_t *etm_capture_drivers[] =
NULL
};
NULL
};
-static int etm_read_instruction(
etm_context_t *ctx, arm_instruction_t
*instruction)
+static int etm_read_instruction(
struct etm_context *ctx, struct arm_instruction
*instruction)
{
int i;
int section = -1;
{
int i;
int section = -1;
-
uint32
_t size_read;
+
size
_t size_read;
uint32_t opcode;
int retval;
uint32_t opcode;
int retval;
@@
-704,7
+701,7
@@
static int etm_read_instruction(etm_context_t *ctx, arm_instruction_t *instructi
return ERROR_OK;
}
return ERROR_OK;
}
-static int etmv1_next_packet(
etm_context_
t *ctx, uint8_t *packet, int apo)
+static int etmv1_next_packet(
struct etm_contex
t *ctx, uint8_t *packet, int apo)
{
while (ctx->data_index < ctx->trace_depth)
{
{
while (ctx->data_index < ctx->trace_depth)
{
@@
-769,7
+766,7
@@
static int etmv1_next_packet(etm_context_t *ctx, uint8_t *packet, int apo)
return -1;
}
return -1;
}
-static int etmv1_branch_address(
etm_context_
t *ctx)
+static int etmv1_branch_address(
struct etm_contex
t *ctx)
{
int retval;
uint8_t packet;
{
int retval;
uint8_t packet;
@@
-855,7
+852,7
@@
static int etmv1_branch_address(etm_context_t *ctx)
return 0;
}
return 0;
}
-static int etmv1_data(
etm_context_
t *ctx, int size, uint32_t *data)
+static int etmv1_data(
struct etm_contex
t *ctx, int size, uint32_t *data)
{
int j;
uint8_t buf[4];
{
int j;
uint8_t buf[4];
@@
-884,10
+881,10
@@
static int etmv1_data(etm_context_t *ctx, int size, uint32_t *data)
return 0;
}
return 0;
}
-static int etmv1_analyze_trace(
etm_context_t *ctx, struct command_context_s
*cmd_ctx)
+static int etmv1_analyze_trace(
struct etm_context *ctx, struct command_context
*cmd_ctx)
{
int retval;
{
int retval;
-
arm_instruction_t
instruction;
+
struct arm_instruction
instruction;
/* read the trace data if it wasn't read already */
if (ctx->trace_depth == 0)
/* read the trace data if it wasn't read already */
if (ctx->trace_depth == 0)
@@
-1182,22
+1179,22
@@
static COMMAND_HELPER(handle_etm_tracemode_command_update,
etmv1_tracemode_t tracemode;
/* what parts of data access are traced? */
etmv1_tracemode_t tracemode;
/* what parts of data access are traced? */
- if (strcmp(
args
[0], "none") == 0)
+ if (strcmp(
CMD_ARGV
[0], "none") == 0)
tracemode = ETMV1_TRACE_NONE;
tracemode = ETMV1_TRACE_NONE;
- else if (strcmp(
args
[0], "data") == 0)
+ else if (strcmp(
CMD_ARGV
[0], "data") == 0)
tracemode = ETMV1_TRACE_DATA;
tracemode = ETMV1_TRACE_DATA;
- else if (strcmp(
args
[0], "address") == 0)
+ else if (strcmp(
CMD_ARGV
[0], "address") == 0)
tracemode = ETMV1_TRACE_ADDR;
tracemode = ETMV1_TRACE_ADDR;
- else if (strcmp(
args
[0], "all") == 0)
+ else if (strcmp(
CMD_ARGV
[0], "all") == 0)
tracemode = ETMV1_TRACE_DATA | ETMV1_TRACE_ADDR;
else
{
tracemode = ETMV1_TRACE_DATA | ETMV1_TRACE_ADDR;
else
{
- command_print(
cmd_ctx, "invalid option '%s'", args
[0]);
+ command_print(
CMD_CTX, "invalid option '%s'", CMD_ARGV
[0]);
return ERROR_INVALID_ARGUMENTS;
}
uint8_t context_id;
return ERROR_INVALID_ARGUMENTS;
}
uint8_t context_id;
- COMMAND_PARSE_NUMBER(u8,
args
[1], context_id);
+ COMMAND_PARSE_NUMBER(u8,
CMD_ARGV
[1], context_id);
switch (context_id)
{
case 0:
switch (context_id)
{
case 0:
@@
-1213,29
+1210,18
@@
static COMMAND_HELPER(handle_etm_tracemode_command_update,
tracemode |= ETMV1_CONTEXTID_32;
break;
default:
tracemode |= ETMV1_CONTEXTID_32;
break;
default:
- command_print(
cmd_ctx, "invalid option '%s'", args
[1]);
+ command_print(
CMD_CTX, "invalid option '%s'", CMD_ARGV
[1]);
return ERROR_INVALID_ARGUMENTS;
}
return ERROR_INVALID_ARGUMENTS;
}
- if (strcmp(args[2], "enable") == 0)
+ bool etmv1_cycle_accurate;
+ COMMAND_PARSE_ENABLE(CMD_ARGV[2], etmv1_cycle_accurate);
+ if (etmv1_cycle_accurate)
tracemode |= ETMV1_CYCLE_ACCURATE;
tracemode |= ETMV1_CYCLE_ACCURATE;
- else if (strcmp(args[2], "disable") == 0)
- tracemode |= 0;
- else
- {
- command_print(cmd_ctx, "invalid option '%s'", args[2]);
- return ERROR_INVALID_ARGUMENTS;
- }
- if (strcmp(args[3], "enable") == 0)
+ bool etmv1_branch_output;
+ COMMAND_PARSE_ENABLE(CMD_ARGV[3], etmv1_branch_output);
tracemode |= ETMV1_BRANCH_OUTPUT;
tracemode |= ETMV1_BRANCH_OUTPUT;
- else if (strcmp(args[3], "disable") == 0)
- tracemode |= 0;
- else
- {
- command_print(cmd_ctx, "invalid option '%s'", args[3]);
- return ERROR_INVALID_ARGUMENTS;
- }
/* IGNORED:
* - CPRT tracing (coprocessor register transfers)
/* IGNORED:
* - CPRT tracing (coprocessor register transfers)
@@
-1249,24
+1235,24
@@
static COMMAND_HELPER(handle_etm_tracemode_command_update,
COMMAND_HANDLER(handle_etm_tracemode_command)
{
COMMAND_HANDLER(handle_etm_tracemode_command)
{
-
target_t *target = get_current_target(cmd_ctx
);
+
struct target *target = get_current_target(CMD_CTX
);
struct arm *arm = target_to_arm(target);
struct arm *arm = target_to_arm(target);
- struct etm *etm;
+ struct etm
_context
*etm;
if (!is_arm(arm)) {
if (!is_arm(arm)) {
- command_print(
cmd_ctx
, "ETM: current target isn't an ARM");
+ command_print(
CMD_CTX
, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
etm = arm->etm;
if (!etm) {
return ERROR_FAIL;
}
etm = arm->etm;
if (!etm) {
- command_print(
cmd_ctx
, "current target doesn't have an ETM configured");
+ command_print(
CMD_CTX
, "current target doesn't have an ETM configured");
return ERROR_FAIL;
}
etmv1_tracemode_t tracemode = etm->tracemode;
return ERROR_FAIL;
}
etmv1_tracemode_t tracemode = etm->tracemode;
- switch (
argc
)
+ switch (
CMD_ARGC
)
{
case 0:
break;
{
case 0:
break;
@@
-1274,7
+1260,7
@@
COMMAND_HANDLER(handle_etm_tracemode_command)
CALL_COMMAND_HANDLER(handle_etm_tracemode_command_update, &tracemode);
break;
default:
CALL_COMMAND_HANDLER(handle_etm_tracemode_command_update, &tracemode);
break;
default:
- command_print(
cmd_ctx
, "usage: configure trace mode "
+ command_print(
CMD_CTX
, "usage: configure trace mode "
"<none | data | address | all> "
"<context id bits> <cycle accurate> <branch output>");
return ERROR_FAIL;
"<none | data | address | all> "
"<context id bits> <cycle accurate> <branch output>");
return ERROR_FAIL;
@@
-1285,62
+1271,62
@@
COMMAND_HANDLER(handle_etm_tracemode_command)
* or couldn't be written; display actual hardware state...
*/
* or couldn't be written; display actual hardware state...
*/
- command_print(
cmd_ctx
, "current tracemode configuration:");
+ command_print(
CMD_CTX
, "current tracemode configuration:");
switch (tracemode & ETMV1_TRACE_MASK)
{
case ETMV1_TRACE_NONE:
switch (tracemode & ETMV1_TRACE_MASK)
{
case ETMV1_TRACE_NONE:
- command_print(
cmd_ctx
, "data tracing: none");
+ command_print(
CMD_CTX
, "data tracing: none");
break;
case ETMV1_TRACE_DATA:
break;
case ETMV1_TRACE_DATA:
- command_print(
cmd_ctx
, "data tracing: data only");
+ command_print(
CMD_CTX
, "data tracing: data only");
break;
case ETMV1_TRACE_ADDR:
break;
case ETMV1_TRACE_ADDR:
- command_print(
cmd_ctx
, "data tracing: address only");
+ command_print(
CMD_CTX
, "data tracing: address only");
break;
case ETMV1_TRACE_DATA | ETMV1_TRACE_ADDR:
break;
case ETMV1_TRACE_DATA | ETMV1_TRACE_ADDR:
- command_print(
cmd_ctx
, "data tracing: address and data");
+ command_print(
CMD_CTX
, "data tracing: address and data");
break;
}
switch (tracemode & ETMV1_CONTEXTID_MASK)
{
case ETMV1_CONTEXTID_NONE:
break;
}
switch (tracemode & ETMV1_CONTEXTID_MASK)
{
case ETMV1_CONTEXTID_NONE:
- command_print(
cmd_ctx
, "contextid tracing: none");
+ command_print(
CMD_CTX
, "contextid tracing: none");
break;
case ETMV1_CONTEXTID_8:
break;
case ETMV1_CONTEXTID_8:
- command_print(
cmd_ctx
, "contextid tracing: 8 bit");
+ command_print(
CMD_CTX
, "contextid tracing: 8 bit");
break;
case ETMV1_CONTEXTID_16:
break;
case ETMV1_CONTEXTID_16:
- command_print(
cmd_ctx
, "contextid tracing: 16 bit");
+ command_print(
CMD_CTX
, "contextid tracing: 16 bit");
break;
case ETMV1_CONTEXTID_32:
break;
case ETMV1_CONTEXTID_32:
- command_print(
cmd_ctx
, "contextid tracing: 32 bit");
+ command_print(
CMD_CTX
, "contextid tracing: 32 bit");
break;
}
if (tracemode & ETMV1_CYCLE_ACCURATE)
{
break;
}
if (tracemode & ETMV1_CYCLE_ACCURATE)
{
- command_print(
cmd_ctx
, "cycle-accurate tracing enabled");
+ command_print(
CMD_CTX
, "cycle-accurate tracing enabled");
}
else
{
}
else
{
- command_print(
cmd_ctx
, "cycle-accurate tracing disabled");
+ command_print(
CMD_CTX
, "cycle-accurate tracing disabled");
}
if (tracemode & ETMV1_BRANCH_OUTPUT)
{
}
if (tracemode & ETMV1_BRANCH_OUTPUT)
{
- command_print(
cmd_ctx
, "full branch address output enabled");
+ command_print(
CMD_CTX
, "full branch address output enabled");
}
else
{
}
else
{
- command_print(
cmd_ctx
, "full branch address output disabled");
+ command_print(
CMD_CTX
, "full branch address output disabled");
}
/* only update ETM_CTRL register if tracemode changed */
if (etm->tracemode != tracemode)
{
}
/* only update ETM_CTRL register if tracemode changed */
if (etm->tracemode != tracemode)
{
-
reg_t
*etm_ctrl_reg;
+
struct reg
*etm_ctrl_reg;
etm_ctrl_reg = etm_reg_lookup(etm, ETM_CTRL);
if (!etm_ctrl_reg)
etm_ctrl_reg = etm_reg_lookup(etm, ETM_CTRL);
if (!etm_ctrl_reg)
@@
-1371,25
+1357,25
@@
COMMAND_HANDLER(handle_etm_tracemode_command)
COMMAND_HANDLER(handle_etm_config_command)
{
COMMAND_HANDLER(handle_etm_config_command)
{
-
target_
t *target;
+
struct targe
t *target;
struct arm *arm;
etm_portmode_t portmode = 0x0;
struct arm *arm;
etm_portmode_t portmode = 0x0;
- struct etm *etm_ctx;
+ struct etm
_context
*etm_ctx;
int i;
int i;
- if (
argc
!= 5)
+ if (
CMD_ARGC
!= 5)
return ERROR_COMMAND_SYNTAX_ERROR;
return ERROR_COMMAND_SYNTAX_ERROR;
- target = get_target(
args
[0]);
+ target = get_target(
CMD_ARGV
[0]);
if (!target)
{
if (!target)
{
- LOG_ERROR("target '%s' not defined",
args
[0]);
+ LOG_ERROR("target '%s' not defined",
CMD_ARGV
[0]);
return ERROR_FAIL;
}
arm = target_to_arm(target);
if (!is_arm(arm)) {
return ERROR_FAIL;
}
arm = target_to_arm(target);
if (!is_arm(arm)) {
- command_print(
cmd_ctx
, "target '%s' is '%s'; not an ARM",
+ command_print(
CMD_CTX
, "target '%s' is '%s'; not an ARM",
target->cmd_name, target_get_name(target));
return ERROR_FAIL;
}
target->cmd_name, target_get_name(target));
return ERROR_FAIL;
}
@@
-1407,7
+1393,7
@@
COMMAND_HANDLER(handle_etm_config_command)
* "normal full" ...
*/
uint8_t port_width;
* "normal full" ...
*/
uint8_t port_width;
- COMMAND_PARSE_NUMBER(u8,
args
[1], port_width);
+ COMMAND_PARSE_NUMBER(u8,
CMD_ARGV
[1], port_width);
switch (port_width)
{
/* before ETMv3.0 */
switch (port_width)
{
/* before ETMv3.0 */
@@
-1440,44
+1426,44
@@
COMMAND_HANDLER(handle_etm_config_command)
portmode |= ETM_PORT_2BIT;
break;
default:
portmode |= ETM_PORT_2BIT;
break;
default:
- command_print(
cmd_ctx
,
- "unsupported ETM port width '%s'",
args
[1]);
+ command_print(
CMD_CTX
,
+ "unsupported ETM port width '%s'",
CMD_ARGV
[1]);
return ERROR_FAIL;
}
return ERROR_FAIL;
}
- if (strcmp("normal",
args
[2]) == 0)
+ if (strcmp("normal",
CMD_ARGV
[2]) == 0)
{
portmode |= ETM_PORT_NORMAL;
}
{
portmode |= ETM_PORT_NORMAL;
}
- else if (strcmp("multiplexed",
args
[2]) == 0)
+ else if (strcmp("multiplexed",
CMD_ARGV
[2]) == 0)
{
portmode |= ETM_PORT_MUXED;
}
{
portmode |= ETM_PORT_MUXED;
}
- else if (strcmp("demultiplexed",
args
[2]) == 0)
+ else if (strcmp("demultiplexed",
CMD_ARGV
[2]) == 0)
{
portmode |= ETM_PORT_DEMUXED;
}
else
{
{
portmode |= ETM_PORT_DEMUXED;
}
else
{
- command_print(
cmd_ctx, "unsupported ETM port mode '%s', must be 'normal', 'multiplexed' or 'demultiplexed'", args
[2]);
+ command_print(
CMD_CTX, "unsupported ETM port mode '%s', must be 'normal', 'multiplexed' or 'demultiplexed'", CMD_ARGV
[2]);
return ERROR_FAIL;
}
return ERROR_FAIL;
}
- if (strcmp("half",
args
[3]) == 0)
+ if (strcmp("half",
CMD_ARGV
[3]) == 0)
{
portmode |= ETM_PORT_HALF_CLOCK;
}
{
portmode |= ETM_PORT_HALF_CLOCK;
}
- else if (strcmp("full",
args
[3]) == 0)
+ else if (strcmp("full",
CMD_ARGV
[3]) == 0)
{
portmode |= ETM_PORT_FULL_CLOCK;
}
else
{
{
portmode |= ETM_PORT_FULL_CLOCK;
}
else
{
- command_print(
cmd_ctx, "unsupported ETM port clocking '%s', must be 'full' or 'half'", args
[3]);
+ command_print(
CMD_CTX, "unsupported ETM port clocking '%s', must be 'full' or 'half'", CMD_ARGV
[3]);
return ERROR_FAIL;
}
return ERROR_FAIL;
}
- etm_ctx = calloc(1, sizeof(
etm_context_
t));
+ etm_ctx = calloc(1, sizeof(
struct etm_contex
t));
if (!etm_ctx) {
LOG_DEBUG("out of memory");
return ERROR_FAIL;
if (!etm_ctx) {
LOG_DEBUG("out of memory");
return ERROR_FAIL;
@@
-1485,10
+1471,10
@@
COMMAND_HANDLER(handle_etm_config_command)
for (i = 0; etm_capture_drivers[i]; i++)
{
for (i = 0; etm_capture_drivers[i]; i++)
{
- if (strcmp(
args
[4], etm_capture_drivers[i]->name) == 0)
+ if (strcmp(
CMD_ARGV
[4], etm_capture_drivers[i]->name) == 0)
{
int retval;
{
int retval;
- if ((retval = etm_capture_drivers[i]->register_commands(
cmd_ctx
)) != ERROR_OK)
+ if ((retval = etm_capture_drivers[i]->register_commands(
CMD_CTX
)) != ERROR_OK)
{
free(etm_ctx);
return retval;
{
free(etm_ctx);
return retval;
@@
-1504,7
+1490,7
@@
COMMAND_HANDLER(handle_etm_config_command)
{
/* no supported capture driver found, don't register an ETM */
free(etm_ctx);
{
/* no supported capture driver found, don't register an ETM */
free(etm_ctx);
- LOG_ERROR("trace capture driver '%s' not found",
args
[4]);
+ LOG_ERROR("trace capture driver '%s' not found",
CMD_ARGV
[4]);
return ERROR_FAIL;
}
return ERROR_FAIL;
}
@@
-1516,61
+1502,61
@@
COMMAND_HANDLER(handle_etm_config_command)
arm->etm = etm_ctx;
arm->etm = etm_ctx;
- return etm_register_user_commands(
cmd_ctx
);
+ return etm_register_user_commands(
CMD_CTX
);
}
COMMAND_HANDLER(handle_etm_info_command)
{
}
COMMAND_HANDLER(handle_etm_info_command)
{
-
target_
t *target;
+
struct targe
t *target;
struct arm *arm;
struct arm *arm;
-
etm_context_
t *etm;
-
reg_t
*etm_sys_config_reg;
+
struct etm_contex
t *etm;
+
struct reg
*etm_sys_config_reg;
int max_port_size;
uint32_t config;
int max_port_size;
uint32_t config;
- target = get_current_target(
cmd_ctx
);
+ target = get_current_target(
CMD_CTX
);
arm = target_to_arm(target);
if (!is_arm(arm))
{
arm = target_to_arm(target);
if (!is_arm(arm))
{
- command_print(
cmd_ctx
, "ETM: current target isn't an ARM");
+ command_print(
CMD_CTX
, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
etm = arm->etm;
if (!etm)
{
return ERROR_FAIL;
}
etm = arm->etm;
if (!etm)
{
- command_print(
cmd_ctx
, "current target doesn't have an ETM configured");
+ command_print(
CMD_CTX
, "current target doesn't have an ETM configured");
return ERROR_FAIL;
}
return ERROR_FAIL;
}
- command_print(
cmd_ctx
, "ETM v%d.%d",
+ command_print(
CMD_CTX
, "ETM v%d.%d",
etm->bcd_vers >> 4, etm->bcd_vers & 0xf);
etm->bcd_vers >> 4, etm->bcd_vers & 0xf);
- command_print(
cmd_ctx
, "pairs of address comparators: %i",
+ command_print(
CMD_CTX
, "pairs of address comparators: %i",
(int) (etm->config >> 0) & 0x0f);
(int) (etm->config >> 0) & 0x0f);
- command_print(
cmd_ctx
, "data comparators: %i",
+ command_print(
CMD_CTX
, "data comparators: %i",
(int) (etm->config >> 4) & 0x0f);
(int) (etm->config >> 4) & 0x0f);
- command_print(
cmd_ctx
, "memory map decoders: %i",
+ command_print(
CMD_CTX
, "memory map decoders: %i",
(int) (etm->config >> 8) & 0x1f);
(int) (etm->config >> 8) & 0x1f);
- command_print(
cmd_ctx
, "number of counters: %i",
+ command_print(
CMD_CTX
, "number of counters: %i",
(int) (etm->config >> 13) & 0x07);
(int) (etm->config >> 13) & 0x07);
- command_print(
cmd_ctx
, "sequencer %spresent",
+ command_print(
CMD_CTX
, "sequencer %spresent",
(int) (etm->config & (1 << 16)) ? "" : "not ");
(int) (etm->config & (1 << 16)) ? "" : "not ");
- command_print(
cmd_ctx
, "number of ext. inputs: %i",
+ command_print(
CMD_CTX
, "number of ext. inputs: %i",
(int) (etm->config >> 17) & 0x07);
(int) (etm->config >> 17) & 0x07);
- command_print(
cmd_ctx
, "number of ext. outputs: %i",
+ command_print(
CMD_CTX
, "number of ext. outputs: %i",
(int) (etm->config >> 20) & 0x07);
(int) (etm->config >> 20) & 0x07);
- command_print(
cmd_ctx
, "FIFO full %spresent",
+ command_print(
CMD_CTX
, "FIFO full %spresent",
(int) (etm->config & (1 << 23)) ? "" : "not ");
if (etm->bcd_vers < 0x20)
(int) (etm->config & (1 << 23)) ? "" : "not ");
if (etm->bcd_vers < 0x20)
- command_print(
cmd_ctx
, "protocol version: %i",
+ command_print(
CMD_CTX
, "protocol version: %i",
(int) (etm->config >> 28) & 0x07);
else {
(int) (etm->config >> 28) & 0x07);
else {
- command_print(
cmd_ctx
,
+ command_print(
CMD_CTX
,
"coprocessor and memory access %ssupported",
(etm->config & (1 << 26)) ? "" : "not ");
"coprocessor and memory access %ssupported",
(etm->config & (1 << 26)) ? "" : "not ");
- command_print(
cmd_ctx
, "trace start/stop %spresent",
+ command_print(
CMD_CTX
, "trace start/stop %spresent",
(etm->config & (1 << 26)) ? "" : "not ");
(etm->config & (1 << 26)) ? "" : "not ");
- command_print(
cmd_ctx
, "number of context comparators: %i",
+ command_print(
CMD_CTX
, "number of context comparators: %i",
(int) (etm->config >> 24) & 0x03);
}
(int) (etm->config >> 24) & 0x03);
}
@@
-1622,30
+1608,30
@@
COMMAND_HANDLER(handle_etm_info_command)
LOG_ERROR("Illegal max_port_size");
return ERROR_FAIL;
}
LOG_ERROR("Illegal max_port_size");
return ERROR_FAIL;
}
- command_print(
cmd_ctx
, "max. port size: %i", max_port_size);
+ command_print(
CMD_CTX
, "max. port size: %i", max_port_size);
if (etm->bcd_vers < 0x30) {
if (etm->bcd_vers < 0x30) {
- command_print(
cmd_ctx
, "half-rate clocking %ssupported",
+ command_print(
CMD_CTX
, "half-rate clocking %ssupported",
(config & (1 << 3)) ? "" : "not ");
(config & (1 << 3)) ? "" : "not ");
- command_print(
cmd_ctx
, "full-rate clocking %ssupported",
+ command_print(
CMD_CTX
, "full-rate clocking %ssupported",
(config & (1 << 4)) ? "" : "not ");
(config & (1 << 4)) ? "" : "not ");
- command_print(
cmd_ctx
, "normal trace format %ssupported",
+ command_print(
CMD_CTX
, "normal trace format %ssupported",
(config & (1 << 5)) ? "" : "not ");
(config & (1 << 5)) ? "" : "not ");
- command_print(
cmd_ctx
, "multiplex trace format %ssupported",
+ command_print(
CMD_CTX
, "multiplex trace format %ssupported",
(config & (1 << 6)) ? "" : "not ");
(config & (1 << 6)) ? "" : "not ");
- command_print(
cmd_ctx
, "demultiplex trace format %ssupported",
+ command_print(
CMD_CTX
, "demultiplex trace format %ssupported",
(config & (1 << 7)) ? "" : "not ");
} else {
/* REVISIT show which size and format are selected ... */
(config & (1 << 7)) ? "" : "not ");
} else {
/* REVISIT show which size and format are selected ... */
- command_print(
cmd_ctx
, "current port size %ssupported",
+ command_print(
CMD_CTX
, "current port size %ssupported",
(config & (1 << 10)) ? "" : "not ");
(config & (1 << 10)) ? "" : "not ");
- command_print(
cmd_ctx
, "current trace format %ssupported",
+ command_print(
CMD_CTX
, "current trace format %ssupported",
(config & (1 << 11)) ? "" : "not ");
}
if (etm->bcd_vers >= 0x21)
(config & (1 << 11)) ? "" : "not ");
}
if (etm->bcd_vers >= 0x21)
- command_print(
cmd_ctx
, "fetch comparisons %ssupported",
+ command_print(
CMD_CTX
, "fetch comparisons %ssupported",
(config & (1 << 17)) ? "not " : "");
(config & (1 << 17)) ? "not " : "");
- command_print(
cmd_ctx
, "FIFO full %ssupported",
+ command_print(
CMD_CTX
, "FIFO full %ssupported",
(config & (1 << 8)) ? "" : "not ");
return ERROR_OK;
(config & (1 << 8)) ? "" : "not ");
return ERROR_OK;
@@
-1653,29
+1639,29
@@
COMMAND_HANDLER(handle_etm_info_command)
COMMAND_HANDLER(handle_etm_status_command)
{
COMMAND_HANDLER(handle_etm_status_command)
{
-
target_
t *target;
+
struct targe
t *target;
struct arm *arm;
struct arm *arm;
-
etm_context_
t *etm;
+
struct etm_contex
t *etm;
trace_status_t trace_status;
trace_status_t trace_status;
- target = get_current_target(
cmd_ctx
);
+ target = get_current_target(
CMD_CTX
);
arm = target_to_arm(target);
if (!is_arm(arm))
{
arm = target_to_arm(target);
if (!is_arm(arm))
{
- command_print(
cmd_ctx
, "ETM: current target isn't an ARM");
+ command_print(
CMD_CTX
, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
etm = arm->etm;
if (!etm)
{
return ERROR_FAIL;
}
etm = arm->etm;
if (!etm)
{
- command_print(
cmd_ctx
, "current target doesn't have an ETM configured");
+ command_print(
CMD_CTX
, "current target doesn't have an ETM configured");
return ERROR_FAIL;
}
/* ETM status */
if (etm->bcd_vers >= 0x11) {
return ERROR_FAIL;
}
/* ETM status */
if (etm->bcd_vers >= 0x11) {
-
reg_t
*reg;
+
struct reg
*reg;
reg = etm_reg_lookup(etm, ETM_STATUS);
if (!reg)
reg = etm_reg_lookup(etm, ETM_STATUS);
if (!reg)
@@
-1683,7
+1669,7
@@
COMMAND_HANDLER(handle_etm_status_command)
if (etm_get_reg(reg) == ERROR_OK) {
unsigned s = buf_get_u32(reg->value, 0, reg->size);
if (etm_get_reg(reg) == ERROR_OK) {
unsigned s = buf_get_u32(reg->value, 0, reg->size);
- command_print(
cmd_ctx
, "etm: %s%s%s%s",
+ command_print(
CMD_CTX
, "etm: %s%s%s%s",
/* bit(1) == progbit */
(etm->bcd_vers >= 0x12)
? ((s & (1 << 1))
/* bit(1) == progbit */
(etm->bcd_vers >= 0x12)
? ((s & (1 << 1))
@@
-1702,7
+1688,7
@@
COMMAND_HANDLER(handle_etm_status_command)
trace_status = etm->capture_driver->status(etm);
if (trace_status == TRACE_IDLE)
{
trace_status = etm->capture_driver->status(etm);
if (trace_status == TRACE_IDLE)
{
- command_print(
cmd_ctx
, "%s: idle", etm->capture_driver->name);
+ command_print(
CMD_CTX
, "%s: idle", etm->capture_driver->name);
}
else
{
}
else
{
@@
-1711,7
+1697,7
@@
COMMAND_HANDLER(handle_etm_status_command)
static char *overflowed = ", overflowed";
static char *triggered = ", triggered";
static char *overflowed = ", overflowed";
static char *triggered = ", triggered";
- command_print(
cmd_ctx
, "%s: trace collection%s%s%s",
+ command_print(
CMD_CTX
, "%s: trace collection%s%s%s",
etm->capture_driver->name,
(trace_status & TRACE_RUNNING) ? running : completed,
(trace_status & TRACE_OVERFLOWED) ? overflowed : "",
etm->capture_driver->name,
(trace_status & TRACE_RUNNING) ? running : completed,
(trace_status & TRACE_OVERFLOWED) ? overflowed : "",
@@
-1719,7
+1705,7
@@
COMMAND_HANDLER(handle_etm_status_command)
if (etm->trace_depth > 0)
{
if (etm->trace_depth > 0)
{
- command_print(
cmd_ctx
, "%i frames of trace data read",
+ command_print(
CMD_CTX
, "%i frames of trace data read",
(int)(etm->trace_depth));
}
}
(int)(etm->trace_depth));
}
}
@@
-1729,28
+1715,28
@@
COMMAND_HANDLER(handle_etm_status_command)
COMMAND_HANDLER(handle_etm_image_command)
{
COMMAND_HANDLER(handle_etm_image_command)
{
-
target_
t *target;
+
struct targe
t *target;
struct arm *arm;
struct arm *arm;
-
etm_context_
t *etm_ctx;
+
struct etm_contex
t *etm_ctx;
- if (
argc
< 1)
+ if (
CMD_ARGC
< 1)
{
{
- command_print(
cmd_ctx
, "usage: etm image <file> [base address] [type]");
+ command_print(
CMD_CTX
, "usage: etm image <file> [base address] [type]");
return ERROR_FAIL;
}
return ERROR_FAIL;
}
- target = get_current_target(
cmd_ctx
);
+ target = get_current_target(
CMD_CTX
);
arm = target_to_arm(target);
if (!is_arm(arm))
{
arm = target_to_arm(target);
if (!is_arm(arm))
{
- command_print(
cmd_ctx
, "ETM: current target isn't an ARM");
+ command_print(
CMD_CTX
, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
etm_ctx = arm->etm;
if (!etm_ctx)
{
return ERROR_FAIL;
}
etm_ctx = arm->etm;
if (!etm_ctx)
{
- command_print(
cmd_ctx
, "current target doesn't have an ETM configured");
+ command_print(
CMD_CTX
, "current target doesn't have an ETM configured");
return ERROR_FAIL;
}
return ERROR_FAIL;
}
@@
-1758,25
+1744,25
@@
COMMAND_HANDLER(handle_etm_image_command)
{
image_close(etm_ctx->image);
free(etm_ctx->image);
{
image_close(etm_ctx->image);
free(etm_ctx->image);
- command_print(
cmd_ctx
, "previously loaded image found and closed");
+ command_print(
CMD_CTX
, "previously loaded image found and closed");
}
}
- etm_ctx->image = malloc(sizeof(
image_t
));
+ etm_ctx->image = malloc(sizeof(
struct image
));
etm_ctx->image->base_address_set = 0;
etm_ctx->image->start_address_set = 0;
/* a base address isn't always necessary, default to 0x0 (i.e. don't relocate) */
etm_ctx->image->base_address_set = 0;
etm_ctx->image->start_address_set = 0;
/* a base address isn't always necessary, default to 0x0 (i.e. don't relocate) */
- if (
argc
>= 2)
+ if (
CMD_ARGC
>= 2)
{
etm_ctx->image->base_address_set = 1;
{
etm_ctx->image->base_address_set = 1;
- COMMAND_PARSE_NUMBER(int,
args
[1], etm_ctx->image->base_address);
+ COMMAND_PARSE_NUMBER(int,
CMD_ARGV
[1], etm_ctx->image->base_address);
}
else
{
etm_ctx->image->base_address_set = 0;
}
}
else
{
etm_ctx->image->base_address_set = 0;
}
- if (image_open(etm_ctx->image,
args[0], (argc >= 3) ? args
[2] : NULL) != ERROR_OK)
+ if (image_open(etm_ctx->image,
CMD_ARGV[0], (CMD_ARGC >= 3) ? CMD_ARGV
[2] : NULL) != ERROR_OK)
{
free(etm_ctx->image);
etm_ctx->image = NULL;
{
free(etm_ctx->image);
etm_ctx->image = NULL;
@@
-1789,42
+1775,42
@@
COMMAND_HANDLER(handle_etm_image_command)
COMMAND_HANDLER(handle_etm_dump_command)
{
struct fileio file;
COMMAND_HANDLER(handle_etm_dump_command)
{
struct fileio file;
-
target_
t *target;
+
struct targe
t *target;
struct arm *arm;
struct arm *arm;
-
etm_context_
t *etm_ctx;
+
struct etm_contex
t *etm_ctx;
uint32_t i;
uint32_t i;
- if (
argc
!= 1)
+ if (
CMD_ARGC
!= 1)
{
{
- command_print(
cmd_ctx
, "usage: etm dump <file>");
+ command_print(
CMD_CTX
, "usage: etm dump <file>");
return ERROR_FAIL;
}
return ERROR_FAIL;
}
- target = get_current_target(
cmd_ctx
);
+ target = get_current_target(
CMD_CTX
);
arm = target_to_arm(target);
if (!is_arm(arm))
{
arm = target_to_arm(target);
if (!is_arm(arm))
{
- command_print(
cmd_ctx
, "ETM: current target isn't an ARM");
+ command_print(
CMD_CTX
, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
etm_ctx = arm->etm;
if (!etm_ctx)
{
return ERROR_FAIL;
}
etm_ctx = arm->etm;
if (!etm_ctx)
{
- command_print(
cmd_ctx
, "current target doesn't have an ETM configured");
+ command_print(
CMD_CTX
, "current target doesn't have an ETM configured");
return ERROR_FAIL;
}
if (etm_ctx->capture_driver->status == TRACE_IDLE)
{
return ERROR_FAIL;
}
if (etm_ctx->capture_driver->status == TRACE_IDLE)
{
- command_print(
cmd_ctx
, "trace capture wasn't enabled, no trace data captured");
+ command_print(
CMD_CTX
, "trace capture wasn't enabled, no trace data captured");
return ERROR_OK;
}
if (etm_ctx->capture_driver->status(etm_ctx) & TRACE_RUNNING)
{
/* TODO: if on-the-fly capture is to be supported, this needs to be changed */
return ERROR_OK;
}
if (etm_ctx->capture_driver->status(etm_ctx) & TRACE_RUNNING)
{
/* TODO: if on-the-fly capture is to be supported, this needs to be changed */
- command_print(
cmd_ctx
, "trace capture not completed");
+ command_print(
CMD_CTX
, "trace capture not completed");
return ERROR_FAIL;
}
return ERROR_FAIL;
}
@@
-1832,7
+1818,7
@@
COMMAND_HANDLER(handle_etm_dump_command)
if (etm_ctx->trace_depth == 0)
etm_ctx->capture_driver->read_trace(etm_ctx);
if (etm_ctx->trace_depth == 0)
etm_ctx->capture_driver->read_trace(etm_ctx);
- if (fileio_open(&file,
args
[0], FILEIO_WRITE, FILEIO_BINARY) != ERROR_OK)
+ if (fileio_open(&file,
CMD_ARGV
[0], FILEIO_WRITE, FILEIO_BINARY) != ERROR_OK)
{
return ERROR_FAIL;
}
{
return ERROR_FAIL;
}
@@
-1857,46
+1843,46
@@
COMMAND_HANDLER(handle_etm_dump_command)
COMMAND_HANDLER(handle_etm_load_command)
{
struct fileio file;
COMMAND_HANDLER(handle_etm_load_command)
{
struct fileio file;
-
target_
t *target;
+
struct targe
t *target;
struct arm *arm;
struct arm *arm;
-
etm_context_
t *etm_ctx;
+
struct etm_contex
t *etm_ctx;
uint32_t i;
uint32_t i;
- if (
argc
!= 1)
+ if (
CMD_ARGC
!= 1)
{
{
- command_print(
cmd_ctx
, "usage: etm load <file>");
+ command_print(
CMD_CTX
, "usage: etm load <file>");
return ERROR_FAIL;
}
return ERROR_FAIL;
}
- target = get_current_target(
cmd_ctx
);
+ target = get_current_target(
CMD_CTX
);
arm = target_to_arm(target);
if (!is_arm(arm))
{
arm = target_to_arm(target);
if (!is_arm(arm))
{
- command_print(
cmd_ctx
, "ETM: current target isn't an ARM");
+ command_print(
CMD_CTX
, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
etm_ctx = arm->etm;
if (!etm_ctx)
{
return ERROR_FAIL;
}
etm_ctx = arm->etm;
if (!etm_ctx)
{
- command_print(
cmd_ctx
, "current target doesn't have an ETM configured");
+ command_print(
CMD_CTX
, "current target doesn't have an ETM configured");
return ERROR_FAIL;
}
if (etm_ctx->capture_driver->status(etm_ctx) & TRACE_RUNNING)
{
return ERROR_FAIL;
}
if (etm_ctx->capture_driver->status(etm_ctx) & TRACE_RUNNING)
{
- command_print(
cmd_ctx
, "trace capture running, stop first");
+ command_print(
CMD_CTX
, "trace capture running, stop first");
return ERROR_FAIL;
}
return ERROR_FAIL;
}
- if (fileio_open(&file,
args
[0], FILEIO_READ, FILEIO_BINARY) != ERROR_OK)
+ if (fileio_open(&file,
CMD_ARGV
[0], FILEIO_READ, FILEIO_BINARY) != ERROR_OK)
{
return ERROR_FAIL;
}
if (file.size % 4)
{
{
return ERROR_FAIL;
}
if (file.size % 4)
{
- command_print(
cmd_ctx
, "size isn't a multiple of 4, no valid trace data");
+ command_print(
CMD_CTX
, "size isn't a multiple of 4, no valid trace data");
fileio_close(&file);
return ERROR_FAIL;
}
fileio_close(&file);
return ERROR_FAIL;
}
@@
-1914,10
+1900,10
@@
COMMAND_HANDLER(handle_etm_load_command)
fileio_read_u32(&file, &tmp); etm_ctx->tracemode = tmp;
fileio_read_u32(&file, &etm_ctx->trace_depth);
}
fileio_read_u32(&file, &tmp); etm_ctx->tracemode = tmp;
fileio_read_u32(&file, &etm_ctx->trace_depth);
}
- etm_ctx->trace_data = malloc(sizeof(
etmv1_trace_data_t
) * etm_ctx->trace_depth);
+ etm_ctx->trace_data = malloc(sizeof(
struct etmv1_trace_data
) * etm_ctx->trace_depth);
if (etm_ctx->trace_data == NULL)
{
if (etm_ctx->trace_data == NULL)
{
- command_print(
cmd_ctx
, "not enough memory to perform operation");
+ command_print(
CMD_CTX
, "not enough memory to perform operation");
fileio_close(&file);
return ERROR_FAIL;
}
fileio_close(&file);
return ERROR_FAIL;
}
@@
-1940,33
+1926,33
@@
COMMAND_HANDLER(handle_etm_load_command)
COMMAND_HANDLER(handle_etm_trigger_percent_command)
{
COMMAND_HANDLER(handle_etm_trigger_percent_command)
{
-
target_
t *target;
+
struct targe
t *target;
struct arm *arm;
struct arm *arm;
-
etm_context_
t *etm_ctx;
+
struct etm_contex
t *etm_ctx;
- target = get_current_target(
cmd_ctx
);
+ target = get_current_target(
CMD_CTX
);
arm = target_to_arm(target);
if (!is_arm(arm))
{
arm = target_to_arm(target);
if (!is_arm(arm))
{
- command_print(
cmd_ctx
, "ETM: current target isn't an ARM");
+ command_print(
CMD_CTX
, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
etm_ctx = arm->etm;
if (!etm_ctx)
{
return ERROR_FAIL;
}
etm_ctx = arm->etm;
if (!etm_ctx)
{
- command_print(
cmd_ctx
, "current target doesn't have an ETM configured");
+ command_print(
CMD_CTX
, "current target doesn't have an ETM configured");
return ERROR_FAIL;
}
return ERROR_FAIL;
}
- if (
argc
> 0)
+ if (
CMD_ARGC
> 0)
{
uint32_t new_value;
{
uint32_t new_value;
- COMMAND_PARSE_NUMBER(u32,
args
[0], new_value);
+ COMMAND_PARSE_NUMBER(u32,
CMD_ARGV
[0], new_value);
if ((new_value < 2) || (new_value > 100))
{
if ((new_value < 2) || (new_value > 100))
{
- command_print(
cmd_ctx
, "valid settings are 2%% to 100%%");
+ command_print(
CMD_CTX
, "valid settings are 2%% to 100%%");
}
else
{
}
else
{
@@
-1974,30
+1960,30
@@
COMMAND_HANDLER(handle_etm_trigger_percent_command)
}
}
}
}
- command_print(
cmd_ctx
, "%i percent of the tracebuffer reserved for after the trigger", ((int)(etm_ctx->trigger_percent)));
+ command_print(
CMD_CTX
, "%i percent of the tracebuffer reserved for after the trigger", ((int)(etm_ctx->trigger_percent)));
return ERROR_OK;
}
COMMAND_HANDLER(handle_etm_start_command)
{
return ERROR_OK;
}
COMMAND_HANDLER(handle_etm_start_command)
{
-
target_
t *target;
+
struct targe
t *target;
struct arm *arm;
struct arm *arm;
-
etm_context_
t *etm_ctx;
-
reg_t
*etm_ctrl_reg;
+
struct etm_contex
t *etm_ctx;
+
struct reg
*etm_ctrl_reg;
- target = get_current_target(
cmd_ctx
);
+ target = get_current_target(
CMD_CTX
);
arm = target_to_arm(target);
if (!is_arm(arm))
{
arm = target_to_arm(target);
if (!is_arm(arm))
{
- command_print(
cmd_ctx
, "ETM: current target isn't an ARM");
+ command_print(
CMD_CTX
, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
etm_ctx = arm->etm;
if (!etm_ctx)
{
return ERROR_FAIL;
}
etm_ctx = arm->etm;
if (!etm_ctx)
{
- command_print(
cmd_ctx
, "current target doesn't have an ETM configured");
+ command_print(
CMD_CTX
, "current target doesn't have an ETM configured");
return ERROR_FAIL;
}
return ERROR_FAIL;
}
@@
-2029,23
+2015,23
@@
COMMAND_HANDLER(handle_etm_start_command)
COMMAND_HANDLER(handle_etm_stop_command)
{
COMMAND_HANDLER(handle_etm_stop_command)
{
-
target_
t *target;
+
struct targe
t *target;
struct arm *arm;
struct arm *arm;
-
etm_context_
t *etm_ctx;
-
reg_t
*etm_ctrl_reg;
+
struct etm_contex
t *etm_ctx;
+
struct reg
*etm_ctrl_reg;
- target = get_current_target(
cmd_ctx
);
+ target = get_current_target(
CMD_CTX
);
arm = target_to_arm(target);
if (!is_arm(arm))
{
arm = target_to_arm(target);
if (!is_arm(arm))
{
- command_print(
cmd_ctx
, "ETM: current target isn't an ARM");
+ command_print(
CMD_CTX
, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
etm_ctx = arm->etm;
if (!etm_ctx)
{
return ERROR_FAIL;
}
etm_ctx = arm->etm;
if (!etm_ctx)
{
- command_print(
cmd_ctx
, "current target doesn't have an ETM configured");
+ command_print(
CMD_CTX
, "current target doesn't have an ETM configured");
return ERROR_FAIL;
}
return ERROR_FAIL;
}
@@
-2068,85
+2054,85
@@
COMMAND_HANDLER(handle_etm_stop_command)
COMMAND_HANDLER(handle_etm_analyze_command)
{
COMMAND_HANDLER(handle_etm_analyze_command)
{
-
target_
t *target;
+
struct targe
t *target;
struct arm *arm;
struct arm *arm;
-
etm_context_
t *etm_ctx;
+
struct etm_contex
t *etm_ctx;
int retval;
int retval;
- target = get_current_target(
cmd_ctx
);
+ target = get_current_target(
CMD_CTX
);
arm = target_to_arm(target);
if (!is_arm(arm))
{
arm = target_to_arm(target);
if (!is_arm(arm))
{
- command_print(
cmd_ctx
, "ETM: current target isn't an ARM");
+ command_print(
CMD_CTX
, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
etm_ctx = arm->etm;
if (!etm_ctx)
{
return ERROR_FAIL;
}
etm_ctx = arm->etm;
if (!etm_ctx)
{
- command_print(
cmd_ctx
, "current target doesn't have an ETM configured");
+ command_print(
CMD_CTX
, "current target doesn't have an ETM configured");
return ERROR_FAIL;
}
return ERROR_FAIL;
}
- if ((retval = etmv1_analyze_trace(etm_ctx,
cmd_ctx
)) != ERROR_OK)
+ if ((retval = etmv1_analyze_trace(etm_ctx,
CMD_CTX
)) != ERROR_OK)
{
switch (retval)
{
case ERROR_ETM_ANALYSIS_FAILED:
{
switch (retval)
{
case ERROR_ETM_ANALYSIS_FAILED:
- command_print(
cmd_ctx
, "further analysis failed (corrupted trace data or just end of data");
+ command_print(
CMD_CTX
, "further analysis failed (corrupted trace data or just end of data");
break;
case ERROR_TRACE_INSTRUCTION_UNAVAILABLE:
break;
case ERROR_TRACE_INSTRUCTION_UNAVAILABLE:
- command_print(
cmd_ctx
, "no instruction for current address available, analysis aborted");
+ command_print(
CMD_CTX
, "no instruction for current address available, analysis aborted");
break;
case ERROR_TRACE_IMAGE_UNAVAILABLE:
break;
case ERROR_TRACE_IMAGE_UNAVAILABLE:
- command_print(
cmd_ctx
, "no image available for trace analysis");
+ command_print(
CMD_CTX
, "no image available for trace analysis");
break;
default:
break;
default:
- command_print(
cmd_ctx
, "unknown error: %i", retval);
+ command_print(
CMD_CTX
, "unknown error: %i", retval);
}
}
return retval;
}
}
}
return retval;
}
-int etm_register_commands(struct command_context
_s
*cmd_ctx)
+int etm_register_commands(struct command_context *cmd_ctx)
{
{
- etm_cmd =
register_command
(cmd_ctx, NULL, "etm", NULL, COMMAND_ANY, "Embedded Trace Macrocell");
+ etm_cmd =
COMMAND_REGISTER
(cmd_ctx, NULL, "etm", NULL, COMMAND_ANY, "Embedded Trace Macrocell");
-
register_command
(cmd_ctx, etm_cmd, "config", handle_etm_config_command,
+
COMMAND_REGISTER
(cmd_ctx, etm_cmd, "config", handle_etm_config_command,
COMMAND_CONFIG, "etm config <target> <port_width> <port_mode> <clocking> <capture_driver>");
return ERROR_OK;
}
COMMAND_CONFIG, "etm config <target> <port_width> <port_mode> <clocking> <capture_driver>");
return ERROR_OK;
}
-static int etm_register_user_commands(struct command_context
_s
*cmd_ctx)
+static int etm_register_user_commands(struct command_context *cmd_ctx)
{
{
-
register_command
(cmd_ctx, etm_cmd, "tracemode", handle_etm_tracemode_command,
+
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_EXEC, "configure/display trace mode: "
"<none | data | address | all> "
"<context_id_bits> <cycle_accurate> <branch_output>");
-
register_command
(cmd_ctx, etm_cmd, "info", handle_etm_info_command,
+
COMMAND_REGISTER
(cmd_ctx, etm_cmd, "info", handle_etm_info_command,
COMMAND_EXEC, "display info about the current target's ETM");
COMMAND_EXEC, "display info about the current target's ETM");
-
register_command
(cmd_ctx, etm_cmd, "trigger_percent", handle_etm_trigger_percent_command,
+
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_EXEC, "amount (<percent>) of trace buffer to be filled after the trigger occured");
-
register_command
(cmd_ctx, etm_cmd, "status", handle_etm_status_command,
+
COMMAND_REGISTER
(cmd_ctx, etm_cmd, "status", handle_etm_status_command,
COMMAND_EXEC, "display current target's ETM status");
COMMAND_EXEC, "display current target's ETM status");
-
register_command
(cmd_ctx, etm_cmd, "start", handle_etm_start_command,
+
COMMAND_REGISTER
(cmd_ctx, etm_cmd, "start", handle_etm_start_command,
COMMAND_EXEC, "start ETM trace collection");
COMMAND_EXEC, "start ETM trace collection");
-
register_command
(cmd_ctx, etm_cmd, "stop", handle_etm_stop_command,
+
COMMAND_REGISTER
(cmd_ctx, etm_cmd, "stop", handle_etm_stop_command,
COMMAND_EXEC, "stop ETM trace collection");
COMMAND_EXEC, "stop ETM trace collection");
-
register_command
(cmd_ctx, etm_cmd, "analyze", handle_etm_analyze_command,
+
COMMAND_REGISTER
(cmd_ctx, etm_cmd, "analyze", handle_etm_analyze_command,
COMMAND_EXEC, "anaylze collected ETM trace");
COMMAND_EXEC, "anaylze collected ETM trace");
-
register_command
(cmd_ctx, etm_cmd, "image", handle_etm_image_command,
+
COMMAND_REGISTER
(cmd_ctx, etm_cmd, "image", handle_etm_image_command,
COMMAND_EXEC, "load image from <file> [base address]");
COMMAND_EXEC, "load image from <file> [base address]");
-
register_command
(cmd_ctx, etm_cmd, "dump", handle_etm_dump_command,
+
COMMAND_REGISTER
(cmd_ctx, etm_cmd, "dump", handle_etm_dump_command,
COMMAND_EXEC, "dump captured trace data <file>");
COMMAND_EXEC, "dump captured trace data <file>");
-
register_command
(cmd_ctx, etm_cmd, "load", handle_etm_load_command,
+
COMMAND_REGISTER
(cmd_ctx, etm_cmd, "load", handle_etm_load_command,
COMMAND_EXEC, "load trace data for analysis <file>");
return ERROR_OK;
COMMAND_EXEC, "load trace data for analysis <file>");
return ERROR_OK;