From fb8ad9f2c1a82256b1ac384393a093a61201272f Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Mon, 9 Jun 2014 15:43:24 +0100 Subject: target-arm: Remove unnecessary setting of feature bits FEATURE_V8 implies both FEATURE_V7MP and FEATURE_ARM_DIV, so we don't need to set them explicitly in initfns which set the V8 feature bit. Signed-off-by: Peter Maydell Message-id: 1401458125-27977-3-git-send-email-peter.maydell@linaro.org --- target-arm/cpu.c | 2 -- target-arm/cpu64.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/target-arm/cpu.c b/target-arm/cpu.c index 94123b2213..383e22a757 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -960,8 +960,6 @@ static void arm_any_initfn(Object *obj) set_feature(&cpu->env, ARM_FEATURE_VFP_FP16); set_feature(&cpu->env, ARM_FEATURE_NEON); set_feature(&cpu->env, ARM_FEATURE_THUMB2EE); - set_feature(&cpu->env, ARM_FEATURE_ARM_DIV); - set_feature(&cpu->env, ARM_FEATURE_V7MP); set_feature(&cpu->env, ARM_FEATURE_CRC); cpu->midr = 0xffffffff; } diff --git a/target-arm/cpu64.c b/target-arm/cpu64.c index ff4c2b46d7..2dd01fdf45 100644 --- a/target-arm/cpu64.c +++ b/target-arm/cpu64.c @@ -140,8 +140,6 @@ static void aarch64_any_initfn(Object *obj) set_feature(&cpu->env, ARM_FEATURE_VFP4); set_feature(&cpu->env, ARM_FEATURE_VFP_FP16); set_feature(&cpu->env, ARM_FEATURE_NEON); - set_feature(&cpu->env, ARM_FEATURE_ARM_DIV); - set_feature(&cpu->env, ARM_FEATURE_V7MP); set_feature(&cpu->env, ARM_FEATURE_AARCH64); cpu->ctr = 0x80030003; /* 32 byte I and D cacheline size, VIPT icache */ cpu->dcz_blocksize = 7; /* 512 bytes */ -- cgit v1.2.3