diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-01-24 14:33:23 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-01-24 18:23:27 +0000 |
| commit | 67e7c13cc0e594b9b72313b227b2e2a7c647e7b4 (patch) | |
| tree | 5872102cd3a792b487e3d21977299cf60521ac8d /target/arm/cpu.c | |
| parent | 970fae75d79993ee29718a1196589eed9d7ff836 (diff) | |
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: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target/arm/cpu.c')
| -rw-r--r-- | target/arm/cpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 907598968c..6395d5adef 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -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; |