[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 8/8] target-arm: Fix BASEPRI, BASEPRI_MAX, and FAULT
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 8/8] target-arm: Fix BASEPRI, BASEPRI_MAX, and FAULTMASK access |
Date: |
Wed, 22 Jun 2011 18:33:33 +0100 |
From: Sebastian Huber <address@hidden>
Correct the decode of the register numbers for BASEPRI, BASEPRI_MAX
and FAULTMASK, according to "ARMv7-M Architecture Reference Manual"
issue D section "B5.2.3 MRS" and "B5.2.3 MSR".
Signed-off-by: Sebastian Huber <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
target-arm/helper.c | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/target-arm/helper.c b/target-arm/helper.c
index 9785cc5..a0f2314 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -2128,11 +2128,11 @@ uint32_t HELPER(v7m_mrs)(CPUState *env, uint32_t reg)
return env->v7m.current_sp ? env->regs[13] : env->v7m.other_sp;
case 16: /* PRIMASK */
return (env->uncached_cpsr & CPSR_I) != 0;
- case 17: /* FAULTMASK */
- return (env->uncached_cpsr & CPSR_F) != 0;
- case 18: /* BASEPRI */
- case 19: /* BASEPRI_MAX */
+ case 17: /* BASEPRI */
+ case 18: /* BASEPRI_MAX */
return env->v7m.basepri;
+ case 19: /* FAULTMASK */
+ return (env->uncached_cpsr & CPSR_F) != 0;
case 20: /* CONTROL */
return env->v7m.control;
default:
@@ -2184,20 +2184,20 @@ void HELPER(v7m_msr)(CPUState *env, uint32_t reg,
uint32_t val)
else
env->uncached_cpsr &= ~CPSR_I;
break;
- case 17: /* FAULTMASK */
- if (val & 1)
- env->uncached_cpsr |= CPSR_F;
- else
- env->uncached_cpsr &= ~CPSR_F;
- break;
- case 18: /* BASEPRI */
+ case 17: /* BASEPRI */
env->v7m.basepri = val & 0xff;
break;
- case 19: /* BASEPRI_MAX */
+ case 18: /* BASEPRI_MAX */
val &= 0xff;
if (val != 0 && (val < env->v7m.basepri || env->v7m.basepri == 0))
env->v7m.basepri = val;
break;
+ case 19: /* FAULTMASK */
+ if (val & 1)
+ env->uncached_cpsr |= CPSR_F;
+ else
+ env->uncached_cpsr &= ~CPSR_F;
+ break;
case 20: /* CONTROL */
env->v7m.control = val & 3;
switch_v7m_sp(env, (val & 2) != 0);
--
1.7.1
- [Qemu-devel] [PULL 0/8] ARM patch queue, Peter Maydell, 2011/06/22
- [Qemu-devel] [PATCH 8/8] target-arm: Fix BASEPRI, BASEPRI_MAX, and FAULTMASK access,
Peter Maydell <=
- [Qemu-devel] [PATCH 5/8] Revert "target-arm: Use global env in neon_helper.c helpers", Peter Maydell, 2011/06/22
- [Qemu-devel] [PATCH 4/8] target-arm: Pass fp status pointer explicitly to neon fp helpers, Peter Maydell, 2011/06/22
- [Qemu-devel] [PATCH 6/8] Revert "Makefile.target: Allow target helpers to be in any *_helper.c file", Peter Maydell, 2011/06/22
- [Qemu-devel] [PATCH 7/8] target-arm: Minimal implementation of performance counters, Peter Maydell, 2011/06/22
- [Qemu-devel] [PATCH 2/8] target-arm: Add helper function to generate code to get fpstatus pointer, Peter Maydell, 2011/06/22
- [Qemu-devel] [PATCH 3/8] target-arm: Make VFP binop helpers take pointer to fpstatus, not CPUState, Peter Maydell, 2011/06/22
- [Qemu-devel] [PATCH 1/8] Revert "target-arm: Use global env in iwmmxt_helper.c helpers", Peter Maydell, 2011/06/22
- Re: [Qemu-devel] [PULL 0/8] ARM patch queue, Peter Maydell, 2011/06/30