[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/17] target-arm: rename c1_coproc to cpacr_el1
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 15/17] target-arm: rename c1_coproc to cpacr_el1 |
Date: |
Mon, 27 Apr 2015 16:20:43 +0100 |
From: Sergey Fedorov <address@hidden>
Rename the field holding CPACR_EL1 system register state in AArch64
naming style.
Signed-off-by: Sergey Fedorov <address@hidden>
[PMM: also fixed a couple of missed occurrences in cpu.c]
Signed-off-by: Peter Maydell <address@hidden>
---
hw/arm/pxa2xx.c | 2 +-
target-arm/cpu.c | 4 ++--
target-arm/cpu.h | 4 ++--
target-arm/helper.c | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c
index 165ba2a..f921a56 100644
--- a/hw/arm/pxa2xx.c
+++ b/hw/arm/pxa2xx.c
@@ -274,7 +274,7 @@ static void pxa2xx_pwrmode_write(CPUARMState *env, const
ARMCPRegInfo *ri,
s->cpu->env.uncached_cpsr = ARM_CPU_MODE_SVC;
s->cpu->env.daif = PSTATE_A | PSTATE_F | PSTATE_I;
s->cpu->env.cp15.sctlr_ns = 0;
- s->cpu->env.cp15.c1_coproc = 0;
+ s->cpu->env.cp15.cpacr_el1 = 0;
s->cpu->env.cp15.ttbr0_el[1] = 0;
s->cpu->env.cp15.dacr_ns = 0;
s->pm_regs[PSSR >> 2] |= 0x8; /* Set STS */
diff --git a/target-arm/cpu.c b/target-arm/cpu.c
index 986f04c..3b5a93d 100644
--- a/target-arm/cpu.c
+++ b/target-arm/cpu.c
@@ -111,7 +111,7 @@ static void arm_cpu_reset(CPUState *s)
/* Userspace expects access to DC ZVA, CTL_EL0 and the cache ops */
env->cp15.sctlr_el[1] |= SCTLR_UCT | SCTLR_UCI | SCTLR_DZE;
/* and to the FP/Neon instructions */
- env->cp15.c1_coproc = deposit64(env->cp15.c1_coproc, 20, 2, 3);
+ env->cp15.cpacr_el1 = deposit64(env->cp15.cpacr_el1, 20, 2, 3);
#else
/* Reset into the highest available EL */
if (arm_feature(env, ARM_FEATURE_EL3)) {
@@ -126,7 +126,7 @@ static void arm_cpu_reset(CPUState *s)
} else {
#if defined(CONFIG_USER_ONLY)
/* Userspace expects access to cp10 and cp11 for FP/Neon */
- env->cp15.c1_coproc = deposit64(env->cp15.c1_coproc, 20, 4, 0xf);
+ env->cp15.cpacr_el1 = deposit64(env->cp15.cpacr_el1, 20, 4, 0xf);
#endif
}
diff --git a/target-arm/cpu.h b/target-arm/cpu.h
index 083211c..d63d9b2 100644
--- a/target-arm/cpu.h
+++ b/target-arm/cpu.h
@@ -201,7 +201,7 @@ typedef struct CPUARMState {
};
uint64_t sctlr_el[4];
};
- uint64_t c1_coproc; /* Coprocessor access register. */
+ uint64_t cpacr_el1; /* Architectural feature access control register */
uint32_t c1_xscaleauxcr; /* XScale auxiliary control register. */
uint64_t sder; /* Secure debug enable register. */
uint32_t nsacr; /* Non-secure access control register. */
@@ -1813,7 +1813,7 @@ static inline void cpu_get_tb_cpu_state(CPUARMState *env,
target_ulong *pc,
int fpen;
if (arm_feature(env, ARM_FEATURE_V6)) {
- fpen = extract32(env->cp15.c1_coproc, 20, 2);
+ fpen = extract32(env->cp15.cpacr_el1, 20, 2);
} else {
/* CPACR doesn't exist before v6, so VFP is always accessible */
fpen = 3;
diff --git a/target-arm/helper.c b/target-arm/helper.c
index 50469cd..0ac6ff1 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -589,7 +589,7 @@ static void cpacr_write(CPUARMState *env, const
ARMCPRegInfo *ri,
}
value &= mask;
}
- env->cp15.c1_coproc = value;
+ env->cp15.cpacr_el1 = value;
}
static const ARMCPRegInfo v6_cp_reginfo[] = {
@@ -615,7 +615,7 @@ static const ARMCPRegInfo v6_cp_reginfo[] = {
.access = PL1_RW, .type = ARM_CP_CONST, .resetvalue = 0, },
{ .name = "CPACR", .state = ARM_CP_STATE_BOTH, .opc0 = 3,
.crn = 1, .crm = 0, .opc1 = 0, .opc2 = 2,
- .access = PL1_RW, .fieldoffset = offsetof(CPUARMState, cp15.c1_coproc),
+ .access = PL1_RW, .fieldoffset = offsetof(CPUARMState, cp15.cpacr_el1),
.resetvalue = 0, .writefn = cpacr_write },
REGINFO_SENTINEL
};
--
1.9.1
- [Qemu-devel] [PULL 00/17] target-arm queue, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 17/17] Allow ARMv8 SCR.SMD updates, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 14/17] target-arm: Check watchpoints against CPU security state, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 16/17] target-arm: Adjust id_aa64pfr0 when has_el3 CPU property disabled, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 01/17] memory: Define API for MemoryRegionOps to take attrs and return status, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 15/17] target-arm: rename c1_coproc to cpacr_el1,
Peter Maydell <=
- [Qemu-devel] [PULL 12/17] target-arm: Add user-mode transaction attribute, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 13/17] target-arm: Use attribute info to handle user-only watchpoints, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 11/17] target-arm: Use correct memory attributes for page table walks, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 10/17] target-arm: Honour NS bits in page tables, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 05/17] exec.c: Convert subpage memory ops to _with_attrs, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 03/17] Make CPU iotlb a structure rather than a plain hwaddr, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 06/17] exec.c: Make address_space_rw take transaction attributes, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 07/17] exec.c: Add new address_space_ld*/st* functions, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 09/17] Switch non-CPU callers from ld/st*_phys to address_space_ld/st*, Peter Maydell, 2015/04/27
- [Qemu-devel] [PULL 02/17] memory: Replace io_mem_read/write with memory_region_dispatch_read/write, Peter Maydell, 2015/04/27