yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-02-02 18:01:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/arm: PMU: Set PMCR.N to 4

Browse source 
This both advertises that we support four counters and enables them
because the pmu_num_counters() reads this value from PMCR.

Backports commit ac689a2e5155d129acaa39603e2a7a29abd90d89 from qemu
This commit is contained in:
Aaron Lindsay 2019-01-22 18:55:30 -05:00 committed by Lioncash
parent dede23994a
commit 9727b7c3e0
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1639,7 +1639,7 @@ static const ARMCPRegInfo v7_cp_reginfo[] = {
ARM_CP_NOP, PL1_W, }, ARM_CP_NOP, PL1_W, },
/* Performance monitors are implementation defined in v7, /* Performance monitors are implementation defined in v7,
* but with an ARM recommended set of registers, which we * but with an ARM recommended set of registers, which we
* follow (although we don't actually implement any counters) * follow.
* *
* Performance registers fall into three categories: * Performance registers fall into three categories:
* (a) always UNDEF in PL0, RW in PL1 (PMINTENSET, PMINTENCLR) * (a) always UNDEF in PL0, RW in PL1 (PMINTENSET, PMINTENCLR)
@ -5027,10 +5027,10 @@ void register_cp_regs_for_features(ARMCPU *cpu)
} }
if (arm_feature(env, ARM_FEATURE_V7)) { if (arm_feature(env, ARM_FEATURE_V7)) {
/* v7 performance monitor control register: same implementor /* v7 performance monitor control register: same implementor
* field as main ID register, and we implement only the cycle * field as main ID register, and we implement four counters in
* count register. * addition to the cycle count register.
*/ */
unsigned int i, pmcrn = 0; unsigned int i, pmcrn = 4;
ARMCPRegInfo pmcr = { ARMCPRegInfo pmcr = {
"PMCR", 15,9,12, 0,0,0, 0, "PMCR", 15,9,12, 0,0,0, 0,
ARM_CP_IO | ARM_CP_ALIAS, PL0_RW, 0, NULL, 0, offsetoflow32(CPUARMState, cp15.c9_pmcr), {0, 0}, ARM_CP_IO | ARM_CP_ALIAS, PL0_RW, 0, NULL, 0, offsetoflow32(CPUARMState, cp15.c9_pmcr), {0, 0},
@ -5038,7 +5038,7 @@ void register_cp_regs_for_features(ARMCPU *cpu)
}; };
ARMCPRegInfo pmcr64 = { ARMCPRegInfo pmcr64 = {
"PMCR_EL0", 0,9,12, 3,3,0, ARM_CP_STATE_AA64, "PMCR_EL0", 0,9,12, 3,3,0, ARM_CP_STATE_AA64,
ARM_CP_IO, PL0_RW, 0, NULL, cpu->midr & 0xff000000, offsetof(CPUARMState, cp15.c9_pmcr), {0, 0}, ARM_CP_IO, PL0_RW, 0, NULL, (cpu->midr & 0xff000000) | (pmcrn << PMCRN_SHIFT), offsetof(CPUARMState, cp15.c9_pmcr), {0, 0},
pmreg_access, NULL,pmcr_write, NULL,raw_write, pmreg_access, NULL,pmcr_write, NULL,raw_write,
}; };
define_one_arm_cp_reg(cpu, &pmcr); define_one_arm_cp_reg(cpu, &pmcr);