diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2009-12-04 19:39:25 -0800 |
|---|---|---|
| committer | David Brownell <dbrownell@users.sourceforge.net> | 2009-12-04 19:39:25 -0800 |
| commit | 56e01714203406b50b40dd7738983e3b019d4df2 (patch) | |
| tree | 109f780fd6194641a0c240504b04fc67236217a7 /src/target/armv4_5.c | |
| parent | d4d16f1036bff4ce3c36edd1995e579fbf64e1c9 (diff) | |
| download | openocd+libswd-56e01714203406b50b40dd7738983e3b019d4df2.tar.gz openocd+libswd-56e01714203406b50b40dd7738983e3b019d4df2.tar.bz2 openocd+libswd-56e01714203406b50b40dd7738983e3b019d4df2.tar.xz openocd+libswd-56e01714203406b50b40dd7738983e3b019d4df2.zip | |
ARM: rename armv4_5_state_* as arm_state_*
And make arm_state_strings[] be const.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Diffstat (limited to 'src/target/armv4_5.c')
| -rw-r--r-- | src/target/armv4_5.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c index 15c0a7f4..102913b5 100644 --- a/src/target/armv4_5.c +++ b/src/target/armv4_5.c @@ -216,7 +216,7 @@ enum arm_mode armv4_5_number_to_mode(int number) } } -char* armv4_5_state_strings[] = +const char *arm_state_strings[] = { "ARM", "Thumb", "Jazelle", "ThumbEE", }; @@ -374,7 +374,7 @@ void arm_set_cpsr(struct arm *arm, uint32_t cpsr) : arm->core_cache->reg_list + arm->map[16]; /* Older ARMs won't have the J bit */ - enum armv4_5_state state; + enum arm_state state; if (cpsr & (1 << 5)) { /* T */ if (cpsr & (1 << 24)) { /* J */ @@ -393,7 +393,7 @@ void arm_set_cpsr(struct arm *arm, uint32_t cpsr) LOG_DEBUG("set CPSR %#8.8x: %s mode, %s state", (unsigned) cpsr, arm_mode_name(mode), - armv4_5_state_strings[arm->core_state]); + arm_state_strings[arm->core_state]); } /** @@ -593,7 +593,7 @@ int armv4_5_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 "%s", - armv4_5_state_strings[armv4_5->core_state], + arm_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), @@ -718,7 +718,7 @@ COMMAND_HANDLER(handle_armv4_5_core_state_command) } } - command_print(CMD_CTX, "core state: %s", armv4_5_state_strings[armv4_5->core_state]); + command_print(CMD_CTX, "core state: %s", arm_state_strings[armv4_5->core_state]); return ERROR_OK; } @@ -1038,7 +1038,7 @@ int armv4_5_run_algorithm_inner(struct target *target, { struct arm *armv4_5 = target_to_armv4_5(target); struct armv4_5_algorithm *armv4_5_algorithm_info = arch_info; - enum armv4_5_state core_state = armv4_5->core_state; + enum arm_state core_state = armv4_5->core_state; uint32_t context[17]; uint32_t cpsr; int exit_breakpoint_size = 0; |