fix mode output when illegal arm mode is detected. Now prints illegal mode for index -1.

git-svn-id: svn://svn.berlios.de/openocd/trunk@664 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c
index cb5f875813206a62f307b3d46be300ee7bf4be43..264a4437b77fec4a39345d4d6b170ab92c93f6d2 100644 (file)
--- a/src/target/armv4_5.c
+++ b/src/target/armv4_5.c
@@ -70,11 +70,14 @@ char* armv4_5_core_reg_list[] =
        "cpsr", "spsr_fiq", "spsr_irq", "spsr_svc", "spsr_abt", "spsr_und"
 };
 
-char* armv4_5_mode_strings[] =
+char * armv4_5_mode_strings_list[] =
 {
-       "User", "FIQ", "IRQ", "Supervisor", "Abort", "Undefined", "System"
+       "Illegal mode value", "User", "FIQ", "IRQ", "Supervisor", "Abort", "Undefined", "System"
 };
 
+/* Hack! Yuk! allow -1 index, which simplifies codepaths elsewhere in the code */
+char** armv4_5_mode_strings = armv4_5_mode_strings_list+1;
+
 char* armv4_5_state_strings[] =
 {
        "ARM", "Thumb", "Jazelle"

diff --git a/src/target/armv4_5.h b/src/target/armv4_5.h
index 51f42b9b06640076f86f54c9b4c3b3cf2f354508..3868fa3847b44f3c622c0051bf1719e52522af07 100644 (file)
--- a/src/target/armv4_5.h
+++ b/src/target/armv4_5.h
@@ -36,7 +36,7 @@ typedef enum armv4_5_mode
        ARMV4_5_MODE_ANY = -1
 } armv4_5_mode_t;
 
-extern char* armv4_5_mode_strings[];
+extern char** armv4_5_mode_strings;
 
 typedef enum armv4_5_state
 {