mirror of
https://github.com/yuzu-emu/unicorn.git
synced 2025-07-15 20:57:39 +00:00
target-arm: Remove v8_ prefix from names of non-v8-specific cpreg arrays
The ARMCPRegInfo arrays v8_el3_no_el2_cp_reginfo and v8_el2_cp_reginfo are actually used on non-v8 CPUs as well. Remove the incorrect v8_ prefix from their names. Backports commit 4771cd01daaccb2a8929fa04c88c608e378cf814 from qemu
This commit is contained in:
parent
8a8e174981
commit
ed58b3afac
|
@ -2173,7 +2173,7 @@ static const ARMCPRegInfo v8_cp_reginfo[] = {
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Used to describe the behaviour of EL2 regs when EL2 does not exist. */
|
/* Used to describe the behaviour of EL2 regs when EL2 does not exist. */
|
||||||
static const ARMCPRegInfo v8_el3_no_el2_cp_reginfo[] = {
|
static const ARMCPRegInfo el3_no_el2_cp_reginfo[] = {
|
||||||
{ "VBAR_EL2", 0,12,0, 3,4,0, ARM_CP_STATE_AA64,
|
{ "VBAR_EL2", 0,12,0, 3,4,0, ARM_CP_STATE_AA64,
|
||||||
0, PL2_RW, 0, NULL, 0, 0, {0, 0},
|
0, PL2_RW, 0, NULL, 0, 0, {0, 0},
|
||||||
NULL, arm_cp_read_zero, arm_cp_write_ignore },
|
NULL, arm_cp_read_zero, arm_cp_write_ignore },
|
||||||
|
@ -2224,7 +2224,7 @@ static void hcr_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value)
|
||||||
raw_write(env, ri, value);
|
raw_write(env, ri, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const ARMCPRegInfo v8_el2_cp_reginfo[] = {
|
static const ARMCPRegInfo el2_cp_reginfo[] = {
|
||||||
{ "HCR_EL2", 0,1,1, 3,4,0, ARM_CP_STATE_AA64,
|
{ "HCR_EL2", 0,1,1, 3,4,0, ARM_CP_STATE_AA64,
|
||||||
0, PL2_RW, 0, NULL, 0, offsetof(CPUARMState, cp15.hcr_el2), {0, 0},
|
0, PL2_RW, 0, NULL, 0, offsetof(CPUARMState, cp15.hcr_el2), {0, 0},
|
||||||
NULL, NULL, hcr_write },
|
NULL, NULL, hcr_write },
|
||||||
|
@ -2831,7 +2831,7 @@ void register_cp_regs_for_features(ARMCPU *cpu)
|
||||||
define_arm_cp_regs(cpu, v8_cp_reginfo);
|
define_arm_cp_regs(cpu, v8_cp_reginfo);
|
||||||
}
|
}
|
||||||
if (arm_feature(env, ARM_FEATURE_EL2)) {
|
if (arm_feature(env, ARM_FEATURE_EL2)) {
|
||||||
define_arm_cp_regs(cpu, v8_el2_cp_reginfo);
|
define_arm_cp_regs(cpu, el2_cp_reginfo);
|
||||||
/* RVBAR_EL2 is only implemented if EL2 is the highest EL */
|
/* RVBAR_EL2 is only implemented if EL2 is the highest EL */
|
||||||
if (!arm_feature(env, ARM_FEATURE_EL3)) {
|
if (!arm_feature(env, ARM_FEATURE_EL3)) {
|
||||||
ARMCPRegInfo rvbar = {
|
ARMCPRegInfo rvbar = {
|
||||||
|
@ -2845,7 +2845,7 @@ void register_cp_regs_for_features(ARMCPU *cpu)
|
||||||
* register the no_el2 reginfos.
|
* register the no_el2 reginfos.
|
||||||
*/
|
*/
|
||||||
if (arm_feature(env, ARM_FEATURE_EL3)) {
|
if (arm_feature(env, ARM_FEATURE_EL3)) {
|
||||||
define_arm_cp_regs(cpu, v8_el3_no_el2_cp_reginfo);
|
define_arm_cp_regs(cpu, el3_no_el2_cp_reginfo);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (arm_feature(env, ARM_FEATURE_EL3)) {
|
if (arm_feature(env, ARM_FEATURE_EL3)) {
|
||||||
|
|
Loading…
Reference in a new issue