yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-12-23 10:55:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/arm: Fix CRn to be 14 for PMEVTYPER/PMEVCNTR

Browse source 
This bug was introduced in:
commit 5ecdd3e47cadae83a62dc92b472f1fe163b56f59
target/arm: Finish implementation of PM[X]EVCNTR and PM[X]EVTYPER

Backports commit 62c7ec3488fe0dcbabffd543f458914e27736115 from qemu
This commit is contained in:
Aaron Lindsay OS 2019-02-15 17:11:51 -05:00 committed by Lioncash
parent 6099733fc5
commit af17f7fa59
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5134,17 +5134,17 @@ void register_cp_regs_for_features(ARMCPU *cpu)
char *pmevtyper_name = g_strdup_printf("PMEVTYPER%d", i);
char *pmevtyper_el0_name = g_strdup_printf("PMEVTYPER%d_EL0", i);
ARMCPRegInfo pmev_regs[] = {
{ pmevcntr_name, 15, 15, 8 | (3 & (i >> 3)), 0,0,i & 7,
{ pmevcntr_name, 15, 14, 8 | (3 & (i >> 3)), 0,0,i & 7,
0, ARM_CP_IO | ARM_CP_ALIAS, PL0_RW, 0, NULL, 0, 0, {0, 0},
pmreg_access, pmevcntr_readfn, pmevcntr_writefn },
{ pmevcntr_el0_name, 0,15, 8 | (3 & (i >> 3)), 3,3,i & 7,
{ pmevcntr_el0_name, 0,14, 8 | (3 & (i >> 3)), 3,3,i & 7,
ARM_CP_STATE_AA64, ARM_CP_IO, PL0_RW, 0, NULL, 0, 0, {0, 0},
pmreg_access, pmevcntr_readfn, pmevcntr_writefn,
pmevcntr_rawread, pmevcntr_rawwrite },
{ pmevtyper_name, 15,15,12 | (3 & (i >> 3)), 0,0,i & 7,
{ pmevtyper_name, 15,14,12 | (3 & (i >> 3)), 0,0,i & 7,
0, ARM_CP_IO | ARM_CP_ALIAS, PL0_RW, 0, NULL, 0, 0, {0, 0},
pmreg_access, pmevtyper_readfn, pmevtyper_writefn },
{ pmevtyper_el0_name, 0,15,12 | (3 & (i >> 3)), 3,3,i & 7,
{ pmevtyper_el0_name, 0,14,12 | (3 & (i >> 3)), 3,3,i & 7,
ARM_CP_STATE_AA64, ARM_CP_IO, PL0_RW, 0, NULL, 0, 0, {0, 0},
pmreg_access, pmevtyper_readfn, pmevtyper_writefn, NULL,
pmevtyper_rawwrite },