X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fetm.c;h=6a00c23a8b5600674ec85988272188bcdc5aea8c;hp=c71c5d199fabbf1827b465e4267c14c0d55db835;hb=a851b91c4c1db76dd1e26a7d1a99124ad456b020;hpb=3a693ef526575633cc350a69aa1a5d1f08e64c46
diff --git a/src/target/etm.c b/src/target/etm.c
index c71c5d199f..6a00c23a8b 100644
--- a/src/target/etm.c
+++ b/src/target/etm.c
@@ -13,9 +13,7 @@
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
- * along with this program; if not, write to the *
- * Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * along with this program. If not, see . *
***************************************************************************/
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -63,11 +61,11 @@ enum {
};
struct etm_reg_info {
- uint8_t addr;
- uint8_t size; /* low-N of 32 bits */
- uint8_t mode; /* RO, WO, RW */
- uint8_t bcd_vers; /* 1.0, 2.0, etc */
- char *name;
+ uint8_t addr;
+ uint8_t size; /* low-N of 32 bits */
+ uint8_t mode; /* RO, WO, RW */
+ uint8_t bcd_vers; /* 1.0, 2.0, etc */
+ const char *name;
};
/*
@@ -144,6 +142,7 @@ static const struct etm_reg_info etm_addr_comp[] = {
ADDR_COMPARATOR(14),
ADDR_COMPARATOR(15),
ADDR_COMPARATOR(16),
+ { 0, 0, 0, 0, NULL }
#undef ADDR_COMPARATOR
};
@@ -162,6 +161,7 @@ static const struct etm_reg_info etm_data_comp[] = {
DATA_COMPARATOR(6),
DATA_COMPARATOR(7),
DATA_COMPARATOR(8),
+ { 0, 0, 0, 0, NULL }
#undef DATA_COMPARATOR
};
@@ -179,6 +179,7 @@ static const struct etm_reg_info etm_counters[] = {
ETM_COUNTER(2),
ETM_COUNTER(3),
ETM_COUNTER(4),
+ { 0, 0, 0, 0, NULL }
#undef ETM_COUNTER
};
@@ -206,6 +207,7 @@ static const struct etm_reg_info etm_outputs[] = {
ETM_OUTPUT(2),
ETM_OUTPUT(3),
ETM_OUTPUT(4),
+ { 0, 0, 0, 0, NULL }
#undef ETM_OUTPUT
};
@@ -221,7 +223,7 @@ static const struct etm_reg_info etm_outputs[] = {
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 *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);
@@ -246,15 +248,15 @@ static struct reg *etm_reg_lookup(struct etm_context *etm_ctx, unsigned id)
return &cache->reg_list[i];
}
- /* caller asking for nonexistent register is a bug! */
- /* REVISIT say which of the N targets was involved */
+ /* caller asking for nonexistent register is a bug!
+ * REVISIT say which of the N targets was involved */
LOG_ERROR("ETM: register 0x%02x not available", id);
return NULL;
}
static void etm_reg_add(unsigned bcd_vers, struct arm_jtag *jtag_info,
- struct reg_cache *cache, struct etm_reg *ereg,
- const struct etm_reg_info *r, unsigned nreg)
+ struct reg_cache *cache, struct etm_reg *ereg,
+ const struct etm_reg_info *r, unsigned nreg)
{
struct reg *reg = cache->reg_list;
@@ -265,6 +267,11 @@ static void etm_reg_add(unsigned bcd_vers, struct arm_jtag *jtag_info,
* version of the ETM, to the specified cache.
*/
for (; nreg--; r++) {
+ /* No more registers to add */
+ if (!r->size) {
+ LOG_ERROR("etm_reg_add is requested to add non-existing registers, ETM config might be bogus");
+ return;
+ }
/* this ETM may be too old to have some registers */
if (r->bcd_vers > bcd_vers)
@@ -285,7 +292,7 @@ static void etm_reg_add(unsigned bcd_vers, struct arm_jtag *jtag_info,
}
struct reg_cache *etm_build_reg_cache(struct target *target,
- struct arm_jtag *jtag_info, struct etm_context *etm_ctx)
+ struct arm_jtag *jtag_info, struct etm_context *etm_ctx)
{
struct reg_cache *reg_cache = malloc(sizeof(struct reg_cache));
struct reg *reg_list = NULL;
@@ -306,15 +313,14 @@ struct reg_cache *etm_build_reg_cache(struct target *target,
* which other registers exist in this ETM
*/
etm_reg_add(0x10, jtag_info, reg_cache, arch_info,
- etm_core, 1);
+ etm_core, 1);
etm_get_reg(reg_list);
- etm_ctx->config = buf_get_u32((void *)&arch_info->value, 0, 32);
+ etm_ctx->config = buf_get_u32(arch_info->value, 0, 32);
config = etm_ctx->config;
/* figure ETM version then add base registers */
if (config & (1 << 31)) {
- bcd_vers = 0x20;
LOG_WARNING("ETMv2+ support is incomplete");
/* REVISIT more registers may exist; they may now be
@@ -323,50 +329,50 @@ struct reg_cache *etm_build_reg_cache(struct target *target,
* and include any context ID comparator registers.
*/
etm_reg_add(0x20, jtag_info, reg_cache, arch_info,
- etm_core + 1, 1);
+ etm_core + 1, 1);
etm_get_reg(reg_list + 1);
etm_ctx->id = buf_get_u32(
- (void *)&arch_info[1].value, 0, 32);
+ arch_info[1].value, 0, 32);
LOG_DEBUG("ETM ID: %08x", (unsigned) etm_ctx->id);
bcd_vers = 0x10 + (((etm_ctx->id) >> 4) & 0xff);
} else {
switch (config >> 28) {
- case 7:
- case 5:
- case 3:
- bcd_vers = 0x13;
- break;
- case 4:
- case 2:
- bcd_vers = 0x12;
- break;
- case 1:
- bcd_vers = 0x11;
- break;
- case 0:
- bcd_vers = 0x10;
- break;
- default:
- LOG_WARNING("Bad ETMv1 protocol %d", config >> 28);
- goto fail;
+ case 7:
+ case 5:
+ case 3:
+ bcd_vers = 0x13;
+ break;
+ case 4:
+ case 2:
+ bcd_vers = 0x12;
+ break;
+ case 1:
+ bcd_vers = 0x11;
+ break;
+ case 0:
+ bcd_vers = 0x10;
+ break;
+ default:
+ LOG_WARNING("Bad ETMv1 protocol %d", config >> 28);
+ goto fail;
}
}
etm_ctx->bcd_vers = bcd_vers;
LOG_INFO("ETM v%d.%d", bcd_vers >> 4, bcd_vers & 0xf);
etm_reg_add(bcd_vers, jtag_info, reg_cache, arch_info,
- etm_basic, ARRAY_SIZE(etm_basic));
+ etm_basic, ARRAY_SIZE(etm_basic));
/* address and data comparators; counters; outputs */
etm_reg_add(bcd_vers, jtag_info, reg_cache, arch_info,
- etm_addr_comp, 4 * (0x0f & (config >> 0)));
+ etm_addr_comp, 4 * (0x0f & (config >> 0)));
etm_reg_add(bcd_vers, jtag_info, reg_cache, arch_info,
- etm_data_comp, 2 * (0x0f & (config >> 4)));
+ etm_data_comp, 2 * (0x0f & (config >> 4)));
etm_reg_add(bcd_vers, jtag_info, reg_cache, arch_info,
- etm_counters, 4 * (0x07 & (config >> 13)));
+ etm_counters, 4 * (0x07 & (config >> 13)));
etm_reg_add(bcd_vers, jtag_info, reg_cache, arch_info,
- etm_outputs, (0x07 & (config >> 20)));
+ etm_outputs, (0x07 & (config >> 20)));
/* FIFOFULL presence is optional
* REVISIT for ETMv1.2 and later, don't bother adding this
@@ -374,24 +380,22 @@ struct reg_cache *etm_build_reg_cache(struct target *target,
*/
if (config & (1 << 23))
etm_reg_add(bcd_vers, jtag_info, reg_cache, arch_info,
- etm_fifofull, ARRAY_SIZE(etm_fifofull));
+ etm_fifofull, ARRAY_SIZE(etm_fifofull));
/* sequencer is optional (for state-dependant triggering) */
if (config & (1 << 16))
etm_reg_add(bcd_vers, jtag_info, reg_cache, arch_info,
- etm_sequencer, ARRAY_SIZE(etm_sequencer));
+ etm_sequencer, ARRAY_SIZE(etm_sequencer));
/* REVISIT could realloc and likely save half the memory
* in the two chunks we allocated...
*/
/* the ETM might have an ETB connected */
- if (strcmp(etm_ctx->capture_driver->name, "etb") == 0)
- {
+ if (strcmp(etm_ctx->capture_driver->name, "etb") == 0) {
struct etb *etb = etm_ctx->capture_driver_priv;
- if (!etb)
- {
+ if (!etb) {
LOG_ERROR("etb selected as etm capture driver, but no ETB configured");
goto fail;
}
@@ -444,10 +448,10 @@ int etm_setup(struct target *target)
* for older modules clocking (13)
*/
etm_ctrl_value = (etm_ctrl_value
- & ~ETM_PORT_WIDTH_MASK
- & ~ETM_PORT_MODE_MASK
- & ~ETM_CTRL_DBGRQ
- & ~ETM_PORT_CLOCK_MASK)
+ & ~ETM_PORT_WIDTH_MASK
+ & ~ETM_PORT_MODE_MASK
+ & ~ETM_CTRL_DBGRQ
+ & ~ETM_PORT_CLOCK_MASK)
| etm_ctx->control;
buf_set_u32(etm_ctrl_reg->value, 0, 32, etm_ctrl_value);
@@ -455,15 +459,16 @@ int etm_setup(struct target *target)
etm_ctx->control = etm_ctrl_value;
- if ((retval = jtag_execute_queue()) != ERROR_OK)
+ retval = jtag_execute_queue();
+ if (retval != ERROR_OK)
return retval;
/* REVISIT for ETMv3.0 and later, read ETM_sys_config to
* verify that those width and mode settings are OK ...
*/
- if ((retval = etm_ctx->capture_driver->init(etm_ctx)) != ERROR_OK)
- {
+ retval = etm_ctx->capture_driver->init(etm_ctx);
+ if (retval != ERROR_OK) {
LOG_ERROR("ETM capture driver initialization failed");
return retval;
}
@@ -474,14 +479,14 @@ static int etm_get_reg(struct reg *reg)
{
int retval;
- if ((retval = etm_read_reg(reg)) != ERROR_OK)
- {
+ retval = etm_read_reg(reg);
+ if (retval != ERROR_OK) {
LOG_ERROR("BUG: error scheduling etm register read");
return retval;
}
- if ((retval = jtag_execute_queue()) != ERROR_OK)
- {
+ retval = jtag_execute_queue();
+ if (retval != ERROR_OK) {
LOG_ERROR("register read failed");
return retval;
}
@@ -490,7 +495,7 @@ 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)
{
struct etm_reg *etm_reg = reg->arch_info;
const struct etm_reg_info *r = etm_reg->reg_info;
@@ -500,7 +505,7 @@ static int etm_read_reg_w_check(struct reg *reg,
if (etm_reg->reg_info->mode == WO) {
LOG_ERROR("BUG: can't read write-only register %s", r->name);
- return ERROR_INVALID_ARGUMENTS;
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
LOG_DEBUG("%s (%u)", r->name, reg_addr);
@@ -508,7 +513,10 @@ static int etm_read_reg_w_check(struct reg *reg,
retval = arm_jtag_scann(etm_reg->jtag_info, 0x6, TAP_IDLE);
if (retval != ERROR_OK)
return retval;
- retval = arm_jtag_set_instr(etm_reg->jtag_info, etm_reg->jtag_info->intest_instr, NULL, TAP_IDLE);
+ retval = arm_jtag_set_instr(etm_reg->jtag_info->tap,
+ etm_reg->jtag_info->intest_instr,
+ NULL,
+ TAP_IDLE);
if (retval != ERROR_OK)
return retval;
@@ -547,10 +555,8 @@ static int etm_read_reg_w_check(struct reg *reg,
static int etm_set_reg(struct reg *reg, uint32_t value)
{
- int retval;
-
- if ((retval = etm_write_reg(reg, value)) != ERROR_OK)
- {
+ int retval = etm_write_reg(reg, value);
+ if (retval != ERROR_OK) {
LOG_ERROR("BUG: error scheduling etm register write");
return retval;
}
@@ -568,8 +574,8 @@ static int etm_set_reg_w_exec(struct reg *reg, uint8_t *buf)
etm_set_reg(reg, buf_get_u32(buf, 0, reg->size));
- if ((retval = jtag_execute_queue()) != ERROR_OK)
- {
+ retval = jtag_execute_queue();
+ if (retval != ERROR_OK) {
LOG_ERROR("register write failed");
return retval;
}
@@ -586,7 +592,7 @@ static int etm_write_reg(struct reg *reg, uint32_t value)
if (etm_reg->reg_info->mode == RO) {
LOG_ERROR("BUG: can't write read--only register %s", r->name);
- return ERROR_INVALID_ARGUMENTS;
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
LOG_DEBUG("%s (%u): 0x%8.8" PRIx32 "", r->name, reg_addr, value);
@@ -594,7 +600,10 @@ static int etm_write_reg(struct reg *reg, uint32_t value)
retval = arm_jtag_scann(etm_reg->jtag_info, 0x6, TAP_IDLE);
if (retval != ERROR_OK)
return retval;
- retval = arm_jtag_set_instr(etm_reg->jtag_info, etm_reg->jtag_info->intest_instr, NULL, TAP_IDLE);
+ retval = arm_jtag_set_instr(etm_reg->jtag_info->tap,
+ etm_reg->jtag_info->intest_instr,
+ NULL,
+ TAP_IDLE);
if (retval != ERROR_OK)
return retval;
@@ -624,8 +633,7 @@ static int etm_write_reg(struct reg *reg, uint32_t value)
/* ETM trace analysis functionality */
-static struct etm_capture_driver *etm_capture_drivers[] =
-{
+static struct etm_capture_driver *etm_capture_drivers[] = {
&etb_capture_driver,
&etm_dummy_capture_driver,
#if BUILD_OOCD_TRACE == 1
@@ -646,55 +654,48 @@ static int etm_read_instruction(struct etm_context *ctx, struct arm_instruction
return ERROR_TRACE_IMAGE_UNAVAILABLE;
/* search for the section the current instruction belongs to */
- for (i = 0; i < ctx->image->num_sections; i++)
- {
+ for (i = 0; i < ctx->image->num_sections; i++) {
if ((ctx->image->sections[i].base_address <= ctx->current_pc) &&
- (ctx->image->sections[i].base_address + ctx->image->sections[i].size > ctx->current_pc))
- {
+ (ctx->image->sections[i].base_address + ctx->image->sections[i].size >
+ ctx->current_pc)) {
section = i;
break;
}
}
- if (section == -1)
- {
+ if (section == -1) {
/* current instruction couldn't be found in the image */
return ERROR_TRACE_INSTRUCTION_UNAVAILABLE;
}
- if (ctx->core_state == ARM_STATE_ARM)
- {
+ if (ctx->core_state == ARM_STATE_ARM) {
uint8_t buf[4];
- if ((retval = image_read_section(ctx->image, section,
- ctx->current_pc - ctx->image->sections[section].base_address,
- 4, buf, &size_read)) != ERROR_OK)
- {
- LOG_ERROR("error while reading instruction: %i", retval);
+ retval = image_read_section(ctx->image, section,
+ ctx->current_pc -
+ ctx->image->sections[section].base_address,
+ 4, buf, &size_read);
+ if (retval != ERROR_OK) {
+ LOG_ERROR("error while reading instruction");
return ERROR_TRACE_INSTRUCTION_UNAVAILABLE;
}
opcode = target_buffer_get_u32(ctx->target, buf);
arm_evaluate_opcode(opcode, ctx->current_pc, instruction);
- }
- else if (ctx->core_state == ARM_STATE_THUMB)
- {
+ } else if (ctx->core_state == ARM_STATE_THUMB) {
uint8_t buf[2];
- if ((retval = image_read_section(ctx->image, section,
- ctx->current_pc - ctx->image->sections[section].base_address,
- 2, buf, &size_read)) != ERROR_OK)
- {
- LOG_ERROR("error while reading instruction: %i", retval);
+ retval = image_read_section(ctx->image, section,
+ ctx->current_pc -
+ ctx->image->sections[section].base_address,
+ 2, buf, &size_read);
+ if (retval != ERROR_OK) {
+ LOG_ERROR("error while reading instruction");
return ERROR_TRACE_INSTRUCTION_UNAVAILABLE;
}
opcode = target_buffer_get_u16(ctx->target, buf);
thumb_evaluate_opcode(opcode, ctx->current_pc, instruction);
- }
- else if (ctx->core_state == ARM_STATE_JAZELLE)
- {
+ } else if (ctx->core_state == ARM_STATE_JAZELLE) {
LOG_ERROR("BUG: tracing of jazelle code not supported");
return ERROR_FAIL;
- }
- else
- {
+ } else {
LOG_ERROR("BUG: unknown core state encountered");
return ERROR_FAIL;
}
@@ -704,17 +705,14 @@ static int etm_read_instruction(struct etm_context *ctx, struct arm_instruction
static int etmv1_next_packet(struct etm_context *ctx, uint8_t *packet, int apo)
{
- while (ctx->data_index < ctx->trace_depth)
- {
+ while (ctx->data_index < ctx->trace_depth) {
/* if the caller specified an address packet offset, skip until the
* we reach the n-th cycle marked with tracesync */
- if (apo > 0)
- {
+ if (apo > 0) {
if (ctx->trace_data[ctx->data_index].flags & ETMV1_TRACESYNC_CYCLE)
apo--;
- if (apo > 0)
- {
+ if (apo > 0) {
ctx->data_index++;
ctx->data_half = 0;
}
@@ -724,35 +722,26 @@ static int etmv1_next_packet(struct etm_context *ctx, uint8_t *packet, int apo)
/* no tracedata output during a TD cycle
* or in a trigger cycle */
if ((ctx->trace_data[ctx->data_index].pipestat == STAT_TD)
- || (ctx->trace_data[ctx->data_index].flags & ETMV1_TRIGGER_CYCLE))
- {
+ || (ctx->trace_data[ctx->data_index].flags & ETMV1_TRIGGER_CYCLE)) {
ctx->data_index++;
ctx->data_half = 0;
continue;
}
/* FIXME there are more port widths than these... */
- if ((ctx->control & ETM_PORT_WIDTH_MASK) == ETM_PORT_16BIT)
- {
- if (ctx->data_half == 0)
- {
+ if ((ctx->control & ETM_PORT_WIDTH_MASK) == ETM_PORT_16BIT) {
+ if (ctx->data_half == 0) {
*packet = ctx->trace_data[ctx->data_index].packet & 0xff;
ctx->data_half = 1;
- }
- else
- {
+ } else {
*packet = (ctx->trace_data[ctx->data_index].packet & 0xff00) >> 8;
ctx->data_half = 0;
ctx->data_index++;
}
- }
- else if ((ctx->control & ETM_PORT_WIDTH_MASK) == ETM_PORT_8BIT)
- {
+ } else if ((ctx->control & ETM_PORT_WIDTH_MASK) == ETM_PORT_8BIT) {
*packet = ctx->trace_data[ctx->data_index].packet & 0xff;
ctx->data_index++;
- }
- else
- {
+ } else {
/* on a 4-bit port, a packet will be output during two consecutive cycles */
if (ctx->data_index > (ctx->trace_depth - 2))
return -1;
@@ -795,15 +784,15 @@ static int etmv1_branch_address(struct etm_context *ctx)
/* count number of tracesync cycles between current pipe_index and data_index
* i.e. the number of tracesyncs that data_index already passed by
* to subtract them from the APO */
- for (i = ctx->pipe_index; i < ctx->data_index; i++)
- {
+ for (i = ctx->pipe_index; i < ctx->data_index; i++) {
if (ctx->trace_data[ctx->pipe_index + 1].pipestat & ETMV1_TRACESYNC_CYCLE)
apo--;
}
/* extract up to four 7-bit packets */
do {
- if ((retval = etmv1_next_packet(ctx, &packet, (shift == 0) ? apo + 1 : 0)) != 0)
+ retval = etmv1_next_packet(ctx, &packet, (shift == 0) ? apo + 1 : 0);
+ if (retval != 0)
return -1;
ctx->last_branch &= ~(0x7f << shift);
ctx->last_branch |= (packet & 0x7f) << shift;
@@ -811,41 +800,30 @@ static int etmv1_branch_address(struct etm_context *ctx)
} while ((packet & 0x80) && (shift < 28));
/* one last packet holding 4 bits of the address, plus the branch reason code */
- if ((shift == 28) && (packet & 0x80))
- {
- if ((retval = etmv1_next_packet(ctx, &packet, 0)) != 0)
+ if ((shift == 28) && (packet & 0x80)) {
+ retval = etmv1_next_packet(ctx, &packet, 0);
+ if (retval != 0)
return -1;
ctx->last_branch &= 0x0fffffff;
ctx->last_branch |= (packet & 0x0f) << 28;
ctx->last_branch_reason = (packet & 0x70) >> 4;
shift += 4;
- }
- else
- {
+ } else
ctx->last_branch_reason = 0;
- }
if (shift == 32)
- {
ctx->pc_ok = 1;
- }
/* if a full address was output, we might have branched into Jazelle state */
if ((shift == 32) && (packet & 0x80))
- {
ctx->core_state = ARM_STATE_JAZELLE;
- }
- else
- {
+ else {
/* if we didn't branch into Jazelle state, the current processor state is
* encoded in bit 0 of the branch target address */
- if (ctx->last_branch & 0x1)
- {
+ if (ctx->last_branch & 0x1) {
ctx->core_state = ARM_STATE_THUMB;
ctx->last_branch &= ~0x1;
- }
- else
- {
+ } else {
ctx->core_state = ARM_STATE_ARM;
ctx->last_branch &= ~0x3;
}
@@ -860,18 +838,16 @@ static int etmv1_data(struct etm_context *ctx, int size, uint32_t *data)
uint8_t buf[4];
int retval;
- for (j = 0; j < size; j++)
- {
- if ((retval = etmv1_next_packet(ctx, &buf[j], 0)) != 0)
+ for (j = 0; j < size; j++) {
+ retval = etmv1_next_packet(ctx, &buf[j], 0);
+ if (retval != 0)
return -1;
}
- if (size == 8)
- {
+ if (size == 8) {
LOG_ERROR("TODO: add support for 64-bit values");
return -1;
- }
- else if (size == 4)
+ } else if (size == 4)
*data = target_buffer_get_u32(ctx->target, buf);
else if (size == 2)
*data = target_buffer_get_u16(ctx->target, buf);
@@ -906,8 +882,7 @@ static int etmv1_analyze_trace(struct etm_context *ctx, struct command_context *
ctx->pc_ok = 0;
ctx->ptr_ok = 0;
- while (ctx->pipe_index < ctx->trace_depth)
- {
+ while (ctx->pipe_index < ctx->trace_depth) {
uint8_t pipestat = ctx->trace_data[ctx->pipe_index].pipestat;
uint32_t next_pc = ctx->current_pc;
uint32_t old_data_index = ctx->data_index;
@@ -918,17 +893,14 @@ static int etmv1_analyze_trace(struct etm_context *ctx, struct command_context *
int current_pc_ok = ctx->pc_ok;
if (ctx->trace_data[ctx->pipe_index].flags & ETMV1_TRIGGER_CYCLE)
- {
command_print(cmd_ctx, "--- trigger ---");
- }
/* instructions execute in IE/D or BE/D cycles */
if ((pipestat == STAT_IE) || (pipestat == STAT_ID))
ctx->last_instruction = ctx->pipe_index;
/* if we don't have a valid pc skip until we reach an indirect branch */
- if ((!ctx->pc_ok) && (pipestat != STAT_BE))
- {
+ if ((!ctx->pc_ok) && (pipestat != STAT_BE)) {
ctx->pipe_index++;
continue;
}
@@ -937,8 +909,7 @@ static int etmv1_analyze_trace(struct etm_context *ctx, struct command_context *
* - the branch reason code could indicate a trace discontinuity
* - a branch to the exception vectors indicates an exception
*/
- if ((pipestat == STAT_BE) || (pipestat == STAT_BD))
- {
+ if ((pipestat == STAT_BE) || (pipestat == STAT_BD)) {
/* backup current data index, to be able to consume the branch address
* before examining data address and values
*/
@@ -947,8 +918,8 @@ static int etmv1_analyze_trace(struct etm_context *ctx, struct command_context *
ctx->last_instruction = ctx->pipe_index;
- if ((retval = etmv1_branch_address(ctx)) != 0)
- {
+ retval = etmv1_branch_address(ctx);
+ if (retval != 0) {
/* negative return value from etmv1_branch_address means we ran out of packets,
* quit analysing the trace */
if (retval < 0)
@@ -957,7 +928,8 @@ static int etmv1_analyze_trace(struct etm_context *ctx, struct command_context *
/* a positive return values means the current branch was abandoned,
* and a new branch was encountered in cycle ctx->pipe_index + retval;
*/
- LOG_WARNING("abandoned branch encountered, correctnes of analysis uncertain");
+ LOG_WARNING(
+ "abandoned branch encountered, correctness of analysis uncertain");
ctx->pipe_index += retval;
continue;
}
@@ -965,25 +937,30 @@ static int etmv1_analyze_trace(struct etm_context *ctx, struct command_context *
/* skip over APO cycles */
ctx->pipe_index += 2;
- switch (ctx->last_branch_reason)
- {
+ switch (ctx->last_branch_reason) {
case 0x0: /* normal PC change */
next_pc = ctx->last_branch;
break;
case 0x1: /* tracing enabled */
- command_print(cmd_ctx, "--- tracing enabled at 0x%8.8" PRIx32 " ---", ctx->last_branch);
+ command_print(cmd_ctx,
+ "--- tracing enabled at 0x%8.8" PRIx32 " ---",
+ ctx->last_branch);
ctx->current_pc = ctx->last_branch;
ctx->pipe_index++;
continue;
break;
case 0x2: /* trace restarted after FIFO overflow */
- command_print(cmd_ctx, "--- trace restarted after FIFO overflow at 0x%8.8" PRIx32 " ---", ctx->last_branch);
+ command_print(cmd_ctx,
+ "--- trace restarted after FIFO overflow at 0x%8.8" PRIx32 " ---",
+ ctx->last_branch);
ctx->current_pc = ctx->last_branch;
ctx->pipe_index++;
continue;
break;
case 0x3: /* exit from debug state */
- command_print(cmd_ctx, "--- exit from debug state at 0x%8.8" PRIx32 " ---", ctx->last_branch);
+ command_print(cmd_ctx,
+ "--- exit from debug state at 0x%8.8" PRIx32 " ---",
+ ctx->last_branch);
ctx->current_pc = ctx->last_branch;
ctx->pipe_index++;
continue;
@@ -993,37 +970,39 @@ static int etmv1_analyze_trace(struct etm_context *ctx, struct command_context *
/* if we had no valid PC prior to this synchronization point,
* we have to move on with the next trace cycle
*/
- if (!current_pc_ok)
- {
- command_print(cmd_ctx, "--- periodic synchronization point at 0x%8.8" PRIx32 " ---", next_pc);
+ if (!current_pc_ok) {
+ command_print(cmd_ctx,
+ "--- periodic synchronization point at 0x%8.8" PRIx32 " ---",
+ next_pc);
ctx->current_pc = next_pc;
ctx->pipe_index++;
continue;
}
break;
default: /* reserved */
- LOG_ERROR("BUG: branch reason code 0x%" PRIx32 " is reserved", ctx->last_branch_reason);
+ LOG_ERROR(
+ "BUG: branch reason code 0x%" PRIx32 " is reserved",
+ ctx->last_branch_reason);
return ERROR_FAIL;
}
/* if we got here the branch was a normal PC change
* (or a periodic synchronization point, which means the same for that matter)
- * if we didn't accquire a complete PC continue with the next cycle
+ * if we didn't acquire a complete PC continue with the next cycle
*/
if (!ctx->pc_ok)
continue;
- /* indirect branch to the exception vector means an exception occured */
+ /* indirect branch to the exception vector means an exception occurred */
if ((ctx->last_branch <= 0x20)
- || ((ctx->last_branch >= 0xffff0000) && (ctx->last_branch <= 0xffff0020)))
- {
+ || ((ctx->last_branch >= 0xffff0000) &&
+ (ctx->last_branch <= 0xffff0020))) {
if ((ctx->last_branch & 0xff) == 0x10)
- {
command_print(cmd_ctx, "data abort");
- }
- else
- {
- command_print(cmd_ctx, "exception vector 0x%2.2" PRIx32 "", ctx->last_branch);
+ else {
+ command_print(cmd_ctx,
+ "exception vector 0x%2.2" PRIx32 "",
+ ctx->last_branch);
ctx->current_pc = ctx->last_branch;
ctx->pipe_index++;
continue;
@@ -1035,19 +1014,15 @@ static int etmv1_analyze_trace(struct etm_context *ctx, struct command_context *
* retrieve it from the image for displaying */
if (ctx->pc_ok && (pipestat != STAT_WT) && (pipestat != STAT_TD) &&
!(((pipestat == STAT_BE) || (pipestat == STAT_BD)) &&
- ((ctx->last_branch_reason != 0x0) && (ctx->last_branch_reason != 0x4))))
- {
- if ((retval = etm_read_instruction(ctx, &instruction)) != ERROR_OK)
- {
+ ((ctx->last_branch_reason != 0x0) && (ctx->last_branch_reason != 0x4)))) {
+ retval = etm_read_instruction(ctx, &instruction);
+ if (retval != ERROR_OK) {
/* can't continue tracing with no image available */
if (retval == ERROR_TRACE_IMAGE_UNAVAILABLE)
- {
return retval;
- }
- else if (retval == ERROR_TRACE_INSTRUCTION_UNAVAILABLE)
- {
+ else if (retval == ERROR_TRACE_INSTRUCTION_UNAVAILABLE) {
/* TODO: handle incomplete images
- * for now we just quit the analsysis*/
+ * for now we just quit the analysis*/
return retval;
}
}
@@ -1055,26 +1030,24 @@ static int etmv1_analyze_trace(struct etm_context *ctx, struct command_context *
cycles = old_index - last_instruction;
}
- if ((pipestat == STAT_ID) || (pipestat == STAT_BD))
- {
+ if ((pipestat == STAT_ID) || (pipestat == STAT_BD)) {
uint32_t new_data_index = ctx->data_index;
uint32_t new_data_half = ctx->data_half;
/* in case of a branch with data, the branch target address was consumed before
* we temporarily go back to the saved data index */
- if (pipestat == STAT_BD)
- {
+ if (pipestat == STAT_BD) {
ctx->data_index = old_data_index;
ctx->data_half = old_data_half;
}
- if (ctx->control & ETM_CTRL_TRACE_ADDR)
- {
+ if (ctx->control & ETM_CTRL_TRACE_ADDR) {
uint8_t packet;
int shift = 0;
do {
- if ((retval = etmv1_next_packet(ctx, &packet, 0)) != 0)
+ retval = etmv1_next_packet(ctx, &packet, 0);
+ if (retval != 0)
return ERROR_ETM_ANALYSIS_FAILED;
ctx->last_ptr &= ~(0x7f << shift);
ctx->last_ptr |= (packet & 0x7f) << shift;
@@ -1085,75 +1058,64 @@ static int etmv1_analyze_trace(struct etm_context *ctx, struct command_context *
ctx->ptr_ok = 1;
if (ctx->ptr_ok)
- {
- command_print(cmd_ctx, "address: 0x%8.8" PRIx32 "", ctx->last_ptr);
- }
+ command_print(cmd_ctx,
+ "address: 0x%8.8" PRIx32 "",
+ ctx->last_ptr);
}
- if (ctx->control & ETM_CTRL_TRACE_DATA)
- {
- if ((instruction.type == ARM_LDM) || (instruction.type == ARM_STM))
- {
+ if (ctx->control & ETM_CTRL_TRACE_DATA) {
+ if ((instruction.type == ARM_LDM) ||
+ (instruction.type == ARM_STM)) {
int i;
- for (i = 0; i < 16; i++)
- {
- if (instruction.info.load_store_multiple.register_list & (1 << i))
- {
+ for (i = 0; i < 16; i++) {
+ if (instruction.info.load_store_multiple.
+ register_list & (1 << i)) {
uint32_t data;
if (etmv1_data(ctx, 4, &data) != 0)
return ERROR_ETM_ANALYSIS_FAILED;
- command_print(cmd_ctx, "data: 0x%8.8" PRIx32 "", data);
+ command_print(cmd_ctx,
+ "data: 0x%8.8" PRIx32 "",
+ data);
}
}
- }
- else if ((instruction.type >= ARM_LDR) && (instruction.type <= ARM_STRH))
- {
+ } else if ((instruction.type >= ARM_LDR) &&
+ (instruction.type <= ARM_STRH)) {
uint32_t data;
- if (etmv1_data(ctx, arm_access_size(&instruction), &data) != 0)
+ if (etmv1_data(ctx, arm_access_size(&instruction),
+ &data) != 0)
return ERROR_ETM_ANALYSIS_FAILED;
command_print(cmd_ctx, "data: 0x%8.8" PRIx32 "", data);
}
}
/* restore data index after consuming BD address and data */
- if (pipestat == STAT_BD)
- {
+ if (pipestat == STAT_BD) {
ctx->data_index = new_data_index;
ctx->data_half = new_data_half;
}
}
/* adjust PC */
- if ((pipestat == STAT_IE) || (pipestat == STAT_ID))
- {
+ if ((pipestat == STAT_IE) || (pipestat == STAT_ID)) {
if (((instruction.type == ARM_B) ||
- (instruction.type == ARM_BL) ||
- (instruction.type == ARM_BLX)) &&
- (instruction.info.b_bl_bx_blx.target_address != 0xffffffff))
- {
+ (instruction.type == ARM_BL) ||
+ (instruction.type == ARM_BLX)) &&
+ (instruction.info.b_bl_bx_blx.target_address != 0xffffffff))
next_pc = instruction.info.b_bl_bx_blx.target_address;
- }
else
- {
next_pc += (ctx->core_state == ARM_STATE_ARM) ? 4 : 2;
- }
- }
- else if (pipestat == STAT_IN)
- {
+ } else if (pipestat == STAT_IN)
next_pc += (ctx->core_state == ARM_STATE_ARM) ? 4 : 2;
- }
- if ((pipestat != STAT_TD) && (pipestat != STAT_WT))
- {
+ if ((pipestat != STAT_TD) && (pipestat != STAT_WT)) {
char cycles_text[32] = "";
/* if the trace was captured with cycle accurate tracing enabled,
* output the number of cycles since the last executed instruction
*/
- if (ctx->control & ETM_CTRL_CYCLE_ACCURATE)
- {
+ if (ctx->control & ETM_CTRL_CYCLE_ACCURATE) {
snprintf(cycles_text, 32, " (%i %s)",
- (int)cycles,
+ (int)cycles,
(cycles == 1) ? "cycle" : "cycles");
}
@@ -1167,8 +1129,7 @@ static int etmv1_analyze_trace(struct etm_context *ctx, struct command_context *
/* packets for an instruction don't start on or before the preceding
* functional pipestat (i.e. other than WT or TD)
*/
- if (ctx->data_index <= ctx->pipe_index)
- {
+ if (ctx->data_index <= ctx->pipe_index) {
ctx->data_index = ctx->pipe_index + 1;
ctx->data_half = 0;
}
@@ -1181,7 +1142,7 @@ static int etmv1_analyze_trace(struct etm_context *ctx, struct command_context *
}
static COMMAND_HELPER(handle_etm_tracemode_command_update,
- uint32_t *mode)
+ uint32_t *mode)
{
uint32_t tracemode;
@@ -1194,31 +1155,29 @@ static COMMAND_HELPER(handle_etm_tracemode_command_update,
tracemode = ETM_CTRL_TRACE_ADDR;
else if (strcmp(CMD_ARGV[0], "all") == 0)
tracemode = ETM_CTRL_TRACE_DATA | ETM_CTRL_TRACE_ADDR;
- else
- {
+ else {
command_print(CMD_CTX, "invalid option '%s'", CMD_ARGV[0]);
- return ERROR_INVALID_ARGUMENTS;
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
uint8_t context_id;
COMMAND_PARSE_NUMBER(u8, CMD_ARGV[1], context_id);
- switch (context_id)
- {
- case 0:
- tracemode |= ETM_CTRL_CONTEXTID_NONE;
- break;
- case 8:
- tracemode |= ETM_CTRL_CONTEXTID_8;
- break;
- case 16:
- tracemode |= ETM_CTRL_CONTEXTID_16;
- break;
- case 32:
- tracemode |= ETM_CTRL_CONTEXTID_32;
- break;
- default:
- command_print(CMD_CTX, "invalid option '%s'", CMD_ARGV[1]);
- return ERROR_INVALID_ARGUMENTS;
+ switch (context_id) {
+ case 0:
+ tracemode |= ETM_CTRL_CONTEXTID_NONE;
+ break;
+ case 8:
+ tracemode |= ETM_CTRL_CONTEXTID_8;
+ break;
+ case 16:
+ tracemode |= ETM_CTRL_CONTEXTID_16;
+ break;
+ case 32:
+ tracemode |= ETM_CTRL_CONTEXTID_32;
+ break;
+ default:
+ command_print(CMD_CTX, "invalid option '%s'", CMD_ARGV[1]);
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
bool etmv1_cycle_accurate;
@@ -1234,7 +1193,7 @@ static COMMAND_HELPER(handle_etm_tracemode_command_update,
/* IGNORED:
* - CPRT tracing (coprocessor register transfers)
* - debug request (causes debug entry on trigger)
- * - stall on FIFOFULL (preventing tracedata lossage)
+ * - stall on FIFOFULL (preventing tracedata loss)
*/
*mode = tracemode;
@@ -1260,22 +1219,15 @@ COMMAND_HANDLER(handle_etm_tracemode_command)
uint32_t tracemode = etm->control;
- switch (CMD_ARGC)
- {
- case 0:
- break;
- case 4:
- CALL_COMMAND_HANDLER(handle_etm_tracemode_command_update,
+ switch (CMD_ARGC) {
+ case 0:
+ break;
+ case 4:
+ CALL_COMMAND_HANDLER(handle_etm_tracemode_command_update,
&tracemode);
- break;
- default:
- command_print(CMD_CTX, "usage: tracemode "
- "('none'|'data'|'address'|'all') "
- "context_id_bits "
- "('enable'|'disable') "
- "('enable'|'disable')"
- );
- return ERROR_FAIL;
+ break;
+ default:
+ return ERROR_COMMAND_SYNTAX_ERROR;
}
/**
@@ -1285,8 +1237,7 @@ COMMAND_HANDLER(handle_etm_tracemode_command)
command_print(CMD_CTX, "current tracemode configuration:");
- switch (tracemode & ETM_CTRL_TRACE_MASK)
- {
+ switch (tracemode & ETM_CTRL_TRACE_MASK) {
default:
command_print(CMD_CTX, "data tracing: none");
break;
@@ -1301,8 +1252,7 @@ COMMAND_HANDLER(handle_etm_tracemode_command)
break;
}
- switch (tracemode & ETM_CTRL_CONTEXTID_MASK)
- {
+ switch (tracemode & ETM_CTRL_CONTEXTID_MASK) {
case ETM_CTRL_CONTEXTID_NONE:
command_print(CMD_CTX, "contextid tracing: none");
break;
@@ -1318,33 +1268,24 @@ COMMAND_HANDLER(handle_etm_tracemode_command)
}
if (tracemode & ETM_CTRL_CYCLE_ACCURATE)
- {
command_print(CMD_CTX, "cycle-accurate tracing enabled");
- }
else
- {
command_print(CMD_CTX, "cycle-accurate tracing disabled");
- }
if (tracemode & ETM_CTRL_BRANCH_OUTPUT)
- {
command_print(CMD_CTX, "full branch address output enabled");
- }
else
- {
command_print(CMD_CTX, "full branch address output disabled");
- }
#define TRACEMODE_MASK ( \
- ETM_CTRL_CONTEXTID_MASK \
- | ETM_CTRL_BRANCH_OUTPUT \
- | ETM_CTRL_CYCLE_ACCURATE \
- | ETM_CTRL_TRACE_MASK \
- )
+ ETM_CTRL_CONTEXTID_MASK \
+ | ETM_CTRL_BRANCH_OUTPUT \
+ | ETM_CTRL_CYCLE_ACCURATE \
+ | ETM_CTRL_TRACE_MASK \
+ )
/* only update ETM_CTRL register if tracemode changed */
- if ((etm->control & TRACEMODE_MASK) != tracemode)
- {
+ if ((etm->control & TRACEMODE_MASK) != tracemode) {
struct reg *etm_ctrl_reg;
etm_ctrl_reg = etm_reg_lookup(etm, ETM_CTRL);
@@ -1359,8 +1300,7 @@ COMMAND_HANDLER(handle_etm_tracemode_command)
/* invalidate old trace data */
etm->capture_status = TRACE_IDLE;
- if (etm->trace_depth > 0)
- {
+ if (etm->trace_depth > 0) {
free(etm->trace_data);
etm->trace_data = NULL;
}
@@ -1384,8 +1324,7 @@ COMMAND_HANDLER(handle_etm_config_command)
return ERROR_COMMAND_SYNTAX_ERROR;
target = get_target(CMD_ARGV[0]);
- if (!target)
- {
+ if (!target) {
LOG_ERROR("target '%s' not defined", CMD_ARGV[0]);
return ERROR_FAIL;
}
@@ -1393,8 +1332,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_name(target),
- target_type_name(target));
+ target_name(target),
+ target_type_name(target));
return ERROR_FAIL;
}
@@ -1406,14 +1345,13 @@ COMMAND_HANDLER(handle_etm_config_command)
* check whether our setting "took".
*
* - The "clock" and "mode" bits are interpreted differently.
- * See ARM IHI 0014O table 2-17 for the old behavior, and
+ * See ARM IHI 0014O table 2-17 for the old behaviour, and
* table 2-18 for the new. With ETB it's best to specify
* "normal full" ...
*/
uint8_t port_width;
COMMAND_PARSE_NUMBER(u8, CMD_ARGV[1], port_width);
- switch (port_width)
- {
+ switch (port_width) {
/* before ETMv3.0 */
case 4:
portmode |= ETM_PORT_4BIT;
@@ -1450,34 +1388,26 @@ COMMAND_HANDLER(handle_etm_config_command)
}
if (strcmp("normal", CMD_ARGV[2]) == 0)
- {
portmode |= ETM_PORT_NORMAL;
- }
else if (strcmp("multiplexed", CMD_ARGV[2]) == 0)
- {
portmode |= ETM_PORT_MUXED;
- }
else if (strcmp("demultiplexed", CMD_ARGV[2]) == 0)
- {
portmode |= ETM_PORT_DEMUXED;
- }
- else
- {
- command_print(CMD_CTX, "unsupported ETM port mode '%s', must be 'normal', 'multiplexed' or 'demultiplexed'", CMD_ARGV[2]);
+ else {
+ command_print(CMD_CTX,
+ "unsupported ETM port mode '%s', must be 'normal', 'multiplexed' or 'demultiplexed'",
+ CMD_ARGV[2]);
return ERROR_FAIL;
}
if (strcmp("half", CMD_ARGV[3]) == 0)
- {
portmode |= ETM_PORT_HALF_CLOCK;
- }
else if (strcmp("full", CMD_ARGV[3]) == 0)
- {
portmode |= ETM_PORT_FULL_CLOCK;
- }
- else
- {
- command_print(CMD_CTX, "unsupported ETM port clocking '%s', must be 'full' or 'half'", CMD_ARGV[3]);
+ else {
+ command_print(CMD_CTX,
+ "unsupported ETM port clocking '%s', must be 'full' or 'half'",
+ CMD_ARGV[3]);
return ERROR_FAIL;
}
@@ -1487,14 +1417,11 @@ COMMAND_HANDLER(handle_etm_config_command)
return ERROR_FAIL;
}
- for (i = 0; etm_capture_drivers[i]; i++)
- {
- if (strcmp(CMD_ARGV[4], etm_capture_drivers[i]->name) == 0)
- {
+ for (i = 0; etm_capture_drivers[i]; i++) {
+ if (strcmp(CMD_ARGV[4], etm_capture_drivers[i]->name) == 0) {
int retval = register_commands(CMD_CTX, NULL,
etm_capture_drivers[i]->commands);
- if (ERROR_OK != retval)
- {
+ if (ERROR_OK != retval) {
free(etm_ctx);
return retval;
}
@@ -1505,8 +1432,7 @@ COMMAND_HANDLER(handle_etm_config_command)
}
}
- if (!etm_capture_drivers[i])
- {
+ if (!etm_capture_drivers[i]) {
/* no supported capture driver found, don't register an ETM */
free(etm_ctx);
LOG_ERROR("trace capture driver '%s' not found", CMD_ARGV[4]);
@@ -1534,48 +1460,46 @@ COMMAND_HANDLER(handle_etm_info_command)
target = get_current_target(CMD_CTX);
arm = target_to_arm(target);
- if (!is_arm(arm))
- {
+ if (!is_arm(arm)) {
command_print(CMD_CTX, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
etm = arm->etm;
- if (!etm)
- {
+ if (!etm) {
command_print(CMD_CTX, "current target doesn't have an ETM configured");
return ERROR_FAIL;
}
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",
- (int) (etm->config >> 0) & 0x0f);
+ (int) (etm->config >> 0) & 0x0f);
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",
- (int) (etm->config >> 8) & 0x1f);
+ (int) (etm->config >> 8) & 0x1f);
command_print(CMD_CTX, "number of counters: %i",
- (int) (etm->config >> 13) & 0x07);
+ (int) (etm->config >> 13) & 0x07);
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",
- (int) (etm->config >> 17) & 0x07);
+ (int) (etm->config >> 17) & 0x07);
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",
- (int) (etm->config & (1 << 23)) ? "" : "not ");
+ (int) (etm->config & (1 << 23)) ? "" : "not ");
if (etm->bcd_vers < 0x20)
command_print(CMD_CTX, "protocol version: %i",
- (int) (etm->config >> 28) & 0x07);
+ (int) (etm->config >> 28) & 0x07);
else {
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",
- (etm->config & (1 << 26)) ? "" : "not ");
+ (etm->config & (1 << 26)) ? "" : "not ");
command_print(CMD_CTX, "number of context comparators: %i",
- (int) (etm->config >> 24) & 0x03);
+ (int) (etm->config >> 24) & 0x03);
}
/* SYS_CONFIG isn't present before ETMv1.2 */
@@ -1591,8 +1515,7 @@ COMMAND_HANDLER(handle_etm_info_command)
max_port_size = config & 0x7;
if (etm->bcd_vers >= 0x30)
max_port_size |= (config >> 6) & 0x08;
- switch (max_port_size)
- {
+ switch (max_port_size) {
/* before ETMv3.0 */
case 0:
max_port_size = 4;
@@ -1630,27 +1553,27 @@ COMMAND_HANDLER(handle_etm_info_command)
if (etm->bcd_vers < 0x30) {
command_print(CMD_CTX, "half-rate clocking %ssupported",
- (config & (1 << 3)) ? "" : "not ");
+ (config & (1 << 3)) ? "" : "not ");
command_print(CMD_CTX, "full-rate clocking %ssupported",
- (config & (1 << 4)) ? "" : "not ");
+ (config & (1 << 4)) ? "" : "not ");
command_print(CMD_CTX, "normal trace format %ssupported",
- (config & (1 << 5)) ? "" : "not ");
+ (config & (1 << 5)) ? "" : "not ");
command_print(CMD_CTX, "multiplex trace format %ssupported",
- (config & (1 << 6)) ? "" : "not ");
+ (config & (1 << 6)) ? "" : "not ");
command_print(CMD_CTX, "demultiplex trace format %ssupported",
- (config & (1 << 7)) ? "" : "not ");
+ (config & (1 << 7)) ? "" : "not ");
} else {
/* REVISIT show which size and format are selected ... */
command_print(CMD_CTX, "current port size %ssupported",
- (config & (1 << 10)) ? "" : "not ");
+ (config & (1 << 10)) ? "" : "not ");
command_print(CMD_CTX, "current trace format %ssupported",
- (config & (1 << 11)) ? "" : "not ");
+ (config & (1 << 11)) ? "" : "not ");
}
if (etm->bcd_vers >= 0x21)
command_print(CMD_CTX, "fetch comparisons %ssupported",
- (config & (1 << 17)) ? "not " : "");
+ (config & (1 << 17)) ? "not " : "");
command_print(CMD_CTX, "FIFO full %ssupported",
- (config & (1 << 8)) ? "" : "not ");
+ (config & (1 << 8)) ? "" : "not ");
return ERROR_OK;
}
@@ -1664,15 +1587,13 @@ COMMAND_HANDLER(handle_etm_status_command)
target = get_current_target(CMD_CTX);
arm = target_to_arm(target);
- if (!is_arm(arm))
- {
+ if (!is_arm(arm)) {
command_print(CMD_CTX, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
etm = arm->etm;
- if (!etm)
- {
+ if (!etm) {
command_print(CMD_CTX, "current target doesn't have an ETM configured");
return ERROR_FAIL;
}
@@ -1690,26 +1611,23 @@ COMMAND_HANDLER(handle_etm_status_command)
command_print(CMD_CTX, "etm: %s%s%s%s",
/* bit(1) == progbit */
(etm->bcd_vers >= 0x12)
- ? ((s & (1 << 1))
- ? "disabled" : "enabled")
- : "?",
+ ? ((s & (1 << 1))
+ ? "disabled" : "enabled")
+ : "?",
((s & (1 << 3)) && etm->bcd_vers >= 0x31)
- ? " triggered" : "",
+ ? " triggered" : "",
((s & (1 << 2)) && etm->bcd_vers >= 0x12)
- ? " start/stop" : "",
+ ? " start/stop" : "",
((s & (1 << 0)) && etm->bcd_vers >= 0x11)
- ? " untraced-overflow" : "");
- } /* else ignore and try showing trace port status */
+ ? " untraced-overflow" : "");
+ } /* else ignore and try showing trace port status */
}
/* Trace Port Driver status */
trace_status = etm->capture_driver->status(etm);
if (trace_status == TRACE_IDLE)
- {
command_print(CMD_CTX, "%s: idle", etm->capture_driver->name);
- }
- else
- {
+ else {
static char *completed = " completed";
static char *running = " is running";
static char *overflowed = ", overflowed";
@@ -1721,10 +1639,9 @@ COMMAND_HANDLER(handle_etm_status_command)
(trace_status & TRACE_OVERFLOWED) ? overflowed : "",
(trace_status & TRACE_TRIGGERED) ? triggered : "");
- if (etm->trace_depth > 0)
- {
+ if (etm->trace_depth > 0) {
command_print(CMD_CTX, "%i frames of trace data read",
- (int)(etm->trace_depth));
+ (int)(etm->trace_depth));
}
}
@@ -1738,28 +1655,22 @@ COMMAND_HANDLER(handle_etm_image_command)
struct etm_context *etm_ctx;
if (CMD_ARGC < 1)
- {
- command_print(CMD_CTX, "usage: etm image [base address] [type]");
- return ERROR_FAIL;
- }
+ return ERROR_COMMAND_SYNTAX_ERROR;
target = get_current_target(CMD_CTX);
arm = target_to_arm(target);
- if (!is_arm(arm))
- {
+ if (!is_arm(arm)) {
command_print(CMD_CTX, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
etm_ctx = arm->etm;
- if (!etm_ctx)
- {
+ if (!etm_ctx) {
command_print(CMD_CTX, "current target doesn't have an ETM configured");
return ERROR_FAIL;
}
- if (etm_ctx->image)
- {
+ if (etm_ctx->image) {
image_close(etm_ctx->image);
free(etm_ctx->image);
command_print(CMD_CTX, "previously loaded image found and closed");
@@ -1770,18 +1681,14 @@ COMMAND_HANDLER(handle_etm_image_command)
etm_ctx->image->start_address_set = 0;
/* a base address isn't always necessary, default to 0x0 (i.e. don't relocate) */
- if (CMD_ARGC >= 2)
- {
+ if (CMD_ARGC >= 2) {
etm_ctx->image->base_address_set = 1;
COMMAND_PARSE_NUMBER(llong, CMD_ARGV[1], etm_ctx->image->base_address);
- }
- else
- {
+ } else
etm_ctx->image->base_address_set = 0;
- }
- if (image_open(etm_ctx->image, CMD_ARGV[0], (CMD_ARGC >= 3) ? CMD_ARGV[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;
return ERROR_FAIL;
@@ -1792,41 +1699,34 @@ COMMAND_HANDLER(handle_etm_image_command)
COMMAND_HANDLER(handle_etm_dump_command)
{
- struct fileio file;
+ struct fileio *file;
struct target *target;
struct arm *arm;
struct etm_context *etm_ctx;
uint32_t i;
if (CMD_ARGC != 1)
- {
- command_print(CMD_CTX, "usage: etm dump ");
- return ERROR_FAIL;
- }
+ return ERROR_COMMAND_SYNTAX_ERROR;
target = get_current_target(CMD_CTX);
arm = target_to_arm(target);
- if (!is_arm(arm))
- {
+ if (!is_arm(arm)) {
command_print(CMD_CTX, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
etm_ctx = arm->etm;
- if (!etm_ctx)
- {
+ if (!etm_ctx) {
command_print(CMD_CTX, "current target doesn't have an ETM configured");
return ERROR_FAIL;
}
- if (etm_ctx->capture_driver->status == TRACE_IDLE)
- {
+ if (etm_ctx->capture_driver->status == TRACE_IDLE) {
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)
- {
+ 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");
return ERROR_FAIL;
@@ -1837,105 +1737,97 @@ COMMAND_HANDLER(handle_etm_dump_command)
etm_ctx->capture_driver->read_trace(etm_ctx);
if (fileio_open(&file, CMD_ARGV[0], FILEIO_WRITE, FILEIO_BINARY) != ERROR_OK)
- {
return ERROR_FAIL;
- }
- fileio_write_u32(&file, etm_ctx->capture_status);
- fileio_write_u32(&file, etm_ctx->control);
- fileio_write_u32(&file, etm_ctx->trace_depth);
+ fileio_write_u32(file, etm_ctx->capture_status);
+ fileio_write_u32(file, etm_ctx->control);
+ fileio_write_u32(file, etm_ctx->trace_depth);
- for (i = 0; i < etm_ctx->trace_depth; i++)
- {
- fileio_write_u32(&file, etm_ctx->trace_data[i].pipestat);
- fileio_write_u32(&file, etm_ctx->trace_data[i].packet);
- fileio_write_u32(&file, etm_ctx->trace_data[i].flags);
+ for (i = 0; i < etm_ctx->trace_depth; i++) {
+ fileio_write_u32(file, etm_ctx->trace_data[i].pipestat);
+ fileio_write_u32(file, etm_ctx->trace_data[i].packet);
+ fileio_write_u32(file, etm_ctx->trace_data[i].flags);
}
- fileio_close(&file);
+ fileio_close(file);
return ERROR_OK;
}
COMMAND_HANDLER(handle_etm_load_command)
{
- struct fileio file;
+ struct fileio *file;
struct target *target;
struct arm *arm;
struct etm_context *etm_ctx;
uint32_t i;
if (CMD_ARGC != 1)
- {
- command_print(CMD_CTX, "usage: etm load ");
- return ERROR_FAIL;
- }
+ return ERROR_COMMAND_SYNTAX_ERROR;
target = get_current_target(CMD_CTX);
arm = target_to_arm(target);
- if (!is_arm(arm))
- {
+ if (!is_arm(arm)) {
command_print(CMD_CTX, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
etm_ctx = arm->etm;
- if (!etm_ctx)
- {
+ if (!etm_ctx) {
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)
- {
+ if (etm_ctx->capture_driver->status(etm_ctx) & TRACE_RUNNING) {
command_print(CMD_CTX, "trace capture running, stop first");
return ERROR_FAIL;
}
if (fileio_open(&file, CMD_ARGV[0], FILEIO_READ, FILEIO_BINARY) != ERROR_OK)
- {
return ERROR_FAIL;
+
+ size_t filesize;
+ int retval = fileio_size(file, &filesize);
+ if (retval != ERROR_OK) {
+ fileio_close(file);
+ return retval;
}
- if (fileio_size(&file) % 4)
- {
+ if (filesize % 4) {
command_print(CMD_CTX, "size isn't a multiple of 4, no valid trace data");
- fileio_close(&file);
+ fileio_close(file);
return ERROR_FAIL;
}
- if (etm_ctx->trace_depth > 0)
- {
+ if (etm_ctx->trace_depth > 0) {
free(etm_ctx->trace_data);
etm_ctx->trace_data = NULL;
}
{
- uint32_t tmp;
- fileio_read_u32(&file, &tmp); etm_ctx->capture_status = tmp;
- fileio_read_u32(&file, &tmp); etm_ctx->control = tmp;
- fileio_read_u32(&file, &etm_ctx->trace_depth);
+ uint32_t tmp;
+ fileio_read_u32(file, &tmp); etm_ctx->capture_status = tmp;
+ fileio_read_u32(file, &tmp); etm_ctx->control = tmp;
+ fileio_read_u32(file, &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");
- fileio_close(&file);
+ fileio_close(file);
return ERROR_FAIL;
}
- for (i = 0; i < etm_ctx->trace_depth; i++)
- {
+ for (i = 0; i < etm_ctx->trace_depth; i++) {
uint32_t pipestat, packet, flags;
- fileio_read_u32(&file, &pipestat);
- fileio_read_u32(&file, &packet);
- fileio_read_u32(&file, &flags);
+ fileio_read_u32(file, &pipestat);
+ fileio_read_u32(file, &packet);
+ fileio_read_u32(file, &flags);
etm_ctx->trace_data[i].pipestat = pipestat & 0xff;
etm_ctx->trace_data[i].packet = packet & 0xffff;
etm_ctx->trace_data[i].flags = flags;
}
- fileio_close(&file);
+ fileio_close(file);
return ERROR_OK;
}
@@ -1949,23 +1841,20 @@ COMMAND_HANDLER(handle_etm_start_command)
target = get_current_target(CMD_CTX);
arm = target_to_arm(target);
- if (!is_arm(arm))
- {
+ if (!is_arm(arm)) {
command_print(CMD_CTX, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
etm_ctx = arm->etm;
- if (!etm_ctx)
- {
+ if (!etm_ctx) {
command_print(CMD_CTX, "current target doesn't have an ETM configured");
return ERROR_FAIL;
}
/* invalidate old tracing data */
etm_ctx->capture_status = TRACE_IDLE;
- if (etm_ctx->trace_depth > 0)
- {
+ if (etm_ctx->trace_depth > 0) {
free(etm_ctx->trace_data);
etm_ctx->trace_data = NULL;
}
@@ -1997,15 +1886,13 @@ COMMAND_HANDLER(handle_etm_stop_command)
target = get_current_target(CMD_CTX);
arm = target_to_arm(target);
- if (!is_arm(arm))
- {
+ if (!is_arm(arm)) {
command_print(CMD_CTX, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
etm_ctx = arm->etm;
- if (!etm_ctx)
- {
+ if (!etm_ctx) {
command_print(CMD_CTX, "current target doesn't have an ETM configured");
return ERROR_FAIL;
}
@@ -2035,18 +1922,16 @@ COMMAND_HANDLER(handle_etm_trigger_debug_command)
target = get_current_target(CMD_CTX);
arm = target_to_arm(target);
- if (!is_arm(arm))
- {
+ if (!is_arm(arm)) {
command_print(CMD_CTX, "ETM: %s isn't an ARM",
- target_name(target));
+ target_name(target));
return ERROR_FAIL;
}
etm = arm->etm;
- if (!etm)
- {
+ if (!etm) {
command_print(CMD_CTX, "ETM: no ETM configured for %s",
- target_name(target));
+ target_name(target));
return ERROR_FAIL;
}
@@ -2071,9 +1956,9 @@ COMMAND_HANDLER(handle_etm_trigger_debug_command)
}
command_print(CMD_CTX, "ETM: %s debug halt",
- (etm->control & ETM_CTRL_DBGRQ)
- ? "triggers"
- : "does not trigger");
+ (etm->control & ETM_CTRL_DBGRQ)
+ ? "triggers"
+ : "does not trigger");
return ERROR_OK;
}
@@ -2086,34 +1971,34 @@ COMMAND_HANDLER(handle_etm_analyze_command)
target = get_current_target(CMD_CTX);
arm = target_to_arm(target);
- if (!is_arm(arm))
- {
+ if (!is_arm(arm)) {
command_print(CMD_CTX, "ETM: current target isn't an ARM");
return ERROR_FAIL;
}
etm_ctx = arm->etm;
- if (!etm_ctx)
- {
+ if (!etm_ctx) {
command_print(CMD_CTX, "current target doesn't have an ETM configured");
return ERROR_FAIL;
}
- if ((retval = etmv1_analyze_trace(etm_ctx, CMD_CTX)) != ERROR_OK)
- {
- switch (retval)
- {
+ retval = etmv1_analyze_trace(etm_ctx, CMD_CTX);
+ if (retval != ERROR_OK) {
+ /* FIX! error should be reported inside etmv1_analyze_trace() */
+ 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:
- 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:
command_print(CMD_CTX, "no image available for trace analysis");
break;
default:
- command_print(CMD_CTX, "unknown error: %i", retval);
+ command_print(CMD_CTX, "unknown error");
}
}
@@ -2139,7 +2024,8 @@ const struct command_registration etm_command_handlers[] = {
{
.name = "etm",
.mode = COMMAND_ANY,
- .help = "Emebdded Trace Macrocell command group",
+ .help = "Embedded Trace Macrocell command group",
+ .usage = "",
.chain = etm_config_command_handlers,
},
COMMAND_REGISTRATION_DONE
@@ -2160,24 +2046,28 @@ static const struct command_registration etm_exec_command_handlers[] = {
.name = "info",
.handler = handle_etm_info_command,
.mode = COMMAND_EXEC,
+ .usage = "",
.help = "display info about the current target's ETM",
},
{
.name = "status",
.handler = handle_etm_status_command,
.mode = COMMAND_EXEC,
+ .usage = "",
.help = "display current target's ETM status",
},
{
.name = "start",
.handler = handle_etm_start_command,
.mode = COMMAND_EXEC,
+ .usage = "",
.help = "start ETM trace collection",
},
{
.name = "stop",
.handler = handle_etm_stop_command,
.mode = COMMAND_EXEC,
+ .usage = "",
.help = "stop ETM trace collection",
},
{
@@ -2191,6 +2081,7 @@ static const struct command_registration etm_exec_command_handlers[] = {
.name = "analyze",
.handler = handle_etm_analyze_command,
.mode = COMMAND_EXEC,
+ .usage = "",
.help = "analyze collected ETM trace",
},
{
@@ -2198,7 +2089,7 @@ static const struct command_registration etm_exec_command_handlers[] = {
.handler = handle_etm_image_command,
.mode = COMMAND_EXEC,
.help = "load image from file with optional offset",
- .usage = "filename [offset]",
+ .usage = " [base address] [type]",
},
{
.name = "dump",
@@ -2211,6 +2102,7 @@ static const struct command_registration etm_exec_command_handlers[] = {
.name = "load",
.handler = handle_etm_load_command,
.mode = COMMAND_EXEC,
+ .usage = "",
.help = "load trace data for analysis ",
},
COMMAND_REGISTRATION_DONE