mirror of https://github.com/rusefi/openocd.git
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>
This commit is contained in:
parent
36a538c6d7
commit
e722396890
|
@ -187,10 +187,10 @@ int armv7a_arch_state(struct target *target)
|
||||||
struct armv7a_common *armv7a = target_to_armv7a(target);
|
struct armv7a_common *armv7a = target_to_armv7a(target);
|
||||||
struct armv4_5_common_s *armv4_5 = &armv7a->armv4_5_common;
|
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");
|
LOG_ERROR("BUG: called for a non-ARMv7A target");
|
||||||
exit(-1);
|
return ERROR_INVALID_ARGUMENTS;
|
||||||
}
|
}
|
||||||
|
|
||||||
LOG_USER("target halted in %s state due to %s, current mode: %s\n"
|
LOG_USER("target halted in %s state due to %s, current mode: %s\n"
|
||||||
|
|
|
@ -73,7 +73,6 @@ enum
|
||||||
ARMV7A_SPSR_UND = 36
|
ARMV7A_SPSR_UND = 36
|
||||||
};
|
};
|
||||||
|
|
||||||
#define ARMV4_5_COMMON_MAGIC 0x0A450A45
|
|
||||||
#define ARMV7_COMMON_MAGIC 0x0A450999
|
#define ARMV7_COMMON_MAGIC 0x0A450999
|
||||||
|
|
||||||
/* VA to PA translation operations opc2 values*/
|
/* VA to PA translation operations opc2 values*/
|
||||||
|
|
Loading…
Reference in New Issue