Cadence virtual debug interface (vdebug) integration

[fw/openocd] / src / target / arm720t.c

diff --git a/src/target/arm720t.c b/src/target/arm720t.c
index daa44e46aa125ed284c7de713fa5e2a23152fb34..db75011cb756cbe387d3543b088b1f9d0b36495b 100644 (file)
--- a/src/target/arm720t.c
+++ b/src/target/arm720t.c
@@ -389,11 +389,11 @@ static void arm720t_deinit_target(struct target *target)
 /* FIXME remove forward decls */
 static int arm720t_mrc(struct target *target, int cpnum,
                uint32_t op1, uint32_t op2,
-               uint32_t CRn, uint32_t CRm,
+               uint32_t crn, uint32_t crm,
                uint32_t *value);
 static int arm720t_mcr(struct target *target, int cpnum,
                uint32_t op1, uint32_t op2,
-               uint32_t CRn, uint32_t CRm,
+               uint32_t crn, uint32_t crm,
                uint32_t value);
 
 static int arm720t_init_arch_info(struct target *target,
@@ -427,13 +427,13 @@ static int arm720t_target_create(struct target *target, Jim_Interp *interp)
 {
        struct arm720t_common *arm720t = calloc(1, sizeof(*arm720t));
 
-       arm720t->arm7_9_common.arm.is_armv4 = true;
+       arm720t->arm7_9_common.arm.arch = ARM_ARCH_V4;
        return arm720t_init_arch_info(target, arm720t, target->tap);
 }
 
 static int arm720t_mrc(struct target *target, int cpnum,
                uint32_t op1, uint32_t op2,
-               uint32_t CRn, uint32_t CRm,
+               uint32_t crn, uint32_t crm,
                uint32_t *value)
 {
        if (cpnum != 15) {
@@ -443,14 +443,14 @@ static int arm720t_mrc(struct target *target, int cpnum,
 
        /* read "to" r0 */
        return arm720t_read_cp15(target,
-                       ARMV4_5_MRC(cpnum, op1, 0, CRn, CRm, op2),
+                       ARMV4_5_MRC(cpnum, op1, 0, crn, crm, op2),
                        value);
 
 }
 
 static int arm720t_mcr(struct target *target, int cpnum,
                uint32_t op1, uint32_t op2,
-               uint32_t CRn, uint32_t CRm,
+               uint32_t crn, uint32_t crm,
                uint32_t value)
 {
        if (cpnum != 15) {
@@ -460,7 +460,7 @@ static int arm720t_mcr(struct target *target, int cpnum,
 
        /* write "from" r0 */
        return arm720t_write_cp15(target,
-                       ARMV4_5_MCR(cpnum, op1, 0, CRn, CRm, op2),
+                       ARMV4_5_MCR(cpnum, op1, 0, crn, crm, op2),
                        value);
 }