From 19b84dafb0a9902df78aa021330cbcfae93a89a7 Mon Sep 17 00:00:00 2001 From: David Brownell Date: Sun, 25 Oct 2009 14:03:14 -0700 Subject: [PATCH] ARM: rename "arm9tdmi vector_catch" to "arm9 ..." And update doc accordingly. That EmbeddedICE register was introduced for ARM9TDMI and then carried forward into most new chips that use EmbeddedICE. --- NEWS | 2 ++ TODO | 5 ++--- doc/openocd.texi | 13 ++++--------- src/target/arm9tdmi.c | 8 +++----- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/NEWS b/NEWS index 81fce821..436dab7d 100644 --- a/NEWS +++ b/NEWS @@ -19,6 +19,8 @@ Target Layer: VERY EARLY Cortex-A8 and ARMv7A support Updated BeagleBoard.org hardware support New commands for use with XScale processors: "xscale vector_table" + ARM9 + name change: "arm9 vector_catch" not "arm9tdmi vector_catch" ARM11 single stepping support for i.MX31 bugfix for missing "arm11" prefix on "arm11 memwrite ..." diff --git a/TODO b/TODO index fa9477ac..611bdd3c 100644 --- a/TODO +++ b/TODO @@ -138,9 +138,8 @@ Once the above are completed: - regression: "reset halt" between 729(works) and 788(fails): @par https://lists.berlios.de/pipermail/openocd-development/2009-July/009206.html - ARM7/9: - - clean up "arm9tdmi vector_catch". Should be available for other arm9 - (e.g. arm926ejs) and some(???) arm7 cores. @par -https://lists.berlios.de/pipermail/openocd-development/2009-October/011488.html + - clean up "arm9tdmi vector_catch". Available for some arm7 cores? @par +https://lists.berlios.de/pipermail/openocd-development/2009-October/011488.html https://lists.berlios.de/pipermail/openocd-development/2009-October/011506.html - add reset option to allow programming embedded ice while srst is asserted. Some CPUs will gate the JTAG clock when srst is asserted and in this case, diff --git a/doc/openocd.texi b/doc/openocd.texi index 67609942..b91fb3be 100644 --- a/doc/openocd.texi +++ b/doc/openocd.texi @@ -768,7 +768,7 @@ early boot code, which performs some of the same actions that the @code{reset-init} event handler does. @item -Likewise, the @command{arm9tdmi vector_catch} command (or +Likewise, the @command{arm9 vector_catch} command (or @cindex vector_catch its siblings @command{xscale vector_catch} and @command{cortex_m3 vector_catch}) can be a timesaver @@ -5028,7 +5028,7 @@ at @var{address} for @var{length} bytes. This is a software breakpoint, unless @option{hw} is specified in which case it will be a hardware breakpoint. -(@xref{arm9tdmi vector_catch}, or @pxref{xscale vector_catch}, +(@xref{arm9 vector_catch}, or @pxref{xscale vector_catch}, for similar mechanisms that do not consume hardware breakpoints.) @end deffn @@ -5453,18 +5453,13 @@ ARM9-family cores are built around ARM9TDMI or ARM9E (including ARM9EJS) integer processors. Such cores include the ARM920T, ARM926EJ-S, and ARM966. -For historical reasons, one command shared by these cores starts -with the @command{arm9tdmi} prefix. -This is true even for ARM9E based processors, which implement the -ARMv5TE architecture instead of ARMv4T. - @c 9-june-2009: tried this on arm920t, it didn't work. @c no-params always lists nothing caught, and that's how it acts. @c 23-oct-2009: doesn't work _consistently_ ... as if the ICE @c versions have different rules about when they commit writes. -@anchor{arm9tdmi vector_catch} -@deffn Command {arm9tdmi vector_catch} [@option{all}|@option{none}|list] +@anchor{arm9 vector_catch} +@deffn Command {arm9 vector_catch} [@option{all}|@option{none}|list] @cindex vector_catch Vector Catch hardware provides a sort of dedicated breakpoint for hardware events such as reset, interrupt, and abort. diff --git a/src/target/arm9tdmi.c b/src/target/arm9tdmi.c index 12b68ae5..e3c6ca35 100644 --- a/src/target/arm9tdmi.c +++ b/src/target/arm9tdmi.c @@ -1061,14 +1061,12 @@ int arm9tdmi_register_commands(struct command_context_s *cmd_ctx) command_t *arm9tdmi_cmd; retval = arm7_9_register_commands(cmd_ctx); - arm9tdmi_cmd = register_command(cmd_ctx, NULL, "arm9tdmi", + arm9tdmi_cmd = register_command(cmd_ctx, NULL, "arm9", NULL, COMMAND_ANY, - "arm9tdmi specific commands"); + "arm9 specific commands"); register_command(cmd_ctx, arm9tdmi_cmd, "vector_catch", handle_arm9tdmi_catch_vectors_command, COMMAND_EXEC, - "arm9 vector_catch [all|none|reset|undef|swi|pabt|dabt|irq|fiq] - separate vectors to catch by space"); - - + "arm9 vector_catch [all|none|reset|undef|swi|pabt|dabt|irq|fiq] ..."); return retval; } -- 2.39.5