Commit 86f026de authored by Peter Maydell's avatar Peter Maydell
Browse files

target/arm: Define new EXCP type for v8M stack overflows 



Define EXCP_STKOF, and arrange for it to cause us to take
a UsageFault with CFSR.STKOF set.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Message-id: 20181002163556.10279-3-peter.maydell@linaro.org
parent 4730fb85

target/arm/cpu.h

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
#define EXCP_SEMIHOST       16   /* semihosting call */

#define EXCP_NOCP           17   /* v7M NOCP UsageFault */

#define EXCP_INVSTATE       18   /* v7M INVSTATE UsageFault */

#define EXCP_STKOF          19   /* v8M STKOF UsageFault */

/* NB: add new EXCP_ defines to the array in arm_log_exception() too */



#define ARMV7M_EXCP_RESET   1
@@ -1388,6 +1389,7 @@ FIELD(V7M_CFSR, UNDEFINSTR, 16 + 0, 1) 
FIELD(V7M_CFSR, INVSTATE, 16 + 1, 1)

FIELD(V7M_CFSR, INVPC, 16 + 2, 1)

FIELD(V7M_CFSR, NOCP, 16 + 3, 1)

FIELD(V7M_CFSR, STKOF, 16 + 4, 1)

FIELD(V7M_CFSR, UNALIGNED, 16 + 8, 1)

FIELD(V7M_CFSR, DIVBYZERO, 16 + 9, 1)

target/arm/helper.c

+5 −0
Original line number Diff line number Diff line
@@ -7539,6 +7539,7 @@ static void arm_log_exception(int idx) 
            [EXCP_SEMIHOST] = "Semihosting call",

            [EXCP_NOCP] = "v7M NOCP UsageFault",

            [EXCP_INVSTATE] = "v7M INVSTATE UsageFault",

            [EXCP_STKOF] = "v8M STKOF UsageFault",

        };



        if (idx >= 0 && idx < ARRAY_SIZE(excnames)) {
@@ -7694,6 +7695,10 @@ void arm_v7m_cpu_do_interrupt(CPUState *cs) 
        armv7m_nvic_set_pending(env->nvic, ARMV7M_EXCP_USAGE, env->v7m.secure);

        env->v7m.cfsr[env->v7m.secure] |= R_V7M_CFSR_INVSTATE_MASK;

        break;

    case EXCP_STKOF:

        armv7m_nvic_set_pending(env->nvic, ARMV7M_EXCP_USAGE, env->v7m.secure);

        env->v7m.cfsr[env->v7m.secure] |= R_V7M_CFSR_STKOF_MASK;

        break;

    case EXCP_SWI:

        /* The PC already points to the next instruction.  */

        armv7m_nvic_set_pending(env->nvic, ARMV7M_EXCP_SVC, env->v7m.secure);