- fixed target->type->poll() return value

- added arch_state to show status of currently selected target
- simplified target->type->arch_state() api.
- clean up telnet output a bit
- fixed GDB output for arch_state
- removed a couple of unecessary exit()'s
- cleaned up error propagation a bit in a few places

git-svn-id: svn://svn.berlios.de/openocd/trunk@332 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c
index e84d0454b0c2b0b21ce47c21983e80082422d3a4..b40daca8a1b266ab17f4bc094ecddf9d81e158e7 100644 (file)
--- a/src/server/telnet_server.c
+++ b/src/server/telnet_server.c
@@ -93,10 +93,21 @@ void telnet_log_callback(void *priv, const char *file, int line,
 {
        connection_t *connection = priv;
        char *t = allocPrintf(format, args);
+       char *t2;
        if (t == NULL)
                return;
+       t2=t;
+       char *endline;
+       do 
+       {
+               if ((endline=strchr(t2, '\n'))!=NULL)
+               {
+                       *endline=0;
+               }
+               telnet_outputline(connection, t2);
+               t2=endline+1;
+       } while (endline);
        
-       telnet_outputline(connection, t);
        
        free(t);
 }
@@ -106,15 +117,12 @@ int telnet_target_callback_event_handler(struct target_s *target, enum target_ev
        struct command_context_s *cmd_ctx = priv;
        connection_t *connection = cmd_ctx->output_handler_priv;
        telnet_connection_t *t_con = connection->priv;
-       char buffer[512];
        
        switch (event)
        {
                case TARGET_EVENT_HALTED:
                        command_print(cmd_ctx, "Target %i halted", get_num_by_target(target));
-                       target->type->arch_state(target, buffer, 512);
-                       buffer[511] = 0;
-                       command_print(cmd_ctx, "%s", buffer);
+                       target_arch_state(target);
                        if (!t_con->suppress_prompt)
                                telnet_prompt(connection);
                        break;

diff --git a/src/target/arm720t.c b/src/target/arm720t.c
index 05cc30f4cecccbce0827a72794b60ecf276e6cd5..62b70e3b6a657aa5c734d7ec20495d0aad8d439d 100644 (file)
--- a/src/target/arm720t.c
+++ b/src/target/arm720t.c
@@ -44,7 +44,7 @@ int arm720t_handle_mw_phys_command(struct command_context_s *cmd_ctx, char *cmd,
 int arm720t_target_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct target_s *target);
 int arm720t_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
 int arm720t_quit();
-int arm720t_arch_state(struct target_s *target, char *buf, int buf_size);
+int arm720t_arch_state(struct target_s *target);
 int arm720t_read_memory(struct target_s *target, u32 address, u32 size, u32 count, u8 *buffer);
 int arm720t_write_memory(struct target_s *target, u32 address, u32 size, u32 count, u8 *buffer);
 int arm720t_soft_reset_halt(struct target_s *target);
@@ -297,7 +297,7 @@ int arm720t_get_arch_pointers(target_t *target, armv4_5_common_t **armv4_5_p, ar
        return ERROR_OK;
 }
 
-int arm720t_arch_state(struct target_s *target, char *buf, int buf_size)
+int arm720t_arch_state(struct target_s *target)
 {
        armv4_5_common_t *armv4_5 = target->arch_info;
        arm7_9_common_t *arm7_9 = armv4_5->arch_info;
@@ -315,8 +315,7 @@ int arm720t_arch_state(struct target_s *target, char *buf, int buf_size)
                exit(-1);
        }
        
-       snprintf(buf, buf_size,
-                       "target halted in %s state due to %s, current mode: %s\n"
+       USER("target halted in %s state due to %s, current mode: %s\n"
                        "cpsr: 0x%8.8x pc: 0x%8.8x\n"
                        "MMU: %s, Cache: %s",
                         armv4_5_state_strings[armv4_5->core_state],

diff --git a/src/target/arm7_9_common.c b/src/target/arm7_9_common.c
index 3a0eb7b0865a375e373721ddce5c27f6a907c75e..2a149425be613df70eb6cf9e90aa434f43b59f92 100644 (file)
--- a/src/target/arm7_9_common.c
+++ b/src/target/arm7_9_common.c
@@ -676,7 +676,7 @@ int arm7_9_handle_target_request(void *priv)
        return ERROR_OK;
 }
 
-enum target_state arm7_9_poll(target_t *target)
+int arm7_9_poll(target_t *target)\r
 {
        int retval;
        armv4_5_common_t *armv4_5 = target->arch_info;
@@ -692,24 +692,15 @@ enum target_state arm7_9_poll(target_t *target)
        embeddedice_read_reg(dbg_stat);
        if ((retval = jtag_execute_queue()) != ERROR_OK)
        {
-               switch (retval)
-               {
-                       case ERROR_JTAG_QUEUE_FAILED:
-                               ERROR("JTAG queue failed while reading EmbeddedICE status register");
-                               exit(-1);
-                               break;
-                       default:
-                               break;
-               }
+               return retval;\r
        }
        
        if (buf_get_u32(dbg_stat->value, EICE_DBG_STATUS_DBGACK, 1))
        {
                DEBUG("DBGACK set, dbg_state->value: 0x%x", buf_get_u32(dbg_stat->value, 0, 32));
-               if ((target->state == TARGET_UNKNOWN))
+               if (target->state == TARGET_UNKNOWN)\r
                {
-                       WARNING("DBGACK set while target was in unknown state. Reset or initialize target before resuming");
-                       target->state = TARGET_RUNNING;
+                       WARNING("DBGACK set while target was in unknown state. Reset or initialize target.");\r
                }
                if ((target->state == TARGET_RUNNING) || (target->state == TARGET_RESET))
                {
@@ -727,14 +718,18 @@ enum target_state arm7_9_poll(target_t *target)
                        
                        target_call_event_callbacks(target, TARGET_EVENT_DEBUG_HALTED);
                }
-       }
+               if (target->state != TARGET_HALTED)\r
+               {\r
+                       WARNING("DBGACK set, but the target did not end up in the halted stated %d", target->state);\r
+               }
+       }\r
        else
        {
                if (target->state != TARGET_DEBUG_RUNNING)
                        target->state = TARGET_RUNNING;
        }
        
-       return target->state;
+       return ERROR_OK;\r
 }
 
 int arm7_9_assert_reset(target_t *target)
@@ -1307,7 +1302,6 @@ int arm7_9_restore_context(target_t *target)
                                else
                                {
                                        ERROR("BUG: dirty register '%s', but no valid data", reg->name);
-                                       exit(-1);
                                }
                        }
                }

diff --git a/src/target/arm7_9_common.h b/src/target/arm7_9_common.h
index 01b9242a5e301db6a605f5c839d1268f040fd5dc..b95516e6e5b96f4b6dd13ca808dd580c084bb0bb 100644 (file)
--- a/src/target/arm7_9_common.h
+++ b/src/target/arm7_9_common.h
@@ -101,7 +101,7 @@ typedef struct arm7_9_common_s
 
 int arm7_9_register_commands(struct command_context_s *cmd_ctx);
 
-enum target_state arm7_9_poll(target_t *target);
+int arm7_9_poll(target_t *target);
 
 int arm7_9_target_request_data(target_t *target, u32 size, u8 *buffer);
 

diff --git a/src/target/arm7tdmi.c b/src/target/arm7tdmi.c
index 9a9a2450595ba0a85e87a19e90e81ee8d174e2a5..c308380a6a160960581896e84c5e7a0f99ad2b77 100644 (file)
--- a/src/target/arm7tdmi.c
+++ b/src/target/arm7tdmi.c
@@ -49,7 +49,7 @@ int arm7tdmi_init_target(struct command_context_s *cmd_ctx, struct target_s *tar
 int arm7tdmi_quit();
 
 /* target function declarations */
-enum target_state arm7tdmi_poll(struct target_s *target);
+int arm7tdmi_poll(struct target_s *target);
 int arm7tdmi_halt(target_t *target);
                
 target_type_t arm7tdmi_target =

diff --git a/src/target/arm920t.c b/src/target/arm920t.c
index ef95581008ea365d879dc48a236ac1af8ba2f3f2..bf159dbeb388606d488fee6f4a98b32ab41df9a6 100644 (file)
--- a/src/target/arm920t.c
+++ b/src/target/arm920t.c
@@ -49,7 +49,7 @@ int arm920t_handle_read_mmu_command(struct command_context_s *cmd_ctx, char *cmd
 int arm920t_target_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct target_s *target);
 int arm920t_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
 int arm920t_quit();
-int arm920t_arch_state(struct target_s *target, char *buf, int buf_size);
+int arm920t_arch_state(struct target_s *target);
 int arm920t_read_memory(struct target_s *target, u32 address, u32 size, u32 count, u8 *buffer);
 int arm920t_write_memory(struct target_s *target, u32 address, u32 size, u32 count, u8 *buffer);
 int arm920t_soft_reset_halt(struct target_s *target);
@@ -536,7 +536,7 @@ int arm920t_get_arch_pointers(target_t *target, armv4_5_common_t **armv4_5_p, ar
        return ERROR_OK;
 }
 
-int arm920t_arch_state(struct target_s *target, char *buf, int buf_size)
+int arm920t_arch_state(struct target_s *target)
 {
        armv4_5_common_t *armv4_5 = target->arch_info;
        arm7_9_common_t *arm7_9 = armv4_5->arch_info;
@@ -554,8 +554,7 @@ int arm920t_arch_state(struct target_s *target, char *buf, int buf_size)
                exit(-1);
        }
        
-       snprintf(buf, buf_size,
-                       "target halted in %s state due to %s, current mode: %s\n"
+       USER(   "target halted in %s state due to %s, current mode: %s\n"
                        "cpsr: 0x%8.8x pc: 0x%8.8x\n"
                        "MMU: %s, D-Cache: %s, I-Cache: %s",
                         armv4_5_state_strings[armv4_5->core_state],

diff --git a/src/target/arm926ejs.c b/src/target/arm926ejs.c
index ba974eb975184ca1ba969c471b265d355dae1c79..10061530019e61a0c0d5a117cd20d729c3891e09 100644 (file)
--- a/src/target/arm926ejs.c
+++ b/src/target/arm926ejs.c
@@ -49,7 +49,7 @@ int arm926ejs_handle_read_mmu_command(struct command_context_s *cmd_ctx, char *c
 int arm926ejs_target_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc, struct target_s *target);
 int arm926ejs_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
 int arm926ejs_quit();
-int arm926ejs_arch_state(struct target_s *target, char *buf, int buf_size);
+int arm926ejs_arch_state(struct target_s *target);
 int arm926ejs_read_memory(struct target_s *target, u32 address, u32 size, u32 count, u8 *buffer);
 int arm926ejs_write_memory(struct target_s *target, u32 address, u32 size, u32 count, u8 *buffer);
 int arm926ejs_soft_reset_halt(struct target_s *target);
@@ -530,7 +530,7 @@ int arm926ejs_get_arch_pointers(target_t *target, armv4_5_common_t **armv4_5_p,
        return ERROR_OK;
 }
 
-int arm926ejs_arch_state(struct target_s *target, char *buf, int buf_size)
+int arm926ejs_arch_state(struct target_s *target)
 {
        armv4_5_common_t *armv4_5 = target->arch_info;
        arm7_9_common_t *arm7_9 = armv4_5->arch_info;
@@ -548,7 +548,7 @@ int arm926ejs_arch_state(struct target_s *target, char *buf, int buf_size)
                exit(-1);
        }
        
-       snprintf(buf, buf_size,
+       USER(
                        "target halted in %s state due to %s, current mode: %s\n"
                        "cpsr: 0x%8.8x pc: 0x%8.8x\n"
                        "MMU: %s, D-Cache: %s, I-Cache: %s",

diff --git a/src/target/arm926ejs.h b/src/target/arm926ejs.h
index 65e67c5d610e5f2dcbbede4ca31169983ecb2d8b..178fc2298e9d18c7c6ce815dec970006967cd43b 100644 (file)
--- a/src/target/arm926ejs.h
+++ b/src/target/arm926ejs.h
@@ -45,7 +45,7 @@ typedef struct arm926ejs_common_s
 
 extern int arm926ejs_init_arch_info(target_t *target, arm926ejs_common_t *arm926ejs, int chain_pos, char *variant);
 extern int arm926ejs_register_commands(struct command_context_s *cmd_ctx); 
-extern int arm926ejs_arch_state(struct target_s *target, char *buf, int buf_size); 
+extern int arm926ejs_arch_state(struct target_s *target); 
 extern int arm926ejs_write_memory(struct target_s *target, u32 address, u32 size, u32 count, u8 *buffer); 
 extern int arm926ejs_soft_reset_halt(struct target_s *target);
 

diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c
index 02a731cac423e4ad627abae066eb822ce24341e6..2528f1072cfc875996b905b4104c745de9772248 100644 (file)
--- a/src/target/armv4_5.c
+++ b/src/target/armv4_5.c
@@ -322,7 +322,7 @@ reg_cache_t* armv4_5_build_reg_cache(target_t *target, armv4_5_common_t *armv4_5
        return cache;
 }
 
-int armv4_5_arch_state(struct target_s *target, char *buf, int buf_size)
+int armv4_5_arch_state(struct target_s *target)
 {
        armv4_5_common_t *armv4_5 = target->arch_info;
        
@@ -332,8 +332,7 @@ int armv4_5_arch_state(struct target_s *target, char *buf, int buf_size)
                exit(-1);
        }
        
-       snprintf(buf, buf_size,
-                        "target halted in %s state due to %s, current mode: %s\ncpsr: 0x%8.8x pc: 0x%8.8x",
+       USER("target halted in %s state due to %s, current mode: %s\ncpsr: 0x%8.8x pc: 0x%8.8x",
                         armv4_5_state_strings[armv4_5->core_state],
                         target_debug_reason_strings[target->debug_reason],
                         armv4_5_mode_strings[armv4_5_mode_to_number(armv4_5->core_mode)],

diff --git a/src/target/armv4_5.h b/src/target/armv4_5.h
index 36264f3583bcb5c29b4f20bfa6a0da71207352f2..f04a41137fdeb0dd54103ee730bb4db1fc0885e7 100644 (file)
--- a/src/target/armv4_5.h
+++ b/src/target/armv4_5.h
@@ -98,7 +98,7 @@ extern reg_cache_t* armv4_5_build_reg_cache(target_t *target, armv4_5_common_t *
 extern enum armv4_5_mode armv4_5_number_to_mode(int number);
 extern int armv4_5_mode_to_number(enum armv4_5_mode mode);
 
-extern int armv4_5_arch_state(struct target_s *target, char *buf, int buf_size);
+extern int armv4_5_arch_state(struct target_s *target);
 extern int armv4_5_get_gdb_reg_list(target_t *target, reg_t **reg_list[], int *reg_list_size);
 extern int armv4_5_invalidate_core_regs(target_t *target);
 

diff --git a/src/target/cortex_m3.c b/src/target/cortex_m3.c
index db9dd0547fa7e24214cc1b02cb006f62803a5edc..bdb405039df0590441d3f8674494a62748c4401c 100644 (file)
--- a/src/target/cortex_m3.c
+++ b/src/target/cortex_m3.c
@@ -348,7 +348,7 @@ int cortex_m3_debug_entry(target_t *target)
        return ERROR_OK;
 }
 
-enum target_state cortex_m3_poll(target_t *target)
+int cortex_m3_poll(target_t *target)
 {
        int retval;
        u32 prev_target_state = target->state;
@@ -363,7 +363,7 @@ enum target_state cortex_m3_poll(target_t *target)
        if (retval != ERROR_OK)
        {
                target->state = TARGET_UNKNOWN;
-               return TARGET_UNKNOWN;
+               return retval;
        }
        
        if (cortex_m3->dcb_dhcsr & S_RESET_ST)
@@ -374,7 +374,7 @@ enum target_state cortex_m3_poll(target_t *target)
                if (cortex_m3->dcb_dhcsr & S_RESET_ST)
                {
                        target->state = TARGET_RESET;
-                       return target->state;
+                       return ERROR_OK;
                }
        }
        
@@ -394,7 +394,7 @@ enum target_state cortex_m3_poll(target_t *target)
                if ((prev_target_state == TARGET_RUNNING) || (prev_target_state == TARGET_RESET))
                {
                        if ((retval = cortex_m3_debug_entry(target)) != ERROR_OK)
-                               return TARGET_UNKNOWN;
+                               return retval;
                        
                        target_call_event_callbacks(target, TARGET_EVENT_HALTED);
                }
@@ -402,7 +402,7 @@ enum target_state cortex_m3_poll(target_t *target)
                {
                        DEBUG(" ");
                        if ((retval = cortex_m3_debug_entry(target)) != ERROR_OK)
-                               return TARGET_UNKNOWN;
+                               return retval;
 
                        target_call_event_callbacks(target, TARGET_EVENT_DEBUG_HALTED);
                }
@@ -416,7 +416,7 @@ enum target_state cortex_m3_poll(target_t *target)
     /* Read Debug Fault Status Register, added to figure out the lockup when running flashtest.script  */
     ahbap_read_system_atomic_u32(swjdp, NVIC_DFSR, &cortex_m3->nvic_dfsr);
        DEBUG("dcb_dhcsr 0x%x, nvic_dfsr 0x%x, target->state: %s", cortex_m3->dcb_dhcsr, cortex_m3->nvic_dfsr, target_state_strings[target->state]);    
-       return target->state;
+       return ERROR_OK;
 }
 
 int cortex_m3_halt(target_t *target)

diff --git a/src/target/cortex_m3.h b/src/target/cortex_m3.h
index 7932dff861a1926fb5798d7bf662b6e8371a953a..0ed3b0adb1d26b04615cd6b54551dcfdce1c1950 100644 (file)
--- a/src/target/cortex_m3.h
+++ b/src/target/cortex_m3.h
@@ -189,7 +189,7 @@ typedef struct cortex_m3_common_s
 
 extern void cortex_m3_build_reg_cache(target_t *target);
 
-enum target_state cortex_m3_poll(target_t *target);
+int cortex_m3_poll(target_t *target);
 int cortex_m3_halt(target_t *target);
 int cortex_m3_resume(struct target_s *target, int current, u32 address, int handle_breakpoints, int debug_execution);
 int cortex_m3_step(struct target_s *target, int current, u32 address, int handle_breakpoints);

diff --git a/src/target/target.c b/src/target/target.c
index ce2d08564307bee2d72b4ba2472f231c943aeb48..fc1adb096ac2e2478d6d3777bc9d1b524d31c8e3 100644 (file)
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -49,6 +49,8 @@
 
 int cli_target_callback_event_handler(struct target_s *target, enum target_event event, void *priv);
 
+
+int handle_arch_state_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 int handle_target_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 int handle_daemon_startup_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
 int handle_targets_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc);
@@ -387,7 +389,6 @@ static int default_virt2phys(struct target_s *target, u32 virtual, u32 *physical
 
 static int default_mmu(struct target_s *target, int *enabled)
 {
-       USER("No MMU present");
        *enabled = 0;
        return ERROR_OK;
 }
@@ -748,10 +749,29 @@ int target_register_commands(struct command_context_s *cmd_ctx)
        register_command(cmd_ctx, NULL, "run_and_halt_time", handle_run_and_halt_time_command, COMMAND_CONFIG, NULL);
        register_command(cmd_ctx, NULL, "working_area", handle_working_area_command, COMMAND_ANY, "working_area <target#> <address> <size> <'backup'|'nobackup'> [virtual address]");
        register_command(cmd_ctx, NULL, "virt2phys", handle_virt2phys_command, COMMAND_ANY, "virt2phys <virtual address>");
+       register_command(cmd_ctx, NULL, "arch_state", handle_arch_state_command, COMMAND_ANY, "prints CPU state information");
 
        return ERROR_OK;
 }
 
+int target_arch_state(struct target_s *target)
+{
+       int retval;
+       if (target==NULL)
+       {
+               USER("No target has been configured");
+               return ERROR_OK;
+       }
+       
+       USER("target state: %s", target_state_strings[target->state]);
+       
+       if (target->state!=TARGET_HALTED)
+               return ERROR_OK;
+       
+       retval=target->type->arch_state(target);
+       return retval;
+}
+
 /* Single aligned words are guaranteed to use 16 or 32 bit access 
  * mode respectively, otherwise data is handled as quickly as 
  * possible
@@ -1325,9 +1345,9 @@ int handle_target(void *priv)
                if (target->state != TARGET_HALTED)
                {
                        if (target_continous_poll)
-                               if ((retval = target->type->poll(target)) < 0)
+                               if ((retval = target->type->poll(target)) != ERROR_OK)
                                {
-                                       ERROR("couldn't poll target. It's due for a reset.");
+                                       ERROR("couldn't poll target(%d). It's due for a reset.", retval);
                                }
                }
        
@@ -1464,16 +1484,14 @@ static int wait_state(struct command_context_s *cmd_ctx, char *cmd, enum target_
 int handle_poll_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
 {
        target_t *target = get_current_target(cmd_ctx);
-       char buffer[512];
 
        if (argc == 0)
        {
-               command_print(cmd_ctx, "target state: %s", target_state_strings[target->type->poll(target)]);
+               target->type->poll(target);
+               command_print(cmd_ctx, "target state: %s", target_state_strings[target->state]);
                if (target->state == TARGET_HALTED)
                {
-                       target->type->arch_state(target, buffer, 512);
-                       buffer[511] = 0;
-                       command_print(cmd_ctx, "%s", buffer);
+                       target_arch_state(target);
                }
        }
        else
@@ -1524,6 +1542,7 @@ static void target_process_events(struct command_context_s *cmd_ctx)
 
 static int wait_state(struct command_context_s *cmd_ctx, char *cmd, enum target_state state, int ms)
 {
+       int retval;
        struct timeval timeout, now;
        
        gettimeofday(&timeout, NULL);
@@ -1531,8 +1550,10 @@ static int wait_state(struct command_context_s *cmd_ctx, char *cmd, enum target_
        command_print(cmd_ctx, "waiting for target %s...", target_state_strings[state]);
        
        target_t *target = get_current_target(cmd_ctx);
-       while (target->type->poll(target))
+       for (;;)
        {
+               if ((retval=target->type->poll(target))!=ERROR_OK)
+                       return retval;
                target_call_timer_callbacks();
                if (target->state == state)
                {
@@ -2330,3 +2351,13 @@ int handle_virt2phys_command(command_context_t *cmd_ctx, char *cmd, char **args,
        }
        return retval;
 }
+int handle_arch_state_command(command_context_t *cmd_ctx, char *cmd, char **args, int argc)
+{
+       int retval;
+       if (argc!=0)
+               return ERROR_COMMAND_SYNTAX_ERROR;
+       
+       target_t *target = get_target_by_num(cmd_ctx->current_target);
+       retval=target_arch_state(target);
+       return retval;
+}

diff --git a/src/target/target.h b/src/target/target.h
index 29de1e98043ad97daa80e6c67286583754534b2f..7c07288bfe2299cbe656e473864ea4b7314fde9c 100644 (file)
--- a/src/target/target.h
+++ b/src/target/target.h
@@ -98,9 +98,10 @@ typedef struct target_type_s
        char *name;
 
        /* poll current target status */
-       enum target_state (*poll)(struct target_s *target);
-       /* architecture specific status reply */
-       int (*arch_state)(struct target_s *target, char *buf, int buf_size);
+       int (*poll)(struct target_s *target);
+       /* Invoked only from target_arch_state().
+        * Issue USER() w/architecture specific status.  */
+       int (*arch_state)(struct target_s *target);
 
        /* target request support */
        int (*target_request_data)(struct target_s *target, u32 size, u8 *buffer);

diff --git a/src/target/xscale.c b/src/target/xscale.c
index 6a5aabb8afb1c3bdec2782aea0ebe8f2ba8e7389..4e11152180a5e8d17aac15738bee27285df7dd29 100644 (file)
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -53,8 +53,8 @@ int xscale_target_command(struct command_context_s *cmd_ctx, char *cmd, char **a
 int xscale_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
 int xscale_quit();
 
-int xscale_arch_state(struct target_s *target, char *buf, int buf_size);
-enum target_state xscale_poll(target_t *target);
+int xscale_arch_state(struct target_s *target);
+int xscale_poll(target_t *target);
 int xscale_halt(target_t *target);
 int xscale_resume(struct target_s *target, int current, u32 address, int handle_breakpoints, int debug_execution);
 int xscale_step(struct target_s *target, int current, u32 address, int handle_breakpoints);
@@ -955,7 +955,7 @@ int xscale_update_vectors(target_t *target)
        return ERROR_OK;
 }
 
-int xscale_arch_state(struct target_s *target, char *buf, int buf_size)
+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;
@@ -976,8 +976,7 @@ int xscale_arch_state(struct target_s *target, char *buf, int buf_size)
                exit(-1);
        }
 
-       snprintf(buf, buf_size,
-                       "target halted in %s state due to %s, current mode: %s\n"
+       USER("target halted in %s state due to %s, current mode: %s\n"
                        "cpsr: 0x%8.8x pc: 0x%8.8x\n"
                        "MMU: %s, D-Cache: %s, I-Cache: %s"
                        "%s",
@@ -994,17 +993,17 @@ int xscale_arch_state(struct target_s *target, char *buf, int buf_size)
        return ERROR_OK;
 }
 
-enum target_state xscale_poll(target_t *target)
+int xscale_poll(target_t *target)
 {
-       int retval;
+       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))
        {
+               enum target_state previous_state = target->state;
                if ((retval = xscale_read_tx(target, 0)) == ERROR_OK)
                {
-                       enum target_state previous_state = target->state;
 
                        /* there's data to read from the tx register, we entered debug state */
                        xscale->handler_running = 1;
@@ -1012,30 +1011,29 @@ enum target_state xscale_poll(target_t *target)
                        target->state = TARGET_HALTED;
 
                        /* process debug entry, fetching current mode regs */
-                       if ((retval = xscale_debug_entry(target)) != ERROR_OK)
-                               return retval;
+                       retval = xscale_debug_entry(target);
+               }
+               else if (retval != ERROR_TARGET_RESOURCE_NOT_AVAILABLE)
+               {
+                       USER("error while polling TX register, reset CPU");
+                       /* here we "lie" so GDB won't get stuck and a reset can be perfomed */
+                       target->state = TARGET_HALTED;
+               }
 
                        /* debug_entry could have overwritten target state (i.e. immediate resume)
                         * don't signal event handlers in that case
                         */
-                       if (target->state != TARGET_HALTED)
-                               return target->state;
+               if (target->state != TARGET_HALTED)
+                       return ERROR_OK;
 
-                       /* if target was running, signal that we halted
-                        * otherwise we reentered from debug execution */
-                       if (previous_state == TARGET_RUNNING)
-                               target_call_event_callbacks(target, TARGET_EVENT_HALTED);
-                       else
-                               target_call_event_callbacks(target, TARGET_EVENT_DEBUG_HALTED);
-               }
-               else if (retval != ERROR_TARGET_RESOURCE_NOT_AVAILABLE)
-               {
-                       ERROR("error while polling TX register");
-                       return retval;
-               }
+               /* if target was running, signal that we halted
+                * otherwise we reentered from debug execution */
+               if (previous_state == TARGET_RUNNING)
+                       target_call_event_callbacks(target, TARGET_EVENT_HALTED);
+               else
+                       target_call_event_callbacks(target, TARGET_EVENT_DEBUG_HALTED);
        }
-
-       return target->state;
+       return retval;
 }
 
 int xscale_debug_entry(target_t *target)