diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2018-10-24 07:50:16 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-10-24 07:50:16 +0100 |
| commit | 5256df880d1312a58472af3fb0a3c51e708f2161 (patch) | |
| tree | e7383e3c29c5e1b5f8e28bbcb81dc8faf529a655 | |
| parent | 47576b94af5c406fc6521fb336fb5c12beeac3f8 (diff) | |
| download | qemu-5256df880d1312a58472af3fb0a3c51e708f2161.zip qemu-5256df880d1312a58472af3fb0a3c51e708f2161.tar.gz qemu-5256df880d1312a58472af3fb0a3c51e708f2161.tar.bz2 | |
target/arm: V8M should not imply V7VE
Instantiating mps2-an505 (cortex-m33) will fail make check when
V7VE asserts that ID_ISAR0.Divide includes ARM division. It is
also wrong to include ARM_FEATURE_LPAE.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20181016223115.24100-3-richard.henderson@linaro.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | target/arm/cpu.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 4f6756a..12e6273 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -814,7 +814,11 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) /* Some features automatically imply others: */ if (arm_feature(env, ARM_FEATURE_V8)) { - set_feature(env, ARM_FEATURE_V7VE); + if (arm_feature(env, ARM_FEATURE_M)) { + set_feature(env, ARM_FEATURE_V7); + } else { + set_feature(env, ARM_FEATURE_V7VE); + } } if (arm_feature(env, ARM_FEATURE_V7VE)) { /* v7 Virtualization Extensions. In real hardware this implies |