From: David Brownell <dbrownell@users.sourceforge.net>
Date: Sun, 1 Nov 2009 01:03:54 +0000 (-0700)
Subject: arm9tdmi: more correct fix for vector_catch
X-Git-Tag: v0.3.0~17
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c352c96f74bd5d5c3a498805856e4c2e6145eb0a;p=openocd

arm9tdmi: more correct fix for vector_catch

Just use the array of names we're given, ignoring indices.
The "reserved means don't use" patch missed that change.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
---

diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c
index e3c6ca35..9c90f002 100644
--- a/src/target/arm9tdmi.c
+++ b/src/target/arm9tdmi.c
@@ -1042,14 +1042,11 @@ static int handle_arm9tdmi_catch_vectors_command(
 		embeddedice_store_reg(vector_catch);
 	}
 
-	/* output current settings (skip RESERVED vector) */
-	for (i = 0; i < 8; i++)
-	{
-		if (i != 5)
-		{
-			command_print(cmd_ctx, "%s: %s", arm9tdmi_vectors[i].name,
-				(vector_catch_value & (1 << i)) ? "catch" : "don't catch");
-		}
+	/* output current settings */
+	for (i = 0; arm9tdmi_vectors[i].name; i++) {
+		command_print(cmd_ctx, "%s: %s", arm9tdmi_vectors[i].name,
+			(vector_catch_value & arm9tdmi_vectors[i].value)
+				? "catch" : "don't catch");
 	}
 
 	return ERROR_OK;