From 48825c1be20a38d52ebd6420071c42585c06b12d Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Thu, 1 Mar 2018 23:58:59 -0500 Subject: [PATCH] target/arm: Drop IS_M() macro We only use the IS_M() macro in two places, and it's a bit of a namespace grab to put in cpu.h. Drop it in favour of just explicitly calling arm_feature() in the places where it was used. Backports commit 531c60a97ab51618b4b9ccef1c5fe00607079706 from qemu --- qemu/target/arm/cpu.c | 2 +- qemu/target/arm/cpu.h | 6 ------ qemu/target/arm/helper.c | 2 +- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/qemu/target/arm/cpu.c b/qemu/target/arm/cpu.c index f980b0c7..e9545c13 100644 --- a/qemu/target/arm/cpu.c +++ b/qemu/target/arm/cpu.c @@ -176,7 +176,7 @@ static void arm_cpu_reset(CPUState *s) /* On ARMv7-M the CPSR_I is the value of the PRIMASK register, and is * clear at reset. Initial SP and PC are loaded from ROM. */ - if (IS_M(env)) { + if (arm_feature(env, ARM_FEATURE_M)) { uint32_t initial_msp; /* Loaded from 0x0 */ uint32_t initial_pc; /* Loaded from 0x4 */ diff --git a/qemu/target/arm/cpu.h b/qemu/target/arm/cpu.h index 395beac2..2f595b19 100644 --- a/qemu/target/arm/cpu.h +++ b/qemu/target/arm/cpu.h @@ -1757,12 +1757,6 @@ bool write_list_to_cpustate(ARMCPU *cpu); */ bool write_cpustate_to_list(ARMCPU *cpu); -/* Does the core conform to the the "MicroController" profile. e.g. Cortex-M3. - Note the M in older cores (eg. ARM7TDMI) stands for Multiply. These are - conventional cores (ie. Application or Realtime profile). */ - -#define IS_M(env) arm_feature(env, ARM_FEATURE_M) - #define ARM_CPUID_TI915T 0x54029152 #define ARM_CPUID_TI925T 0x54029252 diff --git a/qemu/target/arm/helper.c b/qemu/target/arm/helper.c index 06079c6a..d0ff68d5 100644 --- a/qemu/target/arm/helper.c +++ b/qemu/target/arm/helper.c @@ -5910,7 +5910,7 @@ void arm_cpu_do_interrupt(CPUState *cs) CPUARMState *env = &cpu->env; unsigned int new_el = env->exception.target_el; - assert(!IS_M(env)); + assert(!arm_feature(env, ARM_FEATURE_M)); arm_log_exception(cs->exception_index); qemu_log_mask(CPU_LOG_INT, "...from EL%d to EL%d\n", arm_current_el(env),