]> git.sur5r.net Git - openocd/commitdiff
target: fix ordering of arguments to mcr and mrc commands
authorØyvind Harboe <oyvind.harboe@zylin.com>
Mon, 26 Oct 2009 17:57:52 +0000 (18:57 +0100)
committerØyvind Harboe <oyvind.harboe@zylin.com>
Thu, 5 Nov 2009 22:57:49 +0000 (23:57 +0100)
Now matches machine code syntax and old arm11 syntax.

Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
src/target/target.c

index 9b07df18bde6da8ed400e6650e6d9164f3bb8760..9502490e24271fe59397cdba130e103b2b8f87d5 100644 (file)
@@ -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;