diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2009-11-16 17:58:58 -0800 |
|---|---|---|
| committer | David Brownell <dbrownell@users.sourceforge.net> | 2009-11-16 17:58:58 -0800 |
| commit | e722396890bdb07553959258c585853edfbb291c (patch) | |
| tree | 8de44860ad43b8b84281475d0eaf9e931a8cebc8 /src/target | |
| parent | 36a538c6d76c6a7483e6925c12669cd91807d918 (diff) | |
| download | openocd_libswd-e722396890bdb07553959258c585853edfbb291c.tar.gz openocd_libswd-e722396890bdb07553959258c585853edfbb291c.tar.bz2 openocd_libswd-e722396890bdb07553959258c585853edfbb291c.tar.xz openocd_libswd-e722396890bdb07553959258c585853edfbb291c.zip | |
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>
Diffstat (limited to 'src/target')
| -rw-r--r-- | src/target/armv7a.c | 6 | ||||
| -rw-r--r-- | src/target/armv7a.h | 1 |
2 files changed, 3 insertions, 4 deletions
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*/ |