return xscale_set_reg(reg, buf);
}
+static const char xscale_not[] = "target is not an XScale";
-static int xscale_get_arch_pointers(target_t *target,
- armv4_5_common_t **armv4_5_p, xscale_common_t **xscale_p)
+static int xscale_verify_pointer(struct command_context_s *cmd_ctx,
+ struct xscale_common_s *xscale)
{
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
-
- if (armv4_5->common_magic != ARMV4_5_COMMON_MAGIC)
- {
- LOG_ERROR("target isn't an XScale target");
- return -1;
- }
-
- if (xscale->common_magic != XSCALE_COMMON_MAGIC)
- {
- LOG_ERROR("target isn't an XScale target");
- return -1;
+ if (xscale->common_magic != XSCALE_COMMON_MAGIC) {
+ command_print(cmd_ctx, xscale_not);
+ return ERROR_TARGET_INVALID;
}
-
- *armv4_5_p = armv4_5;
- *xscale_p = xscale;
-
return ERROR_OK;
}
-static int xscale_jtag_set_instr(jtag_tap_t *tap, uint32_t new_instr)
+static int xscale_jtag_set_instr(struct jtag_tap *tap, uint32_t new_instr)
{
if (tap == NULL)
return ERROR_FAIL;
if (buf_get_u32(tap->cur_instr, 0, tap->ir_length) != new_instr)
{
- scan_field_t field;
+ struct scan_field field;
uint8_t scratch[4];
memset(&field, 0, sizeof field);
static int xscale_read_dcsr(target_t *target)
{
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
int retval;
- scan_field_t fields[3];
+ struct scan_field fields[3];
uint8_t field0 = 0x0;
uint8_t field0_check_value = 0x2;
uint8_t field0_check_mask = 0x7;
int retval = ERROR_OK;
tap_state_t path[3];
- scan_field_t fields[3];
+ struct scan_field fields[3];
uint8_t *field0 = malloc(num_words * 1);
uint8_t field0_check_value = 0x2;
uint8_t field0_check_mask = 0x6;
static int xscale_read_tx(target_t *target, int consume)
{
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
tap_state_t path[3];
tap_state_t noconsume_path[6];
int retval;
struct timeval timeout, now;
- scan_field_t fields[3];
+ struct scan_field fields[3];
uint8_t field0_in = 0x0;
uint8_t field0_check_value = 0x2;
uint8_t field0_check_mask = 0x6;
static int xscale_write_rx(target_t *target)
{
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
int retval;
struct timeval timeout, now;
- scan_field_t fields[3];
+ struct scan_field fields[3];
uint8_t field0_out = 0x0;
uint8_t field0_in = 0x0;
uint8_t field0_check_value = 0x2;
static int xscale_send_u32(target_t *target, uint32_t value)
{
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
buf_set_u32(xscale->reg_cache->reg_list[XSCALE_RX].value, 0, 32, value);
return xscale_write_rx(target);
static int xscale_write_dcsr(target_t *target, int hold_rst, int ext_dbg_brk)
{
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
int retval;
- scan_field_t fields[3];
+ struct scan_field fields[3];
uint8_t field0 = 0x0;
uint8_t field0_check_value = 0x2;
uint8_t field0_check_mask = 0x7;
uint8_t packet[4];
uint8_t cmd;
int word;
- scan_field_t fields[2];
+ struct scan_field fields[2];
LOG_DEBUG("loading miniIC at 0x%8.8" PRIx32 "", va);
{
uint8_t packet[4];
uint8_t cmd;
- scan_field_t fields[2];
+ struct scan_field fields[2];
jtag_set_end_state(TAP_IDLE);
xscale_jtag_set_instr(target->tap, XSCALE_LDIC);
static int xscale_update_vectors(target_t *target)
{
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
int i;
int retval;
static int xscale_arch_state(struct target_s *target)
{
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
+ struct armv4_5_common_s *armv4_5 = &xscale->armv4_5_common;
static const char *state[] =
{
static int xscale_poll(target_t *target)
{
int retval = ERROR_OK;
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
if ((target->state == TARGET_RUNNING) || (target->state == TARGET_DEBUG_RUNNING))
{
{
/* there's data to read from the tx register, we entered debug state */
- xscale->handler_running = 1;
-
target->state = TARGET_HALTED;
/* process debug entry, fetching current mode regs */
static int xscale_debug_entry(target_t *target)
{
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
+ struct armv4_5_common_s *armv4_5 = &xscale->armv4_5_common;
uint32_t pc;
uint32_t buffer[10];
int i;
int retval;
-
uint32_t moe;
/* clear external dbg break (will be written on next DCSR read) */
static int xscale_halt(target_t *target)
{
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
LOG_DEBUG("target->state: %s",
target_state_name(target));
static int xscale_enable_single_step(struct target_s *target, uint32_t next_pc)
{
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale= armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
reg_t *ibcr0 = &xscale->reg_cache->reg_list[XSCALE_IBCR0];
int retval;
static int xscale_disable_single_step(struct target_s *target)
{
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale= armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
reg_t *ibcr0 = &xscale->reg_cache->reg_list[XSCALE_IBCR0];
int retval;
static int xscale_resume(struct target_s *target, int current,
uint32_t address, int handle_breakpoints, int debug_execution)
{
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale= armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
+ struct armv4_5_common_s *armv4_5 = &xscale->armv4_5_common;
breakpoint_t *breakpoint = target->breakpoints;
-
uint32_t current_pc;
-
int retval;
int i;
LOG_DEBUG("target resumed");
- xscale->handler_running = 1;
-
return ERROR_OK;
}
static int xscale_step_inner(struct target_s *target, int current,
uint32_t address, int handle_breakpoints)
{
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
-
+ struct xscale_common_s *xscale = target_to_xscale(target);
+ struct armv4_5_common_s *armv4_5 = &xscale->armv4_5_common;
uint32_t next_pc;
int retval;
int i;
static int xscale_step(struct target_s *target, int current,
uint32_t address, int handle_breakpoints)
{
- armv4_5_common_t *armv4_5 = target->arch_info;
+ struct armv4_5_common_s *armv4_5 = target_to_armv4_5(target);
breakpoint_t *breakpoint = target->breakpoints;
uint32_t current_pc;
static int xscale_assert_reset(target_t *target)
{
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
LOG_DEBUG("target->state: %s",
target_state_name(target));
static int xscale_deassert_reset(target_t *target)
{
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
breakpoint_t *breakpoint = target->breakpoints;
LOG_DEBUG("-");
breakpoint = breakpoint->next;
}
- if (!xscale->handler_installed)
+ armv4_5_invalidate_core_regs(target);
+
+ /* FIXME mark hardware watchpoints got unset too. Also,
+ * at least some of the XScale registers are invalid...
+ */
+
+ /*
+ * REVISIT: *assumes* we had a SRST+TRST reset so the mini-icache
+ * contents got invalidated. Safer to force that, so writing new
+ * contents can't ever fail..
+ */
{
uint32_t address;
unsigned buf_cnt;
* it's using halt mode (not monitor mode), it runs in
* "Special Debug State" for access to registers, memory,
* coprocessors, trace data, etc.
- *
- * REVISIT: *assumes* we've had a SRST+TRST reset so the
- * mini-icache contents have been invalidated. Safest to
- * force that, so writing new contents is reliable...
*/
address = xscale->handler_address;
for (unsigned binary_size = sizeof xscale_debug_handler - 1;
xscale_resume(target, 1, 0x0, 1, 0);
}
}
- else
- {
- jtag_add_reset(0, 0);
- }
return ERROR_OK;
}
static int xscale_full_context(target_t *target)
{
- armv4_5_common_t *armv4_5 = target->arch_info;
+ struct armv4_5_common_s *armv4_5 = target_to_armv4_5(target);
uint32_t *buffer;
static int xscale_restore_context(target_t *target)
{
- armv4_5_common_t *armv4_5 = target->arch_info;
+ struct armv4_5_common_s *armv4_5 = target_to_armv4_5(target);
int i, j;
static int xscale_read_memory(struct target_s *target, uint32_t address,
uint32_t size, uint32_t count, uint8_t *buffer)
{
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
uint32_t *buf32;
uint32_t i;
int retval;
static int xscale_write_memory(struct target_s *target, uint32_t address,
uint32_t size, uint32_t count, uint8_t *buffer)
{
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
int retval;
LOG_DEBUG("address: 0x%8.8" PRIx32 ", size: 0x%8.8" PRIx32 ", count: 0x%8.8" PRIx32, address, size, count);
static uint32_t xscale_get_ttb(target_t *target)
{
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
uint32_t ttb;
xscale_get_reg(&xscale->reg_cache->reg_list[XSCALE_TTB]);
static void xscale_disable_mmu_caches(target_t *target, int mmu,
int d_u_cache, int i_cache)
{
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
uint32_t cp15_control;
/* read cp15 control register */
static void xscale_enable_mmu_caches(target_t *target, int mmu,
int d_u_cache, int i_cache)
{
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
uint32_t cp15_control;
/* read cp15 control register */
breakpoint_t *breakpoint)
{
int retval;
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
if (target->state != TARGET_HALTED)
{
static int xscale_add_breakpoint(struct target_s *target,
breakpoint_t *breakpoint)
{
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
if (target->state != TARGET_HALTED)
{
breakpoint_t *breakpoint)
{
int retval;
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
if (target->state != TARGET_HALTED)
{
static int xscale_remove_breakpoint(struct target_s *target, breakpoint_t *breakpoint)
{
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
if (target->state != TARGET_HALTED)
{
static int xscale_set_watchpoint(struct target_s *target,
watchpoint_t *watchpoint)
{
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
uint8_t enable = 0;
reg_t *dbcon = &xscale->reg_cache->reg_list[XSCALE_DBCON];
uint32_t dbcon_value = buf_get_u32(dbcon->value, 0, 32);
static int xscale_add_watchpoint(struct target_s *target,
watchpoint_t *watchpoint)
{
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
if (target->state != TARGET_HALTED)
{
static int xscale_unset_watchpoint(struct target_s *target,
watchpoint_t *watchpoint)
{
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
reg_t *dbcon = &xscale->reg_cache->reg_list[XSCALE_DBCON];
uint32_t dbcon_value = buf_get_u32(dbcon->value, 0, 32);
static int xscale_remove_watchpoint(struct target_s *target, watchpoint_t *watchpoint)
{
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
if (target->state != TARGET_HALTED)
{
{
xscale_reg_t *arch_info = reg->arch_info;
target_t *target = arch_info->target;
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
/* DCSR, TX and RX are accessible via JTAG */
if (strcmp(reg->name, "XSCALE_DCSR") == 0)
{
xscale_reg_t *arch_info = reg->arch_info;
target_t *target = arch_info->target;
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
uint32_t value = buf_get_u32(buf, 0, 32);
/* DCSR, TX and RX are accessible via JTAG */
static int xscale_write_dcsr_sw(target_t *target, uint32_t value)
{
- /* get pointers to arch-specific information */
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
reg_t *dcsr = &xscale->reg_cache->reg_list[XSCALE_DCSR];
xscale_reg_t *dcsr_arch_info = dcsr->arch_info;
static int xscale_read_trace(target_t *target)
{
- /* get pointers to arch-specific information */
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
+ struct armv4_5_common_s *armv4_5 = &xscale->armv4_5_common;
xscale_trace_data_t **trace_data_p;
/* 258 words from debug handler
static int xscale_read_instruction(target_t *target,
arm_instruction_t *instruction)
{
- /* get pointers to arch-specific information */
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
int i;
int section = -1;
uint32_t size_read;
static int xscale_analyze_trace(target_t *target, command_context_t *cmd_ctx)
{
- /* get pointers to arch-specific information */
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
int next_pc_ok = 0;
uint32_t next_pc = 0x0;
xscale_trace_data_t *trace_data = xscale->trace.data;
static void xscale_build_reg_cache(target_t *target)
{
- /* get pointers to arch-specific information */
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
-
+ struct xscale_common_s *xscale = target_to_xscale(target);
+ struct armv4_5_common_s *armv4_5 = &xscale->armv4_5_common;
reg_cache_t **cache_p = register_get_last_cache_p(&target->reg_cache);
xscale_reg_t *arch_info = malloc(sizeof(xscale_reg_arch_info));
int i;
return ERROR_OK;
}
-static int xscale_quit(void)
-{
- jtag_add_runtest(100, TAP_RESET);
- return ERROR_OK;
-}
-
static int xscale_init_arch_info(target_t *target,
- xscale_common_t *xscale, jtag_tap_t *tap, const char *variant)
+ xscale_common_t *xscale, struct jtag_tap *tap, const char *variant)
{
armv4_5_common_t *armv4_5;
uint32_t high_reset_branch, low_reset_branch;
armv4_5 = &xscale->armv4_5_common;
/* store architecture specfic data (none so far) */
- xscale->arch_info = NULL;
xscale->common_magic = XSCALE_COMMON_MAGIC;
/* we don't really *need* variant info ... */
}
/* the debug handler isn't installed (and thus not running) at this time */
- xscale->handler_installed = 0;
- xscale->handler_running = 0;
xscale->handler_address = 0xfe000800;
/* clear the vectors we keep locally for reference */
target->variant);
}
-static int
-xscale_handle_debug_handler_command(struct command_context_s *cmd_ctx,
- char *cmd, char **args, int argc)
+COMMAND_HANDLER(xscale_handle_debug_handler_command)
{
target_t *target = NULL;
- armv4_5_common_t *armv4_5;
xscale_common_t *xscale;
-
+ int retval;
uint32_t handler_address;
if (argc < 2)
return ERROR_FAIL;
}
- if (xscale_get_arch_pointers(target, &armv4_5, &xscale) != ERROR_OK)
- {
- return ERROR_FAIL;
- }
+ xscale = target_to_xscale(target);
+ retval = xscale_verify_pointer(cmd_ctx, xscale);
+ if (retval != ERROR_OK)
+ return retval;
- handler_address = strtoul(args[1], NULL, 0);
+ COMMAND_PARSE_NUMBER(u32, args[1], handler_address);
if (((handler_address >= 0x800) && (handler_address <= 0x1fef800)) ||
((handler_address >= 0xfe000800) && (handler_address <= 0xfffff800)))
return ERROR_OK;
}
-static int
-xscale_handle_cache_clean_address_command(struct command_context_s *cmd_ctx,
- char *cmd, char **args, int argc)
+COMMAND_HANDLER(xscale_handle_cache_clean_address_command)
{
target_t *target = NULL;
- armv4_5_common_t *armv4_5;
xscale_common_t *xscale;
-
+ int retval;
uint32_t cache_clean_address;
if (argc < 2)
LOG_ERROR("target '%s' not defined", args[0]);
return ERROR_FAIL;
}
+ xscale = target_to_xscale(target);
+ retval = xscale_verify_pointer(cmd_ctx, xscale);
+ if (retval != ERROR_OK)
+ return retval;
- if (xscale_get_arch_pointers(target, &armv4_5, &xscale) != ERROR_OK)
- {
- return ERROR_FAIL;
- }
-
- cache_clean_address = strtoul(args[1], NULL, 0);
+ COMMAND_PARSE_NUMBER(u32, args[1], cache_clean_address);
if (cache_clean_address & 0xffff)
{
return ERROR_OK;
}
-static int
-xscale_handle_cache_info_command(struct command_context_s *cmd_ctx,
- char *cmd, char **args, int argc)
+COMMAND_HANDLER(xscale_handle_cache_info_command)
{
target_t *target = get_current_target(cmd_ctx);
- armv4_5_common_t *armv4_5;
- xscale_common_t *xscale;
+ struct xscale_common_s *xscale = target_to_xscale(target);
+ int retval;
- if (xscale_get_arch_pointers(target, &armv4_5, &xscale) != ERROR_OK)
- {
- return ERROR_OK;
- }
+ retval = xscale_verify_pointer(cmd_ctx, xscale);
+ if (retval != ERROR_OK)
+ return retval;
return armv4_5_handle_cache_info_command(cmd_ctx, &xscale->armv4_5_mmu.armv4_5_cache);
}
static int xscale_virt2phys(struct target_s *target,
uint32_t virtual, uint32_t *physical)
{
- armv4_5_common_t *armv4_5;
- xscale_common_t *xscale;
- int retval;
+ struct xscale_common_s *xscale = target_to_xscale(target);
int type;
uint32_t cb;
int domain;
uint32_t ap;
- if ((retval = xscale_get_arch_pointers(target, &armv4_5, &xscale)) != ERROR_OK)
- {
- return retval;
+ if (xscale->common_magic != XSCALE_COMMON_MAGIC) {
+ LOG_ERROR(xscale_not);
+ return ERROR_TARGET_INVALID;
}
+
uint32_t ret = armv4_5_mmu_translate_va(target, &xscale->armv4_5_mmu, virtual, &type, &cb, &domain, &ap);
if (type == -1)
{
static int xscale_mmu(struct target_s *target, int *enabled)
{
- armv4_5_common_t *armv4_5 = target->arch_info;
- xscale_common_t *xscale = armv4_5->arch_info;
+ struct xscale_common_s *xscale = target_to_xscale(target);
if (target->state != TARGET_HALTED)
{
return ERROR_OK;
}
-static int xscale_handle_mmu_command(command_context_t *cmd_ctx,
- char *cmd, char **args, int argc)
+COMMAND_HANDLER(xscale_handle_mmu_command)
{
target_t *target = get_current_target(cmd_ctx);
- armv4_5_common_t *armv4_5;
- xscale_common_t *xscale;
+ struct xscale_common_s *xscale = target_to_xscale(target);
+ int retval;
- if (xscale_get_arch_pointers(target, &armv4_5, &xscale) != ERROR_OK)
- {
- return ERROR_OK;
- }
+ retval = xscale_verify_pointer(cmd_ctx, xscale);
+ if (retval != ERROR_OK)
+ return retval;
if (target->state != TARGET_HALTED)
{
- command_print(cmd_ctx, "target must be stopped for \"%s\" command", cmd);
+ command_print(cmd_ctx, "target must be stopped for \"%s\" command", CMD_NAME);
return ERROR_OK;
}
return ERROR_OK;
}
-static int xscale_handle_idcache_command(command_context_t *cmd_ctx,
- char *cmd, char **args, int argc)
+COMMAND_HANDLER(xscale_handle_idcache_command)
{
target_t *target = get_current_target(cmd_ctx);
- armv4_5_common_t *armv4_5;
- xscale_common_t *xscale;
+ struct xscale_common_s *xscale = target_to_xscale(target);
int icache = 0, dcache = 0;
+ int retval;
- if (xscale_get_arch_pointers(target, &armv4_5, &xscale) != ERROR_OK)
- {
- return ERROR_OK;
- }
+ retval = xscale_verify_pointer(cmd_ctx, xscale);
+ if (retval != ERROR_OK)
+ return retval;
if (target->state != TARGET_HALTED)
{
- command_print(cmd_ctx, "target must be stopped for \"%s\" command", cmd);
+ command_print(cmd_ctx, "target must be stopped for \"%s\" command", CMD_NAME);
return ERROR_OK;
}
- if (strcmp(cmd, "icache") == 0)
+ if (strcmp(CMD_NAME, "icache") == 0)
icache = 1;
- else if (strcmp(cmd, "dcache") == 0)
+ else if (strcmp(CMD_NAME, "dcache") == 0)
dcache = 1;
if (argc >= 1)
return ERROR_OK;
}
-static int xscale_handle_vector_catch_command(command_context_t *cmd_ctx,
- char *cmd, char **args, int argc)
+COMMAND_HANDLER(xscale_handle_vector_catch_command)
{
target_t *target = get_current_target(cmd_ctx);
- armv4_5_common_t *armv4_5;
- xscale_common_t *xscale;
+ struct xscale_common_s *xscale = target_to_xscale(target);
+ int retval;
- if (xscale_get_arch_pointers(target, &armv4_5, &xscale) != ERROR_OK)
- {
- return ERROR_OK;
- }
+ retval = xscale_verify_pointer(cmd_ctx, xscale);
+ if (retval != ERROR_OK)
+ return retval;
if (argc < 1)
{
}
else
{
- xscale->vector_catch = strtoul(args[0], NULL, 0);
+ COMMAND_PARSE_NUMBER(u8, args[0], xscale->vector_catch);
buf_set_u32(xscale->reg_cache->reg_list[XSCALE_DCSR].value, 16, 8, xscale->vector_catch);
xscale_write_dcsr(target, -1, -1);
}
}
-static int xscale_handle_vector_table_command(command_context_t *cmd_ctx,
- char *cmd, char **args, int argc)
+COMMAND_HANDLER(xscale_handle_vector_table_command)
{
target_t *target = get_current_target(cmd_ctx);
- armv4_5_common_t *armv4_5;
- xscale_common_t *xscale;
+ struct xscale_common_s *xscale = target_to_xscale(target);
int err = 0;
+ int retval;
- if (xscale_get_arch_pointers(target, &armv4_5, &xscale) != ERROR_OK)
- {
- return ERROR_OK;
- }
+ retval = xscale_verify_pointer(cmd_ctx, xscale);
+ if (retval != ERROR_OK)
+ return retval;
if (argc == 0) /* print current settings */
{
else
{
int idx;
+ COMMAND_PARSE_NUMBER(int, args[1], idx);
uint32_t vec;
- idx = strtoul(args[1], NULL, 0);
- vec = strtoul(args[2], NULL, 0);
+ COMMAND_PARSE_NUMBER(u32, args[2], vec);
if (idx < 1 || idx >= 8)
err = 1;
}
-static int
-xscale_handle_trace_buffer_command(struct command_context_s *cmd_ctx,
- char *cmd, char **args, int argc)
+COMMAND_HANDLER(xscale_handle_trace_buffer_command)
{
target_t *target = get_current_target(cmd_ctx);
- armv4_5_common_t *armv4_5;
- xscale_common_t *xscale;
+ struct xscale_common_s *xscale = target_to_xscale(target);
+ struct armv4_5_common_s *armv4_5 = &xscale->armv4_5_common;
uint32_t dcsr_value;
+ int retval;
- if (xscale_get_arch_pointers(target, &armv4_5, &xscale) != ERROR_OK)
- {
- return ERROR_OK;
- }
+ retval = xscale_verify_pointer(cmd_ctx, xscale);
+ if (retval != ERROR_OK)
+ return retval;
if (target->state != TARGET_HALTED)
{
- command_print(cmd_ctx, "target must be stopped for \"%s\" command", cmd);
+ command_print(cmd_ctx, "target must be stopped for \"%s\" command", CMD_NAME);
return ERROR_OK;
}
if ((argc >= 2) && (strcmp("fill", args[1]) == 0))
{
+ uint32_t fill = 1;
if (argc >= 3)
- xscale->trace.buffer_fill = strtoul(args[2], NULL, 0);
- else
- xscale->trace.buffer_fill = 1;
+ COMMAND_PARSE_NUMBER(u32, args[2], fill);
+ xscale->trace.buffer_fill = fill;
}
else if ((argc >= 2) && (strcmp("wrap", args[1]) == 0))
{
return ERROR_OK;
}
-static int
-xscale_handle_trace_image_command(struct command_context_s *cmd_ctx,
- char *cmd, char **args, int argc)
+COMMAND_HANDLER(xscale_handle_trace_image_command)
{
- target_t *target;
- armv4_5_common_t *armv4_5;
- xscale_common_t *xscale;
+ target_t *target = get_current_target(cmd_ctx);
+ struct xscale_common_s *xscale = target_to_xscale(target);
+ int retval;
if (argc < 1)
{
return ERROR_OK;
}
- target = get_current_target(cmd_ctx);
-
- if (xscale_get_arch_pointers(target, &armv4_5, &xscale) != ERROR_OK)
- {
- return ERROR_OK;
- }
+ retval = xscale_verify_pointer(cmd_ctx, xscale);
+ if (retval != ERROR_OK)
+ return retval;
if (xscale->trace.image)
{
if (argc >= 2)
{
xscale->trace.image->base_address_set = 1;
- xscale->trace.image->base_address = strtoul(args[1], NULL, 0);
+ COMMAND_PARSE_NUMBER(int, args[1], xscale->trace.image->base_address);
}
else
{
return ERROR_OK;
}
-static int xscale_handle_dump_trace_command(struct command_context_s *cmd_ctx,
- char *cmd, char **args, int argc)
+COMMAND_HANDLER(xscale_handle_dump_trace_command)
{
target_t *target = get_current_target(cmd_ctx);
- armv4_5_common_t *armv4_5;
- xscale_common_t *xscale;
+ struct xscale_common_s *xscale = target_to_xscale(target);
xscale_trace_data_t *trace_data;
- fileio_t file;
+ struct fileio file;
+ int retval;
- if (xscale_get_arch_pointers(target, &armv4_5, &xscale) != ERROR_OK)
- {
- return ERROR_OK;
- }
+ retval = xscale_verify_pointer(cmd_ctx, xscale);
+ if (retval != ERROR_OK)
+ return retval;
if (target->state != TARGET_HALTED)
{
- command_print(cmd_ctx, "target must be stopped for \"%s\" command", cmd);
+ command_print(cmd_ctx, "target must be stopped for \"%s\" command", CMD_NAME);
return ERROR_OK;
}
return ERROR_OK;
}
-static int
-xscale_handle_analyze_trace_buffer_command(struct command_context_s *cmd_ctx,
- char *cmd, char **args, int argc)
+COMMAND_HANDLER(xscale_handle_analyze_trace_buffer_command)
{
target_t *target = get_current_target(cmd_ctx);
- armv4_5_common_t *armv4_5;
- xscale_common_t *xscale;
+ struct xscale_common_s *xscale = target_to_xscale(target);
+ int retval;
- if (xscale_get_arch_pointers(target, &armv4_5, &xscale) != ERROR_OK)
- {
- return ERROR_OK;
- }
+ retval = xscale_verify_pointer(cmd_ctx, xscale);
+ if (retval != ERROR_OK)
+ return retval;
xscale_analyze_trace(target, cmd_ctx);
return ERROR_OK;
}
-static int xscale_handle_cp15(command_context_t *cmd_ctx,
- char *cmd, char **args, int argc)
+COMMAND_HANDLER(xscale_handle_cp15)
{
target_t *target = get_current_target(cmd_ctx);
- armv4_5_common_t *armv4_5;
- xscale_common_t *xscale;
+ struct xscale_common_s *xscale = target_to_xscale(target);
+ int retval;
- if (xscale_get_arch_pointers(target, &armv4_5, &xscale) != ERROR_OK)
- {
- return ERROR_OK;
- }
+ retval = xscale_verify_pointer(cmd_ctx, xscale);
+ if (retval != ERROR_OK)
+ return retval;
if (target->state != TARGET_HALTED)
{
- command_print(cmd_ctx, "target must be stopped for \"%s\" command", cmd);
+ command_print(cmd_ctx, "target must be stopped for \"%s\" command", CMD_NAME);
return ERROR_OK;
}
uint32_t reg_no = 0;
reg_t *reg = NULL;
if (argc > 0)
{
- reg_no = strtoul(args[0], NULL, 0);
+ COMMAND_PARSE_NUMBER(u32, args[0], reg_no);
/*translate from xscale cp15 register no to openocd register*/
switch (reg_no)
{
}
else if (argc == 2)
{
-
- uint32_t value = strtoul(args[1], NULL, 0);
+ uint32_t value;
+ COMMAND_PARSE_NUMBER(u32, args[1], value);
/* send CP write request (command 0x41) */
xscale_send_u32(target, 0x41);
.register_commands = xscale_register_commands,
.target_create = xscale_target_create,
.init_target = xscale_init_target,
- .quit = xscale_quit,
.virt2phys = xscale_virt2phys,
.mmu = xscale_mmu
projects / fw / openocd / blobdiff