diff options
author | drath <drath@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2007-03-29 14:59:36 +0000 |
---|---|---|
committer | drath <drath@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2007-03-29 14:59:36 +0000 |
commit | 5f548150a451964ca5cc302b3a1dd86ea5ef5f6f (patch) | |
tree | 1b975e06785f9046126aa404af547a2b8f8ced75 /src/target/arm926ejs.c | |
parent | 4a5f45e87d593d6911da680cb92ffbc9b43c9486 (diff) | |
download | riscv-openocd-5f548150a451964ca5cc302b3a1dd86ea5ef5f6f.zip riscv-openocd-5f548150a451964ca5cc302b3a1dd86ea5ef5f6f.tar.gz riscv-openocd-5f548150a451964ca5cc302b3a1dd86ea5ef5f6f.tar.bz2 |
- added "arm9tdmi vector_catch ['all'|'none'|'vec1 [vec2 [...]]']" command
- added missing arm926ej-s cp15 patch (thanks Vincent Palatin)
git-svn-id: svn://svn.berlios.de/openocd/trunk@136 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/target/arm926ejs.c')
-rw-r--r-- | src/target/arm926ejs.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/src/target/arm926ejs.c b/src/target/arm926ejs.c index 829fb32..78d128d 100644 --- a/src/target/arm926ejs.c +++ b/src/target/arm926ejs.c @@ -701,10 +701,21 @@ int arm926ejs_handle_cp15_command(struct command_context_s *cmd_ctx, char *cmd, arm7_9_common_t *arm7_9; arm9tdmi_common_t *arm9tdmi; arm926ejs_common_t *arm926ejs; - int opcode_1 = strtoul(args[0], NULL, 0); - int opcode_2 = strtoul(args[1], NULL, 0); - int CRn = strtoul(args[2], NULL, 0); - int CRm = strtoul(args[3], NULL, 0); + int opcode_1; + int opcode_2; + int CRn; + int CRm; + + if ((argc < 4) || (argc > 5)) + { + command_print(cmd_ctx, "usage: arm926ejs cp15 <opcode_1> <opcode_2> <CRn> <CRm> [value]"); + return ERROR_OK; + } + + opcode_1 = strtoul(args[0], NULL, 0); + opcode_2 = strtoul(args[1], NULL, 0); + CRn = strtoul(args[2], NULL, 0); + CRm = strtoul(args[3], NULL, 0); if (arm926ejs_get_arch_pointers(target, &armv4_5, &arm7_9, &arm9tdmi, &arm926ejs) != ERROR_OK) { @@ -718,11 +729,6 @@ int arm926ejs_handle_cp15_command(struct command_context_s *cmd_ctx, char *cmd, return ERROR_OK; } - if ((argc < 4) || (argc > 5)) - { - command_print(cmd_ctx, "usage: arm926ejs cp15 <opcode_1> <opcode_2> <CRn> <CRm> [value]"); - } - if (argc == 4) { u32 value; |