diff options
| author | Peter Crosthwaite <peter.crosthwaite@xilinx.com> | 2015-06-15 18:06:10 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-06-15 18:06:10 +0100 |
| commit | 5e5cf9e35f25f9f932a6ce25107c11b67b426a43 (patch) | |
| tree | ea3b87d72efeac02e9ae2b3f64f48f303d4bf76c /target-arm | |
| parent | 8085ce63c5967d200f1241b6c0a189371993c5df (diff) | |
| download | qemu-5e5cf9e35f25f9f932a6ce25107c11b67b426a43.zip qemu-5e5cf9e35f25f9f932a6ce25107c11b67b426a43.tar.gz qemu-5e5cf9e35f25f9f932a6ce25107c11b67b426a43.tar.bz2 | |
arm: Don't add v7mp registers in MPU systems
These registers are VMSA specific so they should be conditional on
VMSA (i.e. !MPU).
Signed-off-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Message-id: 7bb8843e45f2635c6b7a583c5bb5da51ed4442a0.1434066412.git.peter.crosthwaite@xilinx.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-arm')
| -rw-r--r-- | target-arm/helper.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/target-arm/helper.c b/target-arm/helper.c index d46db91..c8cb970 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -3193,7 +3193,8 @@ void register_cp_regs_for_features(ARMCPU *cpu) if (arm_feature(env, ARM_FEATURE_V6K)) { define_arm_cp_regs(cpu, v6k_cp_reginfo); } - if (arm_feature(env, ARM_FEATURE_V7MP)) { + if (arm_feature(env, ARM_FEATURE_V7MP) && + !arm_feature(env, ARM_FEATURE_MPU)) { define_arm_cp_regs(cpu, v7mp_cp_reginfo); } if (arm_feature(env, ARM_FEATURE_V7)) { |