[12/13] target/arm: Derive id_aa64pfr0 from features

Message ID 20180915161738.25257-13-richard.henderson@linaro.org
State New
Headers show
Series
  • target/arm: Derive cpu id regs from features
Related show

Commit Message

Richard Henderson Sept. 15, 2018, 4:17 p.m.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

---
 target/arm/cpu.c | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

-- 
2.17.1

Patch

diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index a9724f3bb1..2ec71104c9 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -1080,6 +1080,31 @@  static uint64_t resolve_id_aa64isar1(CPUARMState *env)
     return ret;
 }
 
+static uint64_t resolve_id_aa64pfr0(CPUARMState *env)
+{
+    uint64_t ret = 0;
+
+    ret = deposit64(ret, 0, 4, 2);                /* EL0 */
+    ret = deposit64(ret, 4, 4, 2);                /* EL1 */
+    if (arm_feature(env, ARM_FEATURE_EL2)) {
+        ret = deposit64(ret, 8, 4, 2);            /* EL2 */
+    }
+    if (arm_feature(env, ARM_FEATURE_EL3)) {
+        ret = deposit64(ret, 12, 4, 2);           /* EL3 */
+    }
+    if (arm_feature(env, ARM_FEATURE_V8_FP16)) {
+        ret = deposit64(ret, 16, 4, 1);           /* FP */
+        ret = deposit64(ret, 20, 4, 1);           /* AdvSIMD */
+    }
+    /* GIC -- info not available yet; filled in by id_aa64pfr0_read */
+    /* RAS -- not implemented yet */
+    if (arm_feature(env, ARM_FEATURE_SVE)) {
+        ret = deposit64(ret, 32, 4, 1);           /* SVE */
+    }
+
+    return ret;
+}
+
 static void resolve_id_regs(ARMCPU *cpu)
 {
     CPUARMState *env = &cpu->env;
@@ -1122,6 +1147,10 @@  static void resolve_id_regs(ARMCPU *cpu)
     g_assert_cmphex(cpu->id_aa64isar0, ==, orig);
 
     cpu->id_aa64isar1 = resolve_id_aa64isar1(env);
+
+    orig = cpu->id_aa64pfr0;
+    cpu->id_aa64pfr0 = resolve_id_aa64pfr0(env);
+    g_assert_cmphex(cpu->id_aa64pfr0, ==, orig);
 }
 
 static void arm_cpu_realizefn(DeviceState *dev, Error **errp)