Commit 376214e4 authored by Alex Bennée's avatar Alex Bennée Committed by Peter Maydell
Browse files

target/arm: handle M-profile semihosting at translate time 



We do this for other semihosting calls so we might as well do it for
M-profile as well.

Signed-off-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Message-id: 20190913151845.12582-3-alex.bennee@linaro.org
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 72ab7f9e

target/arm/m_helper.c

+6 −12
Original line number Diff line number Diff line
@@ -2114,19 +2114,13 @@ void arm_v7m_cpu_do_interrupt(CPUState *cs) 
            break;

        }

        break;

    case EXCP_BKPT:

        if (semihosting_enabled()) {

            int nr;

            nr = arm_lduw_code(env, env->regs[15], arm_sctlr_b(env)) & 0xff;

            if (nr == 0xab) {

                env->regs[15] += 2;

    case EXCP_SEMIHOST:

        qemu_log_mask(CPU_LOG_INT,

                      "...handling as semihosting call 0x%x\n",

                      env->regs[0]);

        env->regs[0] = do_arm_semihosting(env);

        return;

            }

        }

    case EXCP_BKPT:

        armv7m_nvic_set_pending(env->nvic, ARMV7M_EXCP_DEBUG, false);

        break;

    case EXCP_IRQ:

target/arm/translate.c

+10 −1
Original line number Diff line number Diff line
@@ -8424,7 +8424,16 @@ static bool trans_BKPT(DisasContext *s, arg_BKPT *a) 
    if (!ENABLE_ARCH_5) {

        return false;

    }

    if (arm_dc_feature(s, ARM_FEATURE_M) &&

        semihosting_enabled() &&

#ifndef CONFIG_USER_ONLY

        !IS_USER(s) &&

#endif

        (a->imm == 0xab)) {

        gen_exception_internal_insn(s, s->base.pc_next, EXCP_SEMIHOST);

    } else {

        gen_exception_bkpt_insn(s, syn_aa32_bkpt(a->imm, false));

    }

    return true;

}