explode tcl_target_func into many handlers

[openocd.git] / src / target / xscale.c

diff --git a/src/target/xscale.c b/src/target/xscale.c
index 965ac52e732a7ba9d92063873fdb95b728b83c55..49653a96ee755a32130ae31307d3a871507b3171 100644 (file)
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -412,7 +412,7 @@ static int xscale_read_tx(struct target *target, int consume)
                        jtag_add_pathmove(3, path);
                else
                {
-                       jtag_add_pathmove(sizeof(noconsume_path)/sizeof(*noconsume_path), noconsume_path);
+                       jtag_add_pathmove(ARRAY_SIZE(noconsume_path), noconsume_path);
                }
 
                jtag_add_dr_scan(3, fields, jtag_set_end_state(TAP_IDLE));
@@ -1881,6 +1881,15 @@ static int xscale_read_memory(struct target *target, uint32_t address,
        return ERROR_OK;
 }
 
+static int xscale_read_phys_memory(struct target *target, uint32_t address,
+               uint32_t size, uint32_t count, uint8_t *buffer)
+{
+       /** \todo: provide a non-stub implementtion of this routine. */
+       LOG_ERROR("%s: %s is not implemented.  Disable MMU?",
+                       target_name(target), __func__);
+       return ERROR_FAIL;
+}
+
 static int xscale_write_memory(struct target *target, uint32_t address,
                uint32_t size, uint32_t count, uint8_t *buffer)
 {
@@ -1959,6 +1968,15 @@ static int xscale_write_memory(struct target *target, uint32_t address,
        return ERROR_OK;
 }
 
+static int xscale_write_phys_memory(struct target *target, uint32_t address,
+               uint32_t size, uint32_t count, uint8_t *buffer)
+{
+       /** \todo: provide a non-stub implementtion of this routine. */
+       LOG_ERROR("%s: %s is not implemented.  Disable MMU?",
+                       target_name(target), __func__);
+       return ERROR_FAIL;
+}
+
 static int xscale_bulk_write_memory(struct target *target, uint32_t address,
                uint32_t count, uint8_t *buffer)
 {
@@ -2119,12 +2137,6 @@ static int xscale_add_breakpoint(struct target *target,
 {
        struct xscale_common *xscale = target_to_xscale(target);
 
-       if (target->state != TARGET_HALTED)
-       {
-               LOG_WARNING("target not halted");
-               return ERROR_TARGET_NOT_HALTED;
-       }
-
        if ((breakpoint->type == BKPT_HARD) && (xscale->ibcr_available < 1))
        {
                LOG_INFO("no breakpoint unit available for hardware breakpoint");
@@ -2282,12 +2294,6 @@ static int xscale_add_watchpoint(struct target *target,
 {
        struct xscale_common *xscale = target_to_xscale(target);
 
-       if (target->state != TARGET_HALTED)
-       {
-               LOG_WARNING("target not halted");
-               return ERROR_TARGET_NOT_HALTED;
-       }
-
        if (xscale->dbr_available < 1)
        {
                return ERROR_TARGET_RESOURCE_NOT_AVAILABLE;
@@ -2825,7 +2831,7 @@ static void xscale_build_reg_cache(struct target *target)
        struct reg_cache **cache_p = register_get_last_cache_p(&target->reg_cache);
        struct xscale_reg *arch_info = malloc(sizeof(xscale_reg_arch_info));
        int i;
-       int num_regs = sizeof(xscale_reg_arch_info) / sizeof(struct xscale_reg);
+       int num_regs = ARRAY_SIZE(xscale_reg_arch_info);
 
        (*cache_p) = armv4_5_build_reg_cache(target, armv4_5);
 
@@ -3652,6 +3658,9 @@ static const struct command_registration xscale_any_command_handlers[] = {
        COMMAND_REGISTRATION_DONE
 };
 static const struct command_registration xscale_command_handlers[] = {
+       {
+               .chain = arm_command_handlers,
+       },
        {
                .name = "xscale",
                .mode = COMMAND_ANY,
@@ -3661,14 +3670,6 @@ static const struct command_registration xscale_command_handlers[] = {
        COMMAND_REGISTRATION_DONE
 };
 
-static int xscale_register_commands(struct command_context *cmd_ctx)
-{
-
-       armv4_5_register_commands(cmd_ctx);
-
-       return ERROR_OK;
-}
-
 struct target_type xscale_target =
 {
        .name = "xscale",
@@ -3689,7 +3690,9 @@ struct target_type xscale_target =
        .get_gdb_reg_list = armv4_5_get_gdb_reg_list,
 
        .read_memory = xscale_read_memory,
+       .read_phys_memory = xscale_read_phys_memory,
        .write_memory = xscale_write_memory,
+       .write_phys_memory = xscale_write_phys_memory,
        .bulk_write_memory = xscale_bulk_write_memory,
 
        .checksum_memory = arm_checksum_memory,
@@ -3702,7 +3705,7 @@ struct target_type xscale_target =
        .add_watchpoint = xscale_add_watchpoint,
        .remove_watchpoint = xscale_remove_watchpoint,
 
-       .register_commands = xscale_register_commands,
+       .commands = xscale_command_handlers,
        .target_create = xscale_target_create,
        .init_target = xscale_init_target,