X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Ftarget.c;h=381e774e882e2dd3bae13981e0b864c66aa06705;hb=56a04a3413a6427ef83dc18e3f7c7c13fd217113;hp=e54a2c997a8582e791b73702f030f617d36227bf;hpb=56944ac1c83c0e420117ef9f0c6f2de53c8ed424;p=openocd.git

diff --git a/src/target/target.c b/src/target/target.c
index e54a2c997a..381e774e88 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -2,7 +2,7 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
- *   Copyright (C) 2007,2008 �yvind Harboe                                 *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
  *   Copyright (C) 2008, Duane Ellis                                       *
@@ -559,6 +559,11 @@ static int target_soft_reset_halt_imp(struct target_s *target)
 		LOG_ERROR("Target not examined yet");
 		return ERROR_FAIL;
 	}
+	if (!target->type->soft_reset_halt_imp) {
+		LOG_ERROR("Target %s does not support soft_reset_halt",
+				target->cmd_name);
+		return ERROR_FAIL;
+	}
 	return target->type->soft_reset_halt_imp(target);
 }
 
@@ -1505,10 +1510,19 @@ int target_register_user_commands(struct command_context_s *cmd_ctx)
 	register_command(cmd_ctx,  NULL, "mwh", handle_mw_command, COMMAND_EXEC, "write memory half-word <addr> <value> [count]");
 	register_command(cmd_ctx,  NULL, "mwb", handle_mw_command, COMMAND_EXEC, "write memory byte <addr> <value> [count]");
 
-	register_command(cmd_ctx,  NULL, "bp", handle_bp_command, COMMAND_EXEC, "set breakpoint <address> <length> [hw]");
-	register_command(cmd_ctx,  NULL, "rbp", handle_rbp_command, COMMAND_EXEC, "remove breakpoint <adress>");
-	register_command(cmd_ctx,  NULL, "wp", handle_wp_command, COMMAND_EXEC, "set watchpoint <address> <length> <r/w/a> [value] [mask]");
-	register_command(cmd_ctx,  NULL, "rwp", handle_rwp_command, COMMAND_EXEC, "remove watchpoint <adress>");
+	register_command(cmd_ctx,  NULL, "bp",
+			handle_bp_command, COMMAND_EXEC,
+			"list or set breakpoint [<address> <length> [hw]]");
+	register_command(cmd_ctx,  NULL, "rbp",
+			handle_rbp_command, COMMAND_EXEC,
+			"remove breakpoint <address>");
+	register_command(cmd_ctx,  NULL, "wp",
+			handle_wp_command, COMMAND_EXEC,
+			"list or set watchpoint "
+				"[<address> <length> <r/w/a> [value] [mask]]");
+	register_command(cmd_ctx,  NULL, "rwp",
+			handle_rwp_command, COMMAND_EXEC,
+			"remove watchpoint <address>");
 
 	register_command(cmd_ctx,  NULL, "load_image", handle_load_image_command, COMMAND_EXEC, "load_image <file> <address> ['bin'|'ihex'|'elf'|'s19'] [min_address] [max_length]");
 	register_command(cmd_ctx,  NULL, "dump_image", handle_dump_image_command, COMMAND_EXEC, "dump_image <file> <address> <size>");
@@ -1741,17 +1755,28 @@ static int handle_reg_command(struct command_context_s *cmd_ctx, char *cmd, char
 		while (cache)
 		{
 			int i;
-			for (i = 0; i < cache->num_regs; i++)
+
+			for (i = 0, reg = cache->reg_list;
+					i < cache->num_regs;
+					i++, reg++, count++)
 			{
-				value = buf_to_str(cache->reg_list[i].value, cache->reg_list[i].size, 16);
-				command_print(cmd_ctx, "(%i) %s (/%i): 0x%s (dirty: %i, valid: %i)",
-							  count++,
-							  cache->reg_list[i].name,
-							  (int)(cache->reg_list[i].size),
-							  value,
-							  cache->reg_list[i].dirty,
-							  cache->reg_list[i].valid);
-				free(value);
+				/* only print cached values if they are valid */
+				if (reg->valid) {
+					value = buf_to_str(reg->value,
+							reg->size, 16);
+					command_print(cmd_ctx,
+							"(%i) %s (/%" PRIu32 "): 0x%s%s",
+							count, reg->name,
+							reg->size, value,
+							reg->dirty
+								? " (dirty)"
+								: "");
+					free(value);
+				} else {
+					command_print(cmd_ctx, "(%i) %s (/%" PRIu32 ")",
+							  count, reg->name,
+							  reg->size) ;
+				}
 			}
 			cache = cache->next;
 		}
@@ -4015,6 +4040,13 @@ static int tcl_target_func(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 		}
 		if (!target->tap->enabled)
 			goto err_tap_disabled;
+		if (!target->type->assert_reset
+				|| !target->type->deassert_reset) {
+			Jim_SetResult_sprintf(interp,
+					"No target-specific reset for %s",
+					target->cmd_name);
+			return JIM_ERR;
+		}
 		/* determine if we should halt or not. */
 		target->reset_halt = !!a;
 		/* When this happens - all workareas are invalid. */