diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2009-11-19 02:33:01 -0800 |
|---|---|---|
| committer | David Brownell <dbrownell@users.sourceforge.net> | 2009-11-19 02:33:01 -0800 |
| commit | 195ce5eb273983dbeabeea41cc18b77e4f30ab41 (patch) | |
| tree | 65d5308f74ba5d7a569445e230fe1dec090c6514 /src/target/armv7a.c | |
| parent | f320b1228932e33292207d89778125c03379de5d (diff) | |
| download | openocd+libswd-195ce5eb273983dbeabeea41cc18b77e4f30ab41.tar.gz openocd+libswd-195ce5eb273983dbeabeea41cc18b77e4f30ab41.tar.bz2 openocd+libswd-195ce5eb273983dbeabeea41cc18b77e4f30ab41.tar.xz openocd+libswd-195ce5eb273983dbeabeea41cc18b77e4f30ab41.zip | |
ARMv7-A: use standard ARM core states
We don't want an ARMv7-specific core state enumeration just to
add ThumbEE state. Update the generic stuff to handle that,
and replace the V7-specific bits with it.
For Cortex-A8: on debug entry, check both the T and J bits
instead of just the T bit. When the J bit is set, set the
right state and warn appropriately.
(And while we're at it, move the generic arm struct to the front
of the v7a structure, for somewhat better code generation.)
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Diffstat (limited to 'src/target/armv7a.c')
| -rw-r--r-- | src/target/armv7a.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/target/armv7a.c b/src/target/armv7a.c index 98e3fa3f..ea883c16 100644 --- a/src/target/armv7a.c +++ b/src/target/armv7a.c @@ -34,11 +34,6 @@ #include <unistd.h> -static const char *armv7a_state_strings[] = -{ - "ARM", "Thumb", "Jazelle", "ThumbEE" -}; - static void armv7a_show_fault_registers(struct target *target) { uint32_t dfsr, ifsr, dfar, ifar; @@ -75,7 +70,7 @@ int armv7a_arch_state(struct target *target) LOG_USER("target halted in %s state due to %s, current mode: %s\n" "cpsr: 0x%8.8" PRIx32 " pc: 0x%8.8" PRIx32 "\n" "MMU: %s, D-Cache: %s, I-Cache: %s", - armv7a_state_strings[armv7a->core_state], + armv4_5_state_strings[armv4_5->core_state], Jim_Nvp_value2name_simple(nvp_target_debug_reason, target->debug_reason)->name, arm_mode_name(armv4_5->core_mode), |