yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-03-26 20:45:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

arm: Do not define TLBTR in PMSA systems

Browse source 
If doing a PMSA (MPU) system do not define the VMSA specific TLBTR CP.
The def is done separately from VMSA registers group as it is affected
by both the OMAP/STRONGARM RW errata and the MIDR backgrounding.

Backports commit 8085ce63c5967d200f1241b6c0a189371993c5df from qemu
This commit is contained in:
Peter Crosthwaite 2018-02-13 14:35:11 -05:00 committed by Lioncash
parent caed2f123d
commit 70fae13253
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2955,10 +2955,12 @@ void register_cp_regs_for_features(ARMCPU *cpu)
/* TCMTR and TLBTR exist in v8 but have no 64-bit versions */ /* TCMTR and TLBTR exist in v8 but have no 64-bit versions */
{ "TCMTR", 15,0,0, 0,0,2, 0, { "TCMTR", 15,0,0, 0,0,2, 0,
ARM_CP_CONST, PL1_R, 0, NULL, 0 }, ARM_CP_CONST, PL1_R, 0, NULL, 0 },
{ "TLBTR", 15,0,0, 0,0,3, 0,
ARM_CP_CONST, PL1_R, 0, NULL, 0 },
REGINFO_SENTINEL REGINFO_SENTINEL
}; };
ARMCPRegInfo id_tlbtr_reginfo = {
"TLBTR", 15,0,0, 0,0,3, 0,
ARM_CP_CONST, PL1_R, 0, NULL, 0,
};
ARMCPRegInfo crn0_wi_reginfo = { ARMCPRegInfo crn0_wi_reginfo = {
"CRN0_WI", 15,0,CP_ANY, 0,CP_ANY,CP_ANY, 0, "CRN0_WI", 15,0,CP_ANY, 0,CP_ANY,CP_ANY, 0,
ARM_CP_NOP | ARM_CP_OVERRIDE, PL1_W, ARM_CP_NOP | ARM_CP_OVERRIDE, PL1_W,
@ -2979,6 +2981,7 @@ void register_cp_regs_for_features(ARMCPU *cpu)
for (r = id_cp_reginfo; r->type != ARM_CP_SENTINEL; r++) { for (r = id_cp_reginfo; r->type != ARM_CP_SENTINEL; r++) {
r->access = PL1_RW; r->access = PL1_RW;
} }
id_tlbtr_reginfo.access = PL1_RW;
} }
if (arm_feature(env, ARM_FEATURE_V8)) { if (arm_feature(env, ARM_FEATURE_V8)) {
define_arm_cp_regs(cpu, id_v8_midr_cp_reginfo); define_arm_cp_regs(cpu, id_v8_midr_cp_reginfo);
@ -2986,6 +2989,9 @@ void register_cp_regs_for_features(ARMCPU *cpu)
define_arm_cp_regs(cpu, id_pre_v8_midr_cp_reginfo); define_arm_cp_regs(cpu, id_pre_v8_midr_cp_reginfo);
} }
define_arm_cp_regs(cpu, id_cp_reginfo); define_arm_cp_regs(cpu, id_cp_reginfo);
if (!arm_feature(env, ARM_FEATURE_MPU)) {
define_one_arm_cp_reg(cpu, &id_tlbtr_reginfo);
}
} }
if (arm_feature(env, ARM_FEATURE_MPIDR)) { if (arm_feature(env, ARM_FEATURE_MPIDR)) {