diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-06-09 15:43:24 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-06-09 16:06:11 +0100 |
| commit | 411bdc7837681f58828ca490647fa1784a6700b9 (patch) | |
| tree | 6027fd13334ec1df248c2728814f39191895e66a | |
| parent | 4e624edaebec9312be7b63096bbe5b2fe76f3613 (diff) | |
target-arm: A64: Use PMULL feature bit for PMULL
Now that we have a separate ARM_FEATURE_V8_PMULL bit, use it for
the A64 PMULL, not the AES feature bit.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | linux-user/elfload.c | 2 | ||||
| -rw-r--r-- | target-arm/translate-a64.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/linux-user/elfload.c b/linux-user/elfload.c index 3241fec035..e8724939f8 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -539,7 +539,7 @@ static uint32_t get_elf_hwcap(void) /* probe for the extra features */ #define GET_FEATURE(feat, hwcap) \ do { if (arm_feature(&cpu->env, feat)) { hwcaps |= hwcap; } } while (0) - GET_FEATURE(ARM_FEATURE_V8_AES, ARM_HWCAP_A64_PMULL); + GET_FEATURE(ARM_FEATURE_V8_PMULL, ARM_HWCAP_A64_PMULL); #undef GET_FEATURE return hwcaps; diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c index a9c4633517..9832cc3c22 100644 --- a/target-arm/translate-a64.c +++ b/target-arm/translate-a64.c @@ -8574,7 +8574,7 @@ static void disas_simd_three_reg_diff(DisasContext *s, uint32_t insn) return; } if (size == 3) { - if (!arm_dc_feature(s, ARM_FEATURE_V8_AES)) { + if (!arm_dc_feature(s, ARM_FEATURE_V8_PMULL)) { unallocated_encoding(s); return; } |