Commit b59f479b authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Peter Maydell
Browse files

target/arm: Declare arm_log_exception() function publicly 



In few commits we will split the M-profile functions from this
file, and this function will also be called in the new file.
Declare it in the "internals.h" header.
Since it is in the middle of a block of M profile functions,
move it previous to this block to ease the later refactor.

Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20190701132516.26392-21-philmd@redhat.com
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 21fbea8c

target/arm/helper.c

+38 −38
Original line number Diff line number Diff line
@@ -7695,6 +7695,44 @@ uint32_t arm_phys_excp_target_el(CPUState *cs, uint32_t excp_idx, 
    return target_el;

}



void arm_log_exception(int idx)

{

    if (qemu_loglevel_mask(CPU_LOG_INT)) {

        const char *exc = NULL;

        static const char * const excnames[] = {

            [EXCP_UDEF] = "Undefined Instruction",

            [EXCP_SWI] = "SVC",

            [EXCP_PREFETCH_ABORT] = "Prefetch Abort",

            [EXCP_DATA_ABORT] = "Data Abort",

            [EXCP_IRQ] = "IRQ",

            [EXCP_FIQ] = "FIQ",

            [EXCP_BKPT] = "Breakpoint",

            [EXCP_EXCEPTION_EXIT] = "QEMU v7M exception exit",

            [EXCP_KERNEL_TRAP] = "QEMU intercept of kernel commpage",

            [EXCP_HVC] = "Hypervisor Call",

            [EXCP_HYP_TRAP] = "Hypervisor Trap",

            [EXCP_SMC] = "Secure Monitor Call",

            [EXCP_VIRQ] = "Virtual IRQ",

            [EXCP_VFIQ] = "Virtual FIQ",

            [EXCP_SEMIHOST] = "Semihosting call",

            [EXCP_NOCP] = "v7M NOCP UsageFault",

            [EXCP_INVSTATE] = "v7M INVSTATE UsageFault",

            [EXCP_STKOF] = "v8M STKOF UsageFault",

            [EXCP_LAZYFP] = "v7M exception during lazy FP stacking",

            [EXCP_LSERR] = "v8M LSERR UsageFault",

            [EXCP_UNALIGNED] = "v7M UNALIGNED UsageFault",

        };



        if (idx >= 0 && idx < ARRAY_SIZE(excnames)) {

            exc = excnames[idx];

        }

        if (!exc) {

            exc = "unknown";

        }

        qemu_log_mask(CPU_LOG_INT, "Taking exception %d [%s]\n", idx, exc);

    }

}



/*

 * Return true if the v7M CPACR permits access to the FPU for the specified

 * security state and privilege level.
@@ -9434,44 +9472,6 @@ static bool do_v7m_function_return(ARMCPU *cpu) 
    return true;

}



static void arm_log_exception(int idx)

{

    if (qemu_loglevel_mask(CPU_LOG_INT)) {

        const char *exc = NULL;

        static const char * const excnames[] = {

            [EXCP_UDEF] = "Undefined Instruction",

            [EXCP_SWI] = "SVC",

            [EXCP_PREFETCH_ABORT] = "Prefetch Abort",

            [EXCP_DATA_ABORT] = "Data Abort",

            [EXCP_IRQ] = "IRQ",

            [EXCP_FIQ] = "FIQ",

            [EXCP_BKPT] = "Breakpoint",

            [EXCP_EXCEPTION_EXIT] = "QEMU v7M exception exit",

            [EXCP_KERNEL_TRAP] = "QEMU intercept of kernel commpage",

            [EXCP_HVC] = "Hypervisor Call",

            [EXCP_HYP_TRAP] = "Hypervisor Trap",

            [EXCP_SMC] = "Secure Monitor Call",

            [EXCP_VIRQ] = "Virtual IRQ",

            [EXCP_VFIQ] = "Virtual FIQ",

            [EXCP_SEMIHOST] = "Semihosting call",

            [EXCP_NOCP] = "v7M NOCP UsageFault",

            [EXCP_INVSTATE] = "v7M INVSTATE UsageFault",

            [EXCP_STKOF] = "v8M STKOF UsageFault",

            [EXCP_LAZYFP] = "v7M exception during lazy FP stacking",

            [EXCP_LSERR] = "v8M LSERR UsageFault",

            [EXCP_UNALIGNED] = "v7M UNALIGNED UsageFault",

        };



        if (idx >= 0 && idx < ARRAY_SIZE(excnames)) {

            exc = excnames[idx];

        }

        if (!exc) {

            exc = "unknown";

        }

        qemu_log_mask(CPU_LOG_INT, "Taking exception %d [%s]\n", idx, exc);

    }

}



static bool v7m_read_half_insn(ARMCPU *cpu, ARMMMUIdx mmu_idx,

                               uint32_t addr, uint16_t *insn)

{

target/arm/internals.h

+2 −0
Original line number Diff line number Diff line
@@ -1000,6 +1000,8 @@ bool get_phys_addr(CPUARMState *env, target_ulong address, 
                   target_ulong *page_size,

                   ARMMMUFaultInfo *fi, ARMCacheAttrs *cacheattrs);



void arm_log_exception(int idx);



#endif /* !CONFIG_USER_ONLY */



#endif