[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/13] target/arm: Derive id_pfr1 from features
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 09/13] target/arm: Derive id_pfr1 from features |
Date: |
Sat, 15 Sep 2018 09:17:34 -0700 |
Signed-off-by: Richard Henderson <address@hidden>
---
target/arm/cpu.c | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index 0151c278e8..4fb3e0a9ea 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -992,6 +992,31 @@ static uint32_t resolve_id_pfr0(CPUARMState *env)
return ret;
}
+static uint32_t resolve_id_pfr1(CPUARMState *env)
+{
+ uint32_t ret = 0;
+
+ if (arm_feature(env, ARM_FEATURE_M)) {
+ ret = deposit32(ret, 8, 4, 2); /* MProgMod */
+ } else {
+ ret = deposit32(ret, 0, 4, 1); /* ProgMod */
+ }
+ if (arm_feature(env, ARM_FEATURE_EL3)) {
+ ret = deposit32(ret, 4, 4, 1); /* Security */
+ }
+ if (arm_feature(env, ARM_FEATURE_EL2)) {
+ ret = deposit32(ret, 12, 4, 1); /* Virtualization */
+ }
+ if (arm_feature(env, ARM_FEATURE_GENERIC_TIMER)) {
+ ret = deposit32(ret, 16, 4, 1); /* GenTimer */
+ }
+ /* Sec_frac -- no partial features implemented without EL3 */
+ /* Virt_frac -- no partial features implemented without EL2 */
+ /* GIC -- info not available yet; filled in by id_pfr1_read */
+
+ return ret;
+}
+
static void resolve_id_regs(ARMCPU *cpu)
{
CPUARMState *env = &cpu->env;
@@ -1024,6 +1049,10 @@ static void resolve_id_regs(ARMCPU *cpu)
orig = cpu->id_pfr0;
cpu->id_pfr0 = resolve_id_pfr0(env);
g_assert_cmphex(cpu->id_pfr0, ==, orig);
+
+ orig = cpu->id_pfr1;
+ cpu->id_pfr1 = resolve_id_pfr1(env);
+ g_assert_cmphex(cpu->id_pfr1, ==, orig);
}
static void arm_cpu_realizefn(DeviceState *dev, Error **errp)
--
2.17.1
- Re: [Qemu-devel] [PATCH 01/13] target/arm: Add ARM_FEATURE_SWP, (continued)
[Qemu-devel] [PATCH 02/13] target/arm: Derive id_isar0 from features, Richard Henderson, 2018/09/15
[Qemu-devel] [PATCH 03/13] target/arm: Derive id_isar1 from features, Richard Henderson, 2018/09/15
[Qemu-devel] [PATCH 05/13] target/arm: Derive id_isar3 from features, Richard Henderson, 2018/09/15
[Qemu-devel] [PATCH 06/13] target/arm: Derive id_isar4 from features, Richard Henderson, 2018/09/15
[Qemu-devel] [PATCH 04/13] target/arm: Derive id_isar2 from features, Richard Henderson, 2018/09/15
[Qemu-devel] [PATCH 08/13] target/arm: Derive id_pfr0 from features, Richard Henderson, 2018/09/15
[Qemu-devel] [PATCH 07/13] target/arm: Derive id_isar5 and id_isar6 from features, Richard Henderson, 2018/09/15
[Qemu-devel] [PATCH 09/13] target/arm: Derive id_pfr1 from features,
Richard Henderson <=
[Qemu-devel] [PATCH 10/13] target/arm: Derive id_aa64isar0 from features, Richard Henderson, 2018/09/15
[Qemu-devel] [PATCH 11/13] target/arm: Derive id_aa64isar1 from features, Richard Henderson, 2018/09/15
[Qemu-devel] [PATCH 13/13] target/arm: Remove assertions from resolve_id_regs, Richard Henderson, 2018/09/15
[Qemu-devel] [PATCH 12/13] target/arm: Derive id_aa64pfr0 from features, Richard Henderson, 2018/09/15
Re: [Qemu-devel] [RFC PATCH 00/13] target/arm: Derive cpu id regs from features, Alex Bennée, 2018/09/19