diff options
author | Øyvind Harboe <oyvind.harboe@zylin.com> | 2009-10-26 18:57:52 +0100 |
---|---|---|
committer | Øyvind Harboe <oyvind.harboe@zylin.com> | 2009-11-05 23:57:49 +0100 |
commit | 051eaf795023e990519b093423dd697b4d757f10 (patch) | |
tree | f0ad75686e22852c1c5a254898c8bd3a1ef066a2 /src | |
parent | 4e3c2676f15a130d0594b7c5164ae09f8bd41648 (diff) | |
download | openocd_libswd-051eaf795023e990519b093423dd697b4d757f10.tar.gz openocd_libswd-051eaf795023e990519b093423dd697b4d757f10.tar.bz2 openocd_libswd-051eaf795023e990519b093423dd697b4d757f10.tar.xz openocd_libswd-051eaf795023e990519b093423dd697b4d757f10.zip |
target: fix ordering of arguments to mcr and mrc commands
Now matches machine code syntax and old arm11 syntax.
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/target/target.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/target/target.c b/src/target/target.c index 9b07df18..9502490e 100644 --- a/src/target/target.c +++ b/src/target/target.c @@ -722,25 +722,25 @@ static int arm_cp_check(struct target_s *target, int cpnum, uint32_t op1, uint32 return ERROR_FAIL; } - if (op1>7) + if (op1 > 7) { LOG_ERROR("Illegal op1"); return ERROR_FAIL; } - if (op2>7) + if (op2 > 7) { LOG_ERROR("Illegal op2"); return ERROR_FAIL; } - if (CRn>15) + if (CRn > 15) { LOG_ERROR("Illegal CRn"); return ERROR_FAIL; } - if (CRm>7) + if (CRm > 15) { LOG_ERROR("Illegal CRm"); return ERROR_FAIL; @@ -4899,19 +4899,19 @@ static int jim_mcrmrc(Jim_Interp *interp, int argc, Jim_Obj *const *argv) if (e != JIM_OK) { return e; } - op2 = l; + CRn = l; e = Jim_GetLong(interp, argv[4], &l); if (e != JIM_OK) { return e; } - CRn = l; + CRm = l; e = Jim_GetLong(interp, argv[5], &l); if (e != JIM_OK) { return e; } - CRm = l; + op2 = l; value = 0; |