From: David Brownell <dbrownell@users.sourceforge.net>
Date: Tue, 17 Nov 2009 01:58:58 +0000 (-0800)
Subject: ARMv7-A: no exit() calls
X-Git-Tag: v0.4.0-rc1~541
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e722396890bdb07553959258c585853edfbb291c;p=openocd

ARMv7-A: no exit() calls

Also, switch integrity check over to the correct magic number,
and remove duplicate v4/v5 #define.

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

diff --git a/src/target/armv7a.c b/src/target/armv7a.c
index 8b163360..fdaca318 100644
--- a/src/target/armv7a.c
+++ b/src/target/armv7a.c
@@ -187,10 +187,10 @@ int armv7a_arch_state(struct target *target)
 	struct armv7a_common *armv7a = target_to_armv7a(target);
 	struct armv4_5_common_s *armv4_5 = &armv7a->armv4_5_common;
 
-	if (armv4_5->common_magic != ARMV4_5_COMMON_MAGIC)
+	if (armv7a->common_magic != ARMV7_COMMON_MAGIC)
 	{
-		LOG_ERROR("BUG: called for a non-ARMv4/5 target");
-		exit(-1);
+		LOG_ERROR("BUG: called for a non-ARMv7A target");
+		return ERROR_INVALID_ARGUMENTS;
 	}
 
 	LOG_USER("target halted in %s state due to %s, current mode: %s\n"
diff --git a/src/target/armv7a.h b/src/target/armv7a.h
index a4be9e26..4d29ef9b 100644
--- a/src/target/armv7a.h
+++ b/src/target/armv7a.h
@@ -73,7 +73,6 @@ enum
 	ARMV7A_SPSR_UND = 36
 };
 
-#define ARMV4_5_COMMON_MAGIC 0x0A450A45
 #define ARMV7_COMMON_MAGIC 0x0A450999
 
 /* VA to PA translation operations opc2 values*/