[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/13] target/arm: Remove assertions from resolve_id
From: |
Richard Henderson |
Subject: |
[Qemu-devel] [PATCH 13/13] target/arm: Remove assertions from resolve_id_regs |
Date: |
Sat, 15 Sep 2018 09:17:38 -0700 |
This is a prerequisite to removing the now-redundant
initializations from within the individual cpus.
Signed-off-by: Richard Henderson <address@hidden>
---
target/arm/cpu.c | 41 +++++++----------------------------------
1 file changed, 7 insertions(+), 34 deletions(-)
diff --git a/target/arm/cpu.c b/target/arm/cpu.c
index 2ec71104c9..79103926a4 100644
--- a/target/arm/cpu.c
+++ b/target/arm/cpu.c
@@ -1108,49 +1108,22 @@ static uint64_t resolve_id_aa64pfr0(CPUARMState *env)
static void resolve_id_regs(ARMCPU *cpu)
{
CPUARMState *env = &cpu->env;
- uint64_t orig;
- orig = cpu->id_isar0;
- cpu->id_isar0 = resolve_id_isar0(env, orig);
- g_assert_cmphex(cpu->id_isar0, ==, orig);
-
- orig = cpu->id_isar1;
+ cpu->id_isar0 = resolve_id_isar0(env, cpu->id_isar0);
cpu->id_isar1 = resolve_id_isar1(env);
- g_assert_cmphex(cpu->id_isar1, ==, orig);
-
- orig = cpu->id_isar2;
- cpu->id_isar2 = resolve_id_isar2(env, orig);
- g_assert_cmphex(cpu->id_isar2, ==, orig);
-
- orig = cpu->id_isar3;
+ cpu->id_isar2 = resolve_id_isar2(env, cpu->id_isar2);
cpu->id_isar3 = resolve_id_isar3(env);
- g_assert_cmphex(cpu->id_isar3, ==, orig);
-
- orig = cpu->id_isar4;
cpu->id_isar4 = resolve_id_isar4(env);
- /* Willfully ignore the SWP_frac field. */
- g_assert_cmphex(cpu->id_isar4 & 0x0fffffff, ==, orig & 0x0fffffff);
-
cpu->id_isar5 = resolve_id_isar5(env);
cpu->id_isar6 = resolve_id_isar6(env);
-
- 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);
- orig = cpu->id_aa64isar0;
- cpu->id_aa64isar0 = resolve_id_aa64isar0(env);
- 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);
+ if (arm_feature(env, ARM_FEATURE_AARCH64)) {
+ cpu->id_aa64isar0 = resolve_id_aa64isar0(env);
+ cpu->id_aa64isar1 = resolve_id_aa64isar1(env);
+ cpu->id_aa64pfr0 = resolve_id_aa64pfr0(env);
+ }
}
static void arm_cpu_realizefn(DeviceState *dev, Error **errp)
--
2.17.1
- [Qemu-devel] [PATCH 02/13] target/arm: Derive id_isar0 from features, (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, 2018/09/15
- [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 <=
- [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