Commit 2c4a7cc5 authored by Peter Maydell's avatar Peter Maydell
Browse files

arm: Move excnames[] array into arm_log_exceptions() 



The excnames[] array is defined in internals.h because we used
to use it from two different source files for handling logging
of AArch32 and AArch64 exception entry. Refactoring means that
it's now used only in arm_log_exception() in helper.c, so move
the array into that function.

Suggested-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 1491821097-5647-1-git-send-email-peter.maydell@linaro.org
parent 32b81e62

target/arm/cpu.h

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
#define EXCP_SEMIHOST       16   /* semihosting call */

#define EXCP_NOCP           17   /* v7M NOCP UsageFault */

#define EXCP_INVSTATE       18   /* v7M INVSTATE UsageFault */

/* NB: new EXCP_ defines should be added to the excnames[] array too */

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



#define ARMV7M_EXCP_RESET   1

#define ARMV7M_EXCP_NMI     2

target/arm/helper.c

+19 −0
Original line number Diff line number Diff line
@@ -6271,6 +6271,25 @@ 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",

        };



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

            exc = excnames[idx];

target/arm/internals.h

+0 −23
Original line number Diff line number Diff line
@@ -51,29 +51,6 @@ static inline bool excp_is_internal(int excp) 
        || excp == EXCP_SEMIHOST;

}



/* Exception names for debug logging; note that not all of these

 * precisely correspond to architectural exceptions.

 */

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",

};



/* Scale factor for generic timers, ie number of ns per tick.

 * This gives a 62.5MHz timer.

 */