From: Øyvind Harboe Date: Mon, 26 Oct 2009 17:57:52 +0000 (+0100) Subject: target: fix ordering of arguments to mcr and mrc commands X-Git-Tag: v0.4.0-rc1~954 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=051eaf795023e990519b093423dd697b4d757f10;p=openocd target: fix ordering of arguments to mcr and mrc commands Now matches machine code syntax and old arm11 syntax. Signed-off-by: Øyvind Harboe --- 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;