diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2012-01-13 17:25:08 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2012-01-13 17:25:08 +0000 |
| commit | d3cb6e2b062f69e0a40f21b74a42f5c5a3422174 (patch) | |
| tree | 366a73562736bc62e76c1e414156e8f559e9ae3f /target-arm | |
| parent | 6b620ca3b052e622eef4379cfe37c5c3db5364c9 (diff) | |
| download | qemu-d3cb6e2b062f69e0a40f21b74a42f5c5a3422174.tar.gz qemu-d3cb6e2b062f69e0a40f21b74a42f5c5a3422174.tar.bz2 qemu-d3cb6e2b062f69e0a40f21b74a42f5c5a3422174.zip | |
target-arm: Fix errors in decode of M profile CPS
Fix errors in the decode of M profile CPS:
* the decode of the I (affects PRIMASK) and F (affects FAULTMASK)
bits was reversed
* the FAULTMASK system register number is 19, not 17
This fixes an issue reported as LP:913925.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-arm')
| -rw-r--r-- | target-arm/translate.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target-arm/translate.c b/target-arm/translate.c index f91553a48a..280bfca62b 100644 --- a/target-arm/translate.c +++ b/target-arm/translate.c @@ -9710,15 +9710,15 @@ static void disas_thumb_insn(CPUState *env, DisasContext *s) break; if (IS_M(env)) { tmp = tcg_const_i32((insn & (1 << 4)) != 0); - /* PRIMASK */ + /* FAULTMASK */ if (insn & 1) { - addr = tcg_const_i32(16); + addr = tcg_const_i32(19); gen_helper_v7m_msr(cpu_env, addr, tmp); tcg_temp_free_i32(addr); } - /* FAULTMASK */ + /* PRIMASK */ if (insn & 2) { - addr = tcg_const_i32(17); + addr = tcg_const_i32(16); gen_helper_v7m_msr(cpu_env, addr, tmp); tcg_temp_free_i32(addr); } |