yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-11-04 13:44:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/arm: Move id_pfr0, id_pfr1 into ARMISARegisters

Browse source 
Move the id_pfr0 and id_pfr1 fields into the ARMISARegisters
sub-struct. We're going to want id_pfr1 for an isar_features
check, and moving both at the same time avoids an odd
inconsistency.

Changes other than the ones to cpu.h and kvm64.c made
automatically with:
perl -p -i -e 's/cpu->id_pfr/cpu->isar.id_pfr/' target/arm/*.c hw/intc/armv7m_nvic.c

Backports commit 8a130a7be6e222965641e1fd9469fd3ee752c7d4
This commit is contained in:
Peter Maydell 2021-03-01 19:09:41 -05:00 committed by Lioncash
parent ed92f3c42b
commit 09a7d6381e
4 changed files with 38 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
qemu/target/arm/cpu.c
View file

@ -916,7 +916,7 @@ static int arm_cpu_realizefn(struct uc_struct *uc, DeviceState *dev, Error **err
/* Disable the security extension feature bits in the processor feature /* Disable the security extension feature bits in the processor feature
* registers as well. These are id_pfr1[7:4] and id_aa64pfr0[15:12]. * registers as well. These are id_pfr1[7:4] and id_aa64pfr0[15:12].
*/ */
cpu->id_pfr1 &= ~0xf0; cpu->isar.id_pfr1 &= ~0xf0;
cpu->isar.id_aa64pfr0 &= ~0xf000; cpu->isar.id_aa64pfr0 &= ~0xf000;
} }
@ -946,7 +946,7 @@ static int arm_cpu_realizefn(struct uc_struct *uc, DeviceState *dev, Error **err
* id_aa64pfr0_el1[11:8]. * id_aa64pfr0_el1[11:8].
*/ */
cpu->isar.id_aa64pfr0 &= ~0xf00; cpu->isar.id_aa64pfr0 &= ~0xf00;
cpu->id_pfr1 &= ~0xf000; cpu->isar.id_pfr1 &= ~0xf000;
} }
/* MPU can be configured out of a PMSA CPU either by setting has-mpu /* MPU can be configured out of a PMSA CPU either by setting has-mpu
@ -1218,8 +1218,8 @@ static void arm1136_r2_initfn(struct uc_struct *uc, Object *obj, void *opaque)
cpu->isar.mvfr1 = 0x00000000; cpu->isar.mvfr1 = 0x00000000;
cpu->ctr = 0x1dd20d2; cpu->ctr = 0x1dd20d2;
cpu->reset_sctlr = 0x00050078; cpu->reset_sctlr = 0x00050078;
cpu->id_pfr0 = 0x111; cpu->isar.id_pfr0 = 0x111;
cpu->id_pfr1 = 0x1; cpu->isar.id_pfr1 = 0x1;
cpu->isar.id_dfr0 = 0x2; cpu->isar.id_dfr0 = 0x2;
cpu->id_afr0 = 0x3; cpu->id_afr0 = 0x3;
cpu->isar.id_mmfr0 = 0x01130003; cpu->isar.id_mmfr0 = 0x01130003;
@ -1249,8 +1249,8 @@ static void arm1136_initfn(struct uc_struct *uc, Object *obj, void *opaque)
cpu->isar.mvfr1 = 0x00000000; cpu->isar.mvfr1 = 0x00000000;
cpu->ctr = 0x1dd20d2; cpu->ctr = 0x1dd20d2;
cpu->reset_sctlr = 0x00050078; cpu->reset_sctlr = 0x00050078;
cpu->id_pfr0 = 0x111; cpu->isar.id_pfr0 = 0x111;
cpu->id_pfr1 = 0x1; cpu->isar.id_pfr1 = 0x1;
cpu->isar.id_dfr0 = 0x2; cpu->isar.id_dfr0 = 0x2;
cpu->id_afr0 = 0x3; cpu->id_afr0 = 0x3;
cpu->isar.id_mmfr0 = 0x01130003; cpu->isar.id_mmfr0 = 0x01130003;
@ -1281,8 +1281,8 @@ static void arm1176_initfn(struct uc_struct *uc, Object *obj, void *opaque)
cpu->isar.mvfr1 = 0x00000000; cpu->isar.mvfr1 = 0x00000000;
cpu->ctr = 0x1dd20d2; cpu->ctr = 0x1dd20d2;
cpu->reset_sctlr = 0x00050078; cpu->reset_sctlr = 0x00050078;
cpu->id_pfr0 = 0x111; cpu->isar.id_pfr0 = 0x111;
cpu->id_pfr1 = 0x11; cpu->isar.id_pfr1 = 0x11;
cpu->isar.id_dfr0 = 0x33; cpu->isar.id_dfr0 = 0x33;
cpu->id_afr0 = 0; cpu->id_afr0 = 0;
cpu->isar.id_mmfr0 = 0x01130003; cpu->isar.id_mmfr0 = 0x01130003;
@ -1310,8 +1310,8 @@ static void arm11mpcore_initfn(struct uc_struct *uc, Object *obj, void *opaque)
cpu->isar.mvfr0 = 0x11111111; cpu->isar.mvfr0 = 0x11111111;
cpu->isar.mvfr1 = 0x00000000; cpu->isar.mvfr1 = 0x00000000;
cpu->ctr = 0x1d192992; /* 32K icache 32K dcache */ cpu->ctr = 0x1d192992; /* 32K icache 32K dcache */
cpu->id_pfr0 = 0x111; cpu->isar.id_pfr0 = 0x111;
cpu->id_pfr1 = 0x1; cpu->isar.id_pfr1 = 0x1;
cpu->isar.id_dfr0 = 0; cpu->isar.id_dfr0 = 0;
cpu->id_afr0 = 0x2; cpu->id_afr0 = 0x2;
cpu->isar.id_mmfr0 = 0x01100103; cpu->isar.id_mmfr0 = 0x01100103;
@ -1342,8 +1342,8 @@ static void cortex_m3_initfn(struct uc_struct *uc, Object *obj, void *opaque)
set_feature(&cpu->env, ARM_FEATURE_M_MAIN); set_feature(&cpu->env, ARM_FEATURE_M_MAIN);
cpu->midr = 0x410fc231; cpu->midr = 0x410fc231;
cpu->pmsav7_dregion = 8; cpu->pmsav7_dregion = 8;
cpu->id_pfr0 = 0x00000030; cpu->isar.id_pfr0 = 0x00000030;
cpu->id_pfr1 = 0x00000200; cpu->isar.id_pfr1 = 0x00000200;
cpu->isar.id_dfr0 = 0x00100000; cpu->isar.id_dfr0 = 0x00100000;
cpu->id_afr0 = 0x00000000; cpu->id_afr0 = 0x00000000;
cpu->isar.id_mmfr0 = 0x00000030; cpu->isar.id_mmfr0 = 0x00000030;
@ -1372,8 +1372,8 @@ static void cortex_m4_initfn(struct uc_struct *uc, Object *obj, void *opaque)
cpu->isar.mvfr0 = 0x10110021; cpu->isar.mvfr0 = 0x10110021;
cpu->isar.mvfr1 = 0x11000011; cpu->isar.mvfr1 = 0x11000011;
cpu->isar.mvfr2 = 0x00000000; cpu->isar.mvfr2 = 0x00000000;
cpu->id_pfr0 = 0x00000030; cpu->isar.id_pfr0 = 0x00000030;
cpu->id_pfr1 = 0x00000200; cpu->isar.id_pfr1 = 0x00000200;
cpu->isar.id_dfr0 = 0x00100000; cpu->isar.id_dfr0 = 0x00100000;
cpu->id_afr0 = 0x00000000; cpu->id_afr0 = 0x00000000;
cpu->isar.id_mmfr0 = 0x00000030; cpu->isar.id_mmfr0 = 0x00000030;
@ -1402,8 +1402,8 @@ static void cortex_m7_initfn(struct uc_struct *uc, Object *obj, void *opaque)
cpu->isar.mvfr0 = 0x10110221; cpu->isar.mvfr0 = 0x10110221;
cpu->isar.mvfr1 = 0x12000011; cpu->isar.mvfr1 = 0x12000011;
cpu->isar.mvfr2 = 0x00000040; cpu->isar.mvfr2 = 0x00000040;
cpu->id_pfr0 = 0x00000030; cpu->isar.id_pfr0 = 0x00000030;
cpu->id_pfr1 = 0x00000200; cpu->isar.id_pfr1 = 0x00000200;
cpu->isar.id_dfr0 = 0x00100000; cpu->isar.id_dfr0 = 0x00100000;
cpu->id_afr0 = 0x00000000; cpu->id_afr0 = 0x00000000;
cpu->isar.id_mmfr0 = 0x00100030; cpu->isar.id_mmfr0 = 0x00100030;
@ -1435,8 +1435,8 @@ static void cortex_m33_initfn(struct uc_struct *uc, Object *obj, void *opaque)
cpu->isar.mvfr0 = 0x10110021; cpu->isar.mvfr0 = 0x10110021;
cpu->isar.mvfr1 = 0x11000011; cpu->isar.mvfr1 = 0x11000011;
cpu->isar.mvfr2 = 0x00000040; cpu->isar.mvfr2 = 0x00000040;
cpu->id_pfr0 = 0x00000030; cpu->isar.id_pfr0 = 0x00000030;
cpu->id_pfr1 = 0x00000210; cpu->isar.id_pfr1 = 0x00000210;
cpu->isar.id_dfr0 = 0x00200000; cpu->isar.id_dfr0 = 0x00200000;
cpu->id_afr0 = 0x00000000; cpu->id_afr0 = 0x00000000;
cpu->isar.id_mmfr0 = 0x00101F40; cpu->isar.id_mmfr0 = 0x00101F40;
@ -1485,8 +1485,8 @@ static void cortex_r5_initfn(struct uc_struct *uc, Object *obj, void *opaque)
set_feature(&cpu->env, ARM_FEATURE_PMSA); set_feature(&cpu->env, ARM_FEATURE_PMSA);
set_feature(&cpu->env, ARM_FEATURE_PMU); set_feature(&cpu->env, ARM_FEATURE_PMU);
cpu->midr = 0x411fc153; /* r1p3 */ cpu->midr = 0x411fc153; /* r1p3 */
cpu->id_pfr0 = 0x0131; cpu->isar.id_pfr0 = 0x0131;
cpu->id_pfr1 = 0x001; cpu->isar.id_pfr1 = 0x001;
cpu->isar.id_dfr0 = 0x010400; cpu->isar.id_dfr0 = 0x010400;
cpu->id_afr0 = 0x0; cpu->id_afr0 = 0x0;
cpu->isar.id_mmfr0 = 0x0210030; cpu->isar.id_mmfr0 = 0x0210030;
@ -1538,8 +1538,8 @@ static void cortex_a8_initfn(struct uc_struct *uc, Object *obj, void *opaque)
cpu->isar.mvfr1 = 0x00011111; cpu->isar.mvfr1 = 0x00011111;
cpu->ctr = 0x82048004; cpu->ctr = 0x82048004;
cpu->reset_sctlr = 0x00c50078; cpu->reset_sctlr = 0x00c50078;
cpu->id_pfr0 = 0x1031; cpu->isar.id_pfr0 = 0x1031;
cpu->id_pfr1 = 0x11; cpu->isar.id_pfr1 = 0x11;
cpu->isar.id_dfr0 = 0x400; cpu->isar.id_dfr0 = 0x400;
cpu->id_afr0 = 0; cpu->id_afr0 = 0;
cpu->isar.id_mmfr0 = 0x31100003; cpu->isar.id_mmfr0 = 0x31100003;
@ -1610,8 +1610,8 @@ static void cortex_a9_initfn(struct uc_struct *uc, Object *obj, void *opaque)
cpu->isar.mvfr1 = 0x01111111; cpu->isar.mvfr1 = 0x01111111;
cpu->ctr = 0x80038003; cpu->ctr = 0x80038003;
cpu->reset_sctlr = 0x00c50078; cpu->reset_sctlr = 0x00c50078;
cpu->id_pfr0 = 0x1031; cpu->isar.id_pfr0 = 0x1031;
cpu->id_pfr1 = 0x11; cpu->isar.id_pfr1 = 0x11;
cpu->isar.id_dfr0 = 0x000; cpu->isar.id_dfr0 = 0x000;
cpu->id_afr0 = 0; cpu->id_afr0 = 0;
cpu->isar.id_mmfr0 = 0x00100103; cpu->isar.id_mmfr0 = 0x00100103;
@ -1672,8 +1672,8 @@ static void cortex_a7_initfn(struct uc_struct *uc, Object *obj, void *opaque)
cpu->isar.mvfr1 = 0x11111111; cpu->isar.mvfr1 = 0x11111111;
cpu->ctr = 0x84448003; cpu->ctr = 0x84448003;
cpu->reset_sctlr = 0x00c50078; cpu->reset_sctlr = 0x00c50078;
cpu->id_pfr0 = 0x00001131; cpu->isar.id_pfr0 = 0x00001131;
cpu->id_pfr1 = 0x00011011; cpu->isar.id_pfr1 = 0x00011011;
cpu->isar.id_dfr0 = 0x02010555; cpu->isar.id_dfr0 = 0x02010555;
cpu->id_afr0 = 0x00000000; cpu->id_afr0 = 0x00000000;
cpu->isar.id_mmfr0 = 0x10101105; cpu->isar.id_mmfr0 = 0x10101105;
@ -1717,8 +1717,8 @@ static void cortex_a15_initfn(struct uc_struct *uc, Object *obj, void *opaque)
cpu->isar.mvfr1 = 0x11111111; cpu->isar.mvfr1 = 0x11111111;
cpu->ctr = 0x8444c004; cpu->ctr = 0x8444c004;
cpu->reset_sctlr = 0x00c50078; cpu->reset_sctlr = 0x00c50078;
cpu->id_pfr0 = 0x00001131; cpu->isar.id_pfr0 = 0x00001131;
cpu->id_pfr1 = 0x00011011; cpu->isar.id_pfr1 = 0x00011011;
cpu->isar.id_dfr0 = 0x02010555; cpu->isar.id_dfr0 = 0x02010555;
cpu->id_afr0 = 0x00000000; cpu->id_afr0 = 0x00000000;
cpu->isar.id_mmfr0 = 0x10201105; cpu->isar.id_mmfr0 = 0x10201105;

4
qemu/target/arm/cpu.h
View file

@ -863,6 +863,8 @@ struct ARMCPU {
uint32_t id_mmfr2; uint32_t id_mmfr2;
uint32_t id_mmfr3; uint32_t id_mmfr3;
uint32_t id_mmfr4; uint32_t id_mmfr4;
uint32_t id_pfr0;
uint32_t id_pfr1;
uint32_t mvfr0; uint32_t mvfr0;
uint32_t mvfr1; uint32_t mvfr1;
uint32_t mvfr2; uint32_t mvfr2;
@ -883,8 +885,6 @@ struct ARMCPU {
uint32_t reset_fpsid; uint32_t reset_fpsid;
uint32_t ctr; uint32_t ctr;
uint32_t reset_sctlr; uint32_t reset_sctlr;
uint32_t id_pfr0;
uint32_t id_pfr1;
uint64_t pmceid0; uint64_t pmceid0;
uint64_t pmceid1; uint64_t pmceid1;
uint32_t id_afr0; uint32_t id_afr0;

12
qemu/target/arm/cpu64.c
View file

@ -103,8 +103,8 @@ static void aarch64_a57_initfn(struct uc_struct *uc, Object *obj, void *opaque)
cpu->isar.mvfr2 = 0x00000043; cpu->isar.mvfr2 = 0x00000043;
cpu->ctr = 0x8444c004; cpu->ctr = 0x8444c004;
cpu->reset_sctlr = 0x00c50838; cpu->reset_sctlr = 0x00c50838;
cpu->id_pfr0 = 0x00000131; cpu->isar.id_pfr0 = 0x00000131;
cpu->id_pfr1 = 0x00011011; cpu->isar.id_pfr1 = 0x00011011;
cpu->isar.id_dfr0 = 0x03010066; cpu->isar.id_dfr0 = 0x03010066;
cpu->id_afr0 = 0x00000000; cpu->id_afr0 = 0x00000000;
cpu->isar.id_mmfr0 = 0x10101105; cpu->isar.id_mmfr0 = 0x10101105;
@ -153,8 +153,8 @@ static void aarch64_a53_initfn(struct uc_struct *uc, Object *obj, void *opaque)
cpu->isar.mvfr2 = 0x00000043; cpu->isar.mvfr2 = 0x00000043;
cpu->ctr = 0x84448004; /* L1Ip = VIPT */ cpu->ctr = 0x84448004; /* L1Ip = VIPT */
cpu->reset_sctlr = 0x00c50838; cpu->reset_sctlr = 0x00c50838;
cpu->id_pfr0 = 0x00000131; cpu->isar.id_pfr0 = 0x00000131;
cpu->id_pfr1 = 0x00011011; cpu->isar.id_pfr1 = 0x00011011;
cpu->isar.id_dfr0 = 0x03010066; cpu->isar.id_dfr0 = 0x03010066;
cpu->id_afr0 = 0x00000000; cpu->id_afr0 = 0x00000000;
cpu->isar.id_mmfr0 = 0x10101105; cpu->isar.id_mmfr0 = 0x10101105;
@ -202,8 +202,8 @@ static void aarch64_a72_initfn(struct uc_struct *uc, Object *obj, void *opaque)
cpu->isar.mvfr2 = 0x00000043; cpu->isar.mvfr2 = 0x00000043;
cpu->ctr = 0x8444c004; cpu->ctr = 0x8444c004;
cpu->reset_sctlr = 0x00c50838; cpu->reset_sctlr = 0x00c50838;
cpu->id_pfr0 = 0x00000131; cpu->isar.id_pfr0 = 0x00000131;
cpu->id_pfr1 = 0x00011011; cpu->isar.id_pfr1 = 0x00011011;
cpu->isar.id_dfr0 = 0x03010066; cpu->isar.id_dfr0 = 0x03010066;
cpu->id_afr0 = 0x00000000; cpu->id_afr0 = 0x00000000;
cpu->isar.id_mmfr0 = 0x10201105; cpu->isar.id_mmfr0 = 0x10201105;

4
qemu/target/arm/helper.c
View file

@ -6322,7 +6322,7 @@ static void define_pmu_regs(ARMCPU *cpu)
static uint64_t id_pfr1_read(CPUARMState *env, const ARMCPRegInfo *ri) static uint64_t id_pfr1_read(CPUARMState *env, const ARMCPRegInfo *ri)
{ {
ARMCPU *cpu = env_archcpu(env); ARMCPU *cpu = env_archcpu(env);
uint64_t pfr1 = cpu->id_pfr1; uint64_t pfr1 = cpu->isar.id_pfr1;
if (env->gicv3state) { if (env->gicv3state) {
pfr1 |= 1 << 28; pfr1 |= 1 << 28;
@ -6960,7 +6960,7 @@ void register_cp_regs_for_features(ARMCPU *cpu)
.opc0 = 3, .opc1 = 0, .crn = 0, .crm = 1, .opc2 = 0, .opc0 = 3, .opc1 = 0, .crn = 0, .crm = 1, .opc2 = 0,
.access = PL1_R, .type = ARM_CP_CONST, .access = PL1_R, .type = ARM_CP_CONST,
.accessfn = access_aa32_tid3, .accessfn = access_aa32_tid3,
.resetvalue = cpu->id_pfr0 }, .resetvalue = cpu->isar.id_pfr0 },
/* ID_PFR1 is not a plain ARM_CP_CONST because we don't know /* ID_PFR1 is not a plain ARM_CP_CONST because we don't know
* the value of the GIC field until after we define these regs. * the value of the GIC field until after we define these regs.
*/ */