Commit d8bb9159 authored by Richard Henderson's avatar Richard Henderson Committed by Peter Maydell
Browse files

target-unicore32: Use cpu_exec_interrupt qom hook 



Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Signed-off-by: default avatarRichard Henderson <rth@twiddle.net>
Message-id: 1410626734-3804-14-git-send-email-rth@twiddle.net
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent f47ede19

cpu-exec.c

+0 −7
Original line number Diff line number Diff line
@@ -585,13 +585,6 @@ int cpu_exec(CPUArchState *env) 
                        cc->do_interrupt(cpu);

                        next_tb = 0;

                    }

#elif defined(TARGET_UNICORE32)

                    if (interrupt_request & CPU_INTERRUPT_HARD

                        && !(env->uncached_asr & ASR_I)) {

                        cpu->exception_index = UC32_EXCP_INTR;

                        cc->do_interrupt(cpu);

                        next_tb = 0;

                    }

#endif

                    /* The target hook has 3 exit conditions:

                       False when the interrupt isn't processed,

target-unicore32/cpu-qom.h

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ static inline UniCore32CPU *uc32_env_get_cpu(CPUUniCore32State *env) 
#define ENV_OFFSET offsetof(UniCore32CPU, env)



void uc32_cpu_do_interrupt(CPUState *cpu);

bool uc32_cpu_exec_interrupt(CPUState *cpu, int int_req);

void uc32_cpu_dump_state(CPUState *cpu, FILE *f,

                         fprintf_function cpu_fprintf, int flags);

hwaddr uc32_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);

target-unicore32/cpu.c

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ static void uc32_cpu_class_init(ObjectClass *oc, void *data) 
    cc->class_by_name = uc32_cpu_class_by_name;

    cc->has_work = uc32_cpu_has_work;

    cc->do_interrupt = uc32_cpu_do_interrupt;

    cc->cpu_exec_interrupt = uc32_cpu_exec_interrupt;

    cc->dump_state = uc32_cpu_dump_state;

    cc->set_pc = uc32_cpu_set_pc;

#ifdef CONFIG_USER_ONLY

target-unicore32/helper.c

+15 −0
Original line number Diff line number Diff line
@@ -250,3 +250,18 @@ int uc32_cpu_handle_mmu_fault(CPUState *cs, vaddr address, 
    return 1;

}

#endif



bool uc32_cpu_exec_interrupt(CPUState *cs, int interrupt_request)

{

    if (interrupt_request & CPU_INTERRUPT_HARD) {

        UniCore32CPU *cpu = UNICORE32_CPU(cs);

        CPUUniCore32State *env = &cpu->env;



        if (!(env->uncached_asr & ASR_I)) {

            cs->exception_index = UC32_EXCP_INTR;

            uc32_cpu_do_interrupt(cs);

            return true;

        }

    }

    return false;

}