Commit 35979d71 authored by Edgar E. Iglesias's avatar Edgar E. Iglesias Committed by Peter Maydell
Browse files

target-arm: A64: Emulate the HVC insn 



Signed-off-by: default avatarEdgar E. Iglesias <edgar.iglesias@xilinx.com>
Message-id: 1411718914-6608-8-git-send-email-edgar.iglesias@gmail.com
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 2dd081ae

target-arm/cpu.h

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
#define EXCP_EXCEPTION_EXIT  8   /* Return from v7M exception.  */

#define EXCP_KERNEL_TRAP     9   /* Jumped to kernel code page.  */

#define EXCP_STREX          10

#define EXCP_HVC            11   /* HyperVisor Call */



#define ARMV7M_EXCP_RESET   1

#define ARMV7M_EXCP_NMI     2

target-arm/helper-a64.c

+1 −0
Original line number Diff line number Diff line
@@ -476,6 +476,7 @@ void aarch64_cpu_do_interrupt(CPUState *cs) 
    case EXCP_BKPT:

    case EXCP_UDEF:

    case EXCP_SWI:

    case EXCP_HVC:

        env->cp15.esr_el[new_el] = env->exception.syndrome;

        break;

    case EXCP_IRQ:

target-arm/helper.c

+19 −1
Original line number Diff line number Diff line
@@ -3769,9 +3769,27 @@ void switch_mode(CPUARMState *env, int mode) 
 */

unsigned int arm_excp_target_el(CPUState *cs, unsigned int excp_idx)

{

    ARMCPU *cpu = ARM_CPU(cs);

    CPUARMState *env = &cpu->env;

    unsigned int cur_el = arm_current_pl(env);

    unsigned int target_el;



    if (!env->aarch64) {

        /* TODO: Add EL2 and 3 exception handling for AArch32.  */

        return 1;

    }



    switch (excp_idx) {

    case EXCP_HVC:

        target_el = 2;

        break;

    default:

        target_el = MAX(cur_el, 1);

        break;

    }

    return target_el;

}



static void v7m_push(CPUARMState *env, uint32_t val)

{

    CPUState *cs = CPU(arm_env_get_cpu(env));

target-arm/helper.h

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ DEF_HELPER_2(exception_internal, void, env, i32) 
DEF_HELPER_3(exception_with_syndrome, void, env, i32, i32)

DEF_HELPER_1(wfi, void, env)

DEF_HELPER_1(wfe, void, env)

DEF_HELPER_1(pre_hvc, void, env)



DEF_HELPER_3(cpsr_write, void, env, i32, i32)

DEF_HELPER_1(cpsr_read, i32, env)

target-arm/internals.h

+6 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ static const char * const excnames[] = { 
    [EXCP_EXCEPTION_EXIT] = "QEMU v7M exception exit",

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

    [EXCP_STREX] = "QEMU intercept of STREX",

    [EXCP_HVC] = "Hypervisor Call",

};



static inline void arm_log_exception(int idx)
@@ -215,6 +216,11 @@ static inline uint32_t syn_aa64_svc(uint32_t imm16) 
    return (EC_AA64_SVC << ARM_EL_EC_SHIFT) | ARM_EL_IL | (imm16 & 0xffff);

}



static inline uint32_t syn_aa64_hvc(uint32_t imm16)

{

    return (EC_AA64_HVC << ARM_EL_EC_SHIFT) | ARM_EL_IL | (imm16 & 0xffff);

}



static inline uint32_t syn_aa32_svc(uint32_t imm16, bool is_thumb)

{

    return (EC_AA32_SVC << ARM_EL_EC_SHIFT) | (imm16 & 0xffff)