[Openocd-svn] r1544 - trunk/src/target

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-04-27 14:12:44 +0200 (Mon, 27 Apr 2009)
New Revision: 1544

Modified:
   trunk/src/target/arm11.c
Log:
clean up debug/info output to be in line with other targets

Modified: trunk/src/target/arm11.c
===================================================================
--- trunk/src/target/arm11.c	2009-04-27 12:02:07 UTC (rev 1543)
+++ trunk/src/target/arm11.c	2009-04-27 12:12:44 UTC (rev 1544)
@@ -525,24 +525,30 @@
 
 void arm11_dump_reg_changes(arm11_common_t * arm11)
 {
+
+	if (!(debug_level >= LOG_LVL_DEBUG))
+	{
+		return;
+	}
+
 	{size_t i;
 	for(i = 0; i < ARM11_REGCACHE_COUNT; i++)
 	{
 		if (!arm11->reg_list[i].valid)
 		{
 			if (arm11->reg_history[i].valid)
-				LOG_INFO("%8s INVALID	 (%08x)", arm11_reg_defs[i].name, arm11->reg_history[i].value);
+				LOG_DEBUG("%8s INVALID	 (%08x)", arm11_reg_defs[i].name, arm11->reg_history[i].value);
 		}
 		else
 		{
 			if (arm11->reg_history[i].valid)
 			{
 				if (arm11->reg_history[i].value != arm11->reg_values[i])
-					LOG_INFO("%8s %08x (%08x)", arm11_reg_defs[i].name, arm11->reg_values[i], arm11->reg_history[i].value);
+					LOG_DEBUG("%8s %08x (%08x)", arm11_reg_defs[i].name, arm11->reg_values[i], arm11->reg_history[i].value);
 			}
 			else
 			{
-				LOG_INFO("%8s %08x (INVALID)", arm11_reg_defs[i].name, arm11->reg_values[i]);
+				LOG_DEBUG("%8s %08x (INVALID)", arm11_reg_defs[i].name, arm11->reg_values[i]);
 			}
 		}
 	}}
@@ -712,8 +718,13 @@
 /* architecture specific status reply */
 int arm11_arch_state(struct target_s *target)
 {
-	FNC_INFO_NOTIMPLEMENTED;
+	arm11_common_t * arm11 = target->arch_info;
 
+	LOG_USER("target halted due to %s\ncpsr: 0x%8.8x pc: 0x%8.8x",
+			 Jim_Nvp_value2name_simple( nvp_target_debug_reason, target->debug_reason )->name,
+			 R(CPSR),
+			 R(PC));
+
 	return ERROR_OK;
 }
 
@@ -814,7 +825,7 @@
 	if (!current)
 		R(PC) = address;
 
-	LOG_INFO("RESUME PC %08x%s", R(PC), !current ? "!" : "");
+	LOG_DEBUG("RESUME PC %08x%s", R(PC), !current ? "!" : "");
 
 	/* clear breakpoints/watchpoints and VCR*/
 	arm11_sc7_clear_vbw(arm11);