diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2009-11-16 16:36:09 -0800 |
|---|---|---|
| committer | David Brownell <dbrownell@users.sourceforge.net> | 2009-11-16 16:36:09 -0800 |
| commit | f86137066a6b42c46c457c9837a8015990bf71e6 (patch) | |
| tree | ae2e1008558aecdcb52079ef2503bc5293e94968 /src/target | |
| parent | 7c393679c0cd8f7609a0d6b2329a1877de0f3d31 (diff) | |
| download | openocd_libswd-f86137066a6b42c46c457c9837a8015990bf71e6.tar.gz openocd_libswd-f86137066a6b42c46c457c9837a8015990bf71e6.tar.bz2 openocd_libswd-f86137066a6b42c46c457c9837a8015990bf71e6.tar.xz openocd_libswd-f86137066a6b42c46c457c9837a8015990bf71e6.zip | |
ARM: "armv4_5" command prefix becomes "arm"
Rename the "armv4_5" command prefix to straight "arm" so it makes
more sense for newer cores. Add a simple compatibility script.
Make sure all the commands give the same "not an ARM" diagnostic
message (and fail properly) when called against non-ARM targets.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Diffstat (limited to 'src/target')
| -rw-r--r-- | src/target/armv4_5.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c index e112e7b1..7c4861ff 100644 --- a/src/target/armv4_5.c +++ b/src/target/armv4_5.c @@ -363,10 +363,10 @@ COMMAND_HANDLER(handle_armv4_5_reg_command) struct target *target = get_current_target(cmd_ctx); struct armv4_5_common_s *armv4_5 = target_to_armv4_5(target); - if (armv4_5->common_magic != ARMV4_5_COMMON_MAGIC) + if (!is_arm(armv4_5)) { - command_print(cmd_ctx, "current target isn't an ARMV4/5 target"); - return ERROR_OK; + command_print(cmd_ctx, "current target isn't an ARM"); + return ERROR_FAIL; } if (target->state != TARGET_HALTED) @@ -412,10 +412,10 @@ COMMAND_HANDLER(handle_armv4_5_core_state_command) struct target *target = get_current_target(cmd_ctx); struct armv4_5_common_s *armv4_5 = target_to_armv4_5(target); - if (armv4_5->common_magic != ARMV4_5_COMMON_MAGIC) + if (!is_arm(armv4_5)) { - command_print(cmd_ctx, "current target isn't an ARMV4/5 target"); - return ERROR_OK; + command_print(cmd_ctx, "current target isn't an ARM"); + return ERROR_FAIL; } if (argc > 0) @@ -471,7 +471,7 @@ COMMAND_HANDLER(handle_armv4_5_disassemble_command) default: usage: command_print(cmd_ctx, - "usage: armv4_5 disassemble <address> [<count> ['thumb']]"); + "usage: arm disassemble <address> [<count> ['thumb']]"); count = 0; retval = ERROR_FAIL; } @@ -510,9 +510,9 @@ int armv4_5_register_commands(struct command_context *cmd_ctx) { struct command *armv4_5_cmd; - armv4_5_cmd = register_command(cmd_ctx, NULL, "armv4_5", + armv4_5_cmd = register_command(cmd_ctx, NULL, "arm", NULL, COMMAND_ANY, - "armv4/5 specific commands"); + "generic ARM commands"); register_command(cmd_ctx, armv4_5_cmd, "reg", handle_armv4_5_reg_command, COMMAND_EXEC, |