Commit 531c60a9 authored by Peter Maydell's avatar Peter Maydell
Browse files

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.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Message-id: 1485285380-10565-2-git-send-email-peter.maydell@linaro.org
parent feb0b1aa

target/arm/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,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 */

        uint8_t *rom;

target/arm/cpu.h

+0 −6
Original line number Diff line number Diff line
@@ -1762,12 +1762,6 @@ bool write_list_to_cpustate(ARMCPU *cpu); 
 */

bool write_cpustate_to_list(ARMCPU *cpu);



/* Does the core conform to 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

target/arm/helper.c

+1 −1
Original line number Diff line number Diff line
@@ -6695,7 +6695,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),