X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farmv4_5.c;h=e092063ae1c52005ec0c373d63e428541190d858;hp=cb5f875813206a62f307b3d46be300ee7bf4be43;hb=68c598e88d5e09728ea845a81ab279c615bbaf0f;hpb=ee793f0fcbd2d7e4ad08e61d242ba178e8909b45

diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c
index cb5f875813..e092063ae1 100644
--- a/src/target/armv4_5.c
+++ b/src/target/armv4_5.c
@@ -2,6 +2,9 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2008 by Spencer Oliver                                  *
+ *   spen@spen-soft.co.uk                                                  *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -70,11 +73,14 @@ char* armv4_5_core_reg_list[] =
 	"cpsr", "spsr_fiq", "spsr_irq", "spsr_svc", "spsr_abt", "spsr_und"
 };
 
-char* armv4_5_mode_strings[] =
+char * armv4_5_mode_strings_list[] =
 {
-	"User", "FIQ", "IRQ", "Supervisor", "Abort", "Undefined", "System"
+	"Illegal mode value", "User", "FIQ", "IRQ", "Supervisor", "Abort", "Undefined", "System"
 };
 
+/* Hack! Yuk! allow -1 index, which simplifies codepaths elsewhere in the code */
+char** armv4_5_mode_strings = armv4_5_mode_strings_list+1;
+
 char* armv4_5_state_strings[] =
 {
 	"ARM", "Thumb", "Jazelle"
@@ -178,6 +184,7 @@ int armv4_5_get_core_reg(reg_t *reg)
 	
 	if (target->state != TARGET_HALTED)
 	{
+		LOG_ERROR("Target not halted");
 		return ERROR_TARGET_NOT_HALTED;
 	}
 	
@@ -298,7 +305,7 @@ int armv4_5_arch_state(struct target_s *target)
 	
 	LOG_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],
+			 Jim_Nvp_value2name_simple( nvp_target_debug_reason, target->debug_reason )->name,
 			 armv4_5_mode_strings[armv4_5_mode_to_number(armv4_5->core_mode)],
 			 buf_get_u32(armv4_5->core_cache->reg_list[ARMV4_5_CPSR].value, 0, 32),
 			 buf_get_u32(armv4_5->core_cache->reg_list[15].value, 0, 32));
@@ -326,6 +333,9 @@ int handle_armv4_5_reg_command(struct command_context_s *cmd_ctx, char *cmd, cha
 		return ERROR_OK;
 	}
 	
+	if (armv4_5_mode_to_number(armv4_5->core_mode)==-1)
+		return ERROR_FAIL;
+
 	for (num = 0; num <= 15; num++)
 	{
 		output_len = 0;
@@ -438,6 +448,9 @@ int armv4_5_get_gdb_reg_list(target_t *target, reg_t **reg_list[], int *reg_list
 	armv4_5_common_t *armv4_5 = target->arch_info;
 	int i;
 	
+	if (armv4_5_mode_to_number(armv4_5->core_mode)==-1)
+		return ERROR_FAIL;
+	
 	*reg_list_size = 26;
 	*reg_list = malloc(sizeof(reg_t*) * (*reg_list_size));
 	
@@ -482,6 +495,9 @@ int armv4_5_run_algorithm(struct target_s *target, int num_mem_params, mem_param
 		return ERROR_TARGET_NOT_HALTED;
 	}
 	
+	if (armv4_5_mode_to_number(armv4_5->core_mode)==-1)
+		return ERROR_FAIL;
+
 	for (i = 0; i <= 16; i++)
 	{
 		if (!ARMV4_5_CORE_REG_MODE(armv4_5->core_cache, armv4_5_algorithm_info->core_mode, i).valid)
@@ -539,36 +555,24 @@ int armv4_5_run_algorithm(struct target_s *target, int num_mem_params, mem_param
 	}
 	
 	target_resume(target, 0, entry_point, 1, 1);
-	target_poll(target);
 	
-	while (target->state != TARGET_HALTED)
+	target_wait_state(target, TARGET_HALTED, timeout_ms);
+	if (target->state != TARGET_HALTED)
 	{
-		usleep(10000);
-		target_poll(target);
-		if ((timeout_ms -= 10) <= 0)
+		if ((retval=target_halt(target))!=ERROR_OK)
+			return retval;
+		if ((retval=target_wait_state(target, TARGET_HALTED, 500))!=ERROR_OK)
 		{
-			LOG_ERROR("timeout waiting for algorithm to complete, trying to halt target");
-			target_halt(target);
-			timeout_ms = 1000;
-			while (target->state != TARGET_HALTED)
-			{
-				usleep(10000);
-				target_poll(target);
-				if ((timeout_ms -= 10) <= 0)
-				{
-					LOG_ERROR("target didn't reenter debug state, exiting");
-					exit(-1);
-				}
-			}
-			retval = ERROR_TARGET_TIMEOUT;
+			return retval;
 		}
+		return ERROR_TARGET_TIMEOUT;
 	}
 	
-	if ((retval != ERROR_TARGET_TIMEOUT) && 
-		(buf_get_u32(armv4_5->core_cache->reg_list[15].value, 0, 32) != exit_point))
+	if (buf_get_u32(armv4_5->core_cache->reg_list[15].value, 0, 32) != exit_point)
 	{
 		LOG_WARNING("target reentered debug state, but not at the desired exit point: 0x%4.4x",
 			buf_get_u32(armv4_5->core_cache->reg_list[15].value, 0, 32)); 
+		return ERROR_TARGET_TIMEOUT;
 	}
 	
 	breakpoint_remove(target, exit_point);