From 14f1cb03e95d188d30be62f7f5400c78840af42b Mon Sep 17 00:00:00 2001 From: Lioncash Date: Fri, 19 Apr 2019 20:21:57 -0400 Subject: [PATCH] target/arm/unicorn_arm: Get rid of magic constants where applicable --- qemu/target/arm/unicorn_arm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qemu/target/arm/unicorn_arm.c b/qemu/target/arm/unicorn_arm.c index 9b99bdb6..9e2a635c 100644 --- a/qemu/target/arm/unicorn_arm.c +++ b/qemu/target/arm/unicorn_arm.c @@ -97,7 +97,7 @@ int arm_reg_read(struct uc_struct *uc, unsigned int *regs, void **vals, int coun *(int32_t *)value = vfp_get_fpscr(state); break; case UC_ARM_REG_IPSR: - *(uint32_t *)value = xpsr_read(state) & 0x1ff; + *(uint32_t *)value = xpsr_read(state) & XPSR_EXCP; break; case UC_ARM_REG_MSP: *(uint32_t *)value = helper_v7m_mrs(state, 8); @@ -170,7 +170,7 @@ int arm_reg_write(struct uc_struct *uc, unsigned int *regs, void* const* vals, i vfp_set_fpscr(state, *(uint32_t *)value); break; case UC_ARM_REG_IPSR: - xpsr_write(state, *(uint32_t *)value, 0x1ff); + xpsr_write(state, *(uint32_t *)value, XPSR_EXCP); break; case UC_ARM_REG_MSP: helper_v7m_msr(state, 8, *(uint32_t *)value);