target: xscale more human vector catching

Replace hexadecimal masks for vector catching with words
representing the caught exception, such as dabt for data
abort, etc ...
This way, the new xscale command is :
 - xscale vector_catch
   Reads back to the user the current vector catching status
 - xscale vector_catch reset dabt pabt
   Sets the caught vectors to data abort and prefetch abort
   for example.

This is mostly taken from Cortex-M3 openocd code.

Change-Id: I66591d5796f0e07f0f31edc8d28722e1e48aa8c5
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Reviewed-on: http://openocd.zylin.com/1456
Tested-by: jenkins
Reviewed-by: Marek Vasut <marek.vasut@gmail.com>
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>

diff --git a/src/target/xscale.c b/src/target/xscale.c
index d03184a10589bfd292278797ba309c68434d915d..92c4ede8bf3d0a6541179834e4d8bfb888b069b0 100644 (file)
--- a/src/target/xscale.c
+++ b/src/target/xscale.c
@@ -3218,28 +3218,66 @@ COMMAND_HANDLER(xscale_handle_idcache_command)
        return ERROR_OK;
 }
 
        return ERROR_OK;
 }
 

+static const struct {
+       char name[15];
+       unsigned mask;
+} vec_ids[] = {
+       { "fiq",                DCSR_TF, },
+       { "irq",                DCSR_TI, },
+       { "dabt",               DCSR_TD, },
+       { "pabt",               DCSR_TA, },
+       { "swi",                DCSR_TS, },
+       { "undef",              DCSR_TU, },
+       { "reset",              DCSR_TR, },
+};
+

 COMMAND_HANDLER(xscale_handle_vector_catch_command)
 {
        struct target *target = get_current_target(CMD_CTX);
        struct xscale_common *xscale = target_to_xscale(target);
        int retval;
 COMMAND_HANDLER(xscale_handle_vector_catch_command)
 {
        struct target *target = get_current_target(CMD_CTX);
        struct xscale_common *xscale = target_to_xscale(target);
        int retval;

+       uint32_t dcsr_value;
+       uint32_t catch = 0;
+       struct reg *dcsr_reg = &xscale->reg_cache->reg_list[XSCALE_DCSR];

 
        retval = xscale_verify_pointer(CMD_CTX, xscale);
        if (retval != ERROR_OK)
                return retval;
 
 
        retval = xscale_verify_pointer(CMD_CTX, xscale);
        if (retval != ERROR_OK)
                return retval;
 

-       if (CMD_ARGC < 1)
-               return ERROR_COMMAND_SYNTAX_ERROR;
-       else {
-               COMMAND_PARSE_NUMBER(u8, CMD_ARGV[0], xscale->vector_catch);
-               buf_set_u32(xscale->reg_cache->reg_list[XSCALE_DCSR].value,
-                       16,
-                       8,
-                       xscale->vector_catch);
+       dcsr_value = buf_get_u32(dcsr_reg->value, 0, 32);
+       if (CMD_ARGC > 0) {
+               if (CMD_ARGC == 1) {
+                       if (strcmp(CMD_ARGV[0], "all") == 0) {
+                               catch = DCSR_TRAP_MASK;
+                               CMD_ARGC--;
+                       } else if (strcmp(CMD_ARGV[0], "none") == 0) {
+                               catch = 0;
+                               CMD_ARGC--;
+                       }
+               }
+               while (CMD_ARGC-- > 0) {
+                       unsigned i;
+                       for (i = 0; i < ARRAY_SIZE(vec_ids); i++) {
+                               if (strcmp(CMD_ARGV[CMD_ARGC], vec_ids[i].name))
+                                       continue;
+                               catch |= vec_ids[i].mask;
+                               break;
+                       }
+                       if (i == ARRAY_SIZE(vec_ids)) {
+                               LOG_ERROR("No vector '%s'", CMD_ARGV[CMD_ARGC]);
+                               return ERROR_COMMAND_SYNTAX_ERROR;
+                       }
+               }
+               *(uint32_t *)(dcsr_reg->value) &= ~DCSR_TRAP_MASK;
+               *(uint32_t *)(dcsr_reg->value) |= catch;

                xscale_write_dcsr(target, -1, -1);
        }
 
                xscale_write_dcsr(target, -1, -1);
        }
 

-       command_print(CMD_CTX, "vector catch mask: 0x%2.2x", xscale->vector_catch);
+       dcsr_value = buf_get_u32(dcsr_reg->value, 0, 32);
+       for (unsigned i = 0; i < ARRAY_SIZE(vec_ids); i++) {
+               command_print(CMD_CTX, "%15s: %s", vec_ids[i].name,
+                       (dcsr_value & vec_ids[i].mask) ? "catch" : "ignore");
+       }

 
        return ERROR_OK;
 }
 
        return ERROR_OK;
 }


@@ -3585,9 +3623,9 @@ static const struct command_registration xscale_exec_command_handlers[] = {
                .name = "vector_catch",
                .handler = xscale_handle_vector_catch_command,
                .mode = COMMAND_EXEC,
                .name = "vector_catch",
                .handler = xscale_handle_vector_catch_command,
                .mode = COMMAND_EXEC,

-               .help = "set or display 8-bit mask of vectors "
+               .help = "set or display mask of vectors "

                        "that should trigger debug entry",
                        "that should trigger debug entry",

-               .usage = "[mask]",
+               .usage = "['all'|'none'|'fiq'|'irq'|'dabt'|'pabt'|'swi'|'undef'|'reset']",

        },
        {
                .name = "vector_table",
        },
        {
                .name = "vector_table",

diff --git a/src/target/xscale.h b/src/target/xscale.h
index c5cd7b7746bba45d0e4239bc2278f38d7f8d5ea7..a71ec3514c0822ee214063d98df4f34126b14291 100644 (file)
--- a/src/target/xscale.h
+++ b/src/target/xscale.h
@@ -176,4 +176,15 @@ enum {
 
 #define ERROR_XSCALE_NO_TRACE_DATA     (-700)
 
 
 #define ERROR_XSCALE_NO_TRACE_DATA     (-700)
 

+/* DCSR bit and field definitions */
+#define DCSR_TR        (1 << 16)
+#define DCSR_TU        (1 << 17)
+#define DCSR_TS        (1 << 18)
+#define DCSR_TA        (1 << 19)
+#define DCSR_TD        (1 << 20)
+#define DCSR_TI        (1 << 22)
+#define DCSR_TF        (1 << 23)
+#define DCSR_TRAP_MASK \
+       (DCSR_TF | DCSR_TI | DCSR_TD | DCSR_TA | DCSR_TS | DCSR_TU | DCSR_TR)
+

 #endif /* XSCALE_H */
 #endif /* XSCALE_H */