xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-27 21:40:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

target-arm: Set IL bit in syndromes for insn abort, watchpoint, swstep

Browse Source 
For some exception syndrome types, the IL bit should always be set.
This includes the instruction abort, watchpoint and software step
syndrome types; add the missing ARM_EL_IL bit to the syndrome
values returned by syn_insn_abort(), syn_swstep() and syn_watchpoint().

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Message-id: 1463487258-27468-2-git-send-email-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2016-06-06 16:59:28 +01:00
parent aaa1f954d4
commit 04ce861ea5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target-arm/internals.h
View File

@ -367,7 +367,7 @@ static inline uint32_t syn_fp_access_trap(int cv, int cond, bool is_16bit)
static inline uint32_t syn_insn_abort(int same_el, int ea, int s1ptw, int fsc) static inline uint32_t syn_insn_abort(int same_el, int ea, int s1ptw, int fsc)
{ {
return (EC_INSNABORT << ARM_EL_EC_SHIFT) | (same_el << ARM_EL_EC_SHIFT) return (EC_INSNABORT << ARM_EL_EC_SHIFT) | (same_el << ARM_EL_EC_SHIFT)
| (ea << 9) | (s1ptw << 7) | fsc; | ARM_EL_IL | (ea << 9) | (s1ptw << 7) | fsc;
} }
static inline uint32_t syn_data_abort_no_iss(int same_el, static inline uint32_t syn_data_abort_no_iss(int same_el,
@ -396,13 +396,13 @@ static inline uint32_t syn_data_abort_with_iss(int same_el,
static inline uint32_t syn_swstep(int same_el, int isv, int ex) static inline uint32_t syn_swstep(int same_el, int isv, int ex)
{ {
return (EC_SOFTWARESTEP << ARM_EL_EC_SHIFT) | (same_el << ARM_EL_EC_SHIFT) return (EC_SOFTWARESTEP << ARM_EL_EC_SHIFT) | (same_el << ARM_EL_EC_SHIFT)
| (isv << 24) | (ex << 6) | 0x22; | ARM_EL_IL | (isv << 24) | (ex << 6) | 0x22;
} }
static inline uint32_t syn_watchpoint(int same_el, int cm, int wnr) static inline uint32_t syn_watchpoint(int same_el, int cm, int wnr)
{ {
return (EC_WATCHPOINT << ARM_EL_EC_SHIFT) | (same_el << ARM_EL_EC_SHIFT) return (EC_WATCHPOINT << ARM_EL_EC_SHIFT) | (same_el << ARM_EL_EC_SHIFT)
| (cm << 8) | (wnr << 6) | 0x22; | ARM_EL_IL | (cm << 8) | (wnr << 6) | 0x22;
} }
static inline uint32_t syn_breakpoint(int same_el) static inline uint32_t syn_breakpoint(int same_el)