OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target/arm: use raise_exception_ra for stack limit exception 

The sequence cpu_restore_state() + raise_exception() is equivalent to
raise_exception_ra(), so use that instead.  (In this case we never
cared about the syndrome value, because M-profile doesn't use the
syndrome; the old code was just written unnecessarily awkwardly.)

Cc: Richard Henderson <richard.henderson@linaro.org>
Cc: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Jamie Iles <jamie@nuviainc.com>
[PMM: Retain edited version of comment; rewrite commit message]
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Jamie Iles 2021-05-26 13:18:47 +01:00 committed by Peter Maydell
parent 5bf100c320
commit 9d75d45c0b
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
target/arm/m_helper.c
View File

@ -2601,10 +2601,7 @@ void HELPER(v7m_msr)(CPUARMState *env, uint32_t maskreg, uint32_t val)
limit = is_psp ? env->v7m.psplim[false] : env->v7m.msplim[false]; limit = is_psp ? env->v7m.psplim[false] : env->v7m.msplim[false];
if (val < limit) { if (val < limit) {
CPUState *cs = env_cpu(env); raise_exception_ra(env, EXCP_STKOF, 0, 1, GETPC());
cpu_restore_state(cs, GETPC(), true);
raise_exception(env, EXCP_STKOF, 0, 1);
} }
if (is_psp) { if (is_psp) {

9
target/arm/op_helper.c
View File

@ -95,15 +95,12 @@ void HELPER(v8m_stackcheck)(CPUARMState *env, uint32_t newvalue)
* raising an exception if the limit is breached. * raising an exception if the limit is breached.
*/ */
if (newvalue < v7m_sp_limit(env)) { if (newvalue < v7m_sp_limit(env)) {
CPUState *cs = env_cpu(env);
/* /*
* Stack limit exceptions are a rare case, so rather than syncing * Stack limit exceptions are a rare case, so rather than syncing
* PC/condbits before the call, we use cpu_restore_state() to * PC/condbits before the call, we use raise_exception_ra() so
* get them right before raising the exception. * that cpu_restore_state() will sort them out.
*/ */
cpu_restore_state(cs, GETPC(), true); raise_exception_ra(env, EXCP_STKOF, 0, 1, GETPC());
raise_exception(env, EXCP_STKOF, 0, 1);
} }
} }