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

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

Author: oharboe
Date: 2009-07-06 11:28:37 +0200 (Mon, 06 Jul 2009)
New Revision: 2469

Modified:
   trunk/src/target/arm7_9_common.c
Log:
simplify debug_reason check

Modified: trunk/src/target/arm7_9_common.c
===================================================================
--- trunk/src/target/arm7_9_common.c	2009-07-06 08:45:31 UTC (rev 2468)
+++ trunk/src/target/arm7_9_common.c	2009-07-06 09:28:37 UTC (rev 2469)
@@ -2,7 +2,7 @@
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dom...@gm...                                                   *
  *                                                                         *
- *   Copyright (C) 2007,2008 vind Harboe                                 *
+ *   Copyright (C) 2007,2008 �yvind Harboe                                 *
  *   oyv...@zy...                                               *
  *                                                                         *
  *   Copyright (C) 2008 by Spencer Oliver                                  *
@@ -1431,18 +1431,10 @@
 		context[15] -= 3 * 4;
 	}
 
-	if ((target->debug_reason == DBG_REASON_BREAKPOINT)
-			|| (target->debug_reason == DBG_REASON_SINGLESTEP)
-			|| (target->debug_reason == DBG_REASON_WATCHPOINT)
-			|| (target->debug_reason == DBG_REASON_WPTANDBKPT)
-			|| ((target->debug_reason == DBG_REASON_DBGRQ) && (arm7_9->use_dbgrq == 0)))
+	if ((target->debug_reason != DBG_REASON_DBGRQ) || (!arm7_9->use_dbgrq))
 		context[15] -= 3 * ((armv4_5->core_state == ARMV4_5_STATE_ARM) ? 4 : 2);
-	else if (target->debug_reason == DBG_REASON_DBGRQ)
-		context[15] -= arm7_9->dbgreq_adjust_pc * ((armv4_5->core_state == ARMV4_5_STATE_ARM) ? 4 : 2);
 	else
-	{
-		LOG_ERROR("unknown debug reason: %i", target->debug_reason);
-	}
+		context[15] -= arm7_9->dbgreq_adjust_pc * ((armv4_5->core_state == ARMV4_5_STATE_ARM) ? 4 : 2);
 
 	if (armv4_5_mode_to_number(armv4_5->core_mode)==-1)
 		return ERROR_FAIL;