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

target-openrisc: Use cpu_exec_interrupt qom hook 



Cc: Jia Liu <proljc@gmail.com>
Signed-off-by: default avatarRichard Henderson <rth@twiddle.net>
Tested-by: default avatarJia Liu <proljc@gmail.com>
Message-id: 1410626734-3804-17-git-send-email-rth@twiddle.net
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 87afe467

cpu-exec.c

+0 −18
Original line number Diff line number Diff line
@@ -528,24 +528,6 @@ int cpu_exec(CPUArchState *env) 
                        cc->do_interrupt(cpu);

                        next_tb = 0;

                    }



#elif defined(TARGET_OPENRISC)

                    {

                        int idx = -1;

                        if ((interrupt_request & CPU_INTERRUPT_HARD)

                            && (env->sr & SR_IEE)) {

                            idx = EXCP_INT;

                        }

                        if ((interrupt_request & CPU_INTERRUPT_TIMER)

                            && (env->sr & SR_TEE)) {

                            idx = EXCP_TICK;

                        }

                        if (idx >= 0) {

                            cpu->exception_index = idx;

                            cc->do_interrupt(cpu);

                            next_tb = 0;

                        }

                    }

#endif

                    /* The target hook has 3 exit conditions:

                       False when the interrupt isn't processed,

target-openrisc/cpu.c

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

    cc->has_work = openrisc_cpu_has_work;

    cc->do_interrupt = openrisc_cpu_do_interrupt;

    cc->cpu_exec_interrupt = openrisc_cpu_exec_interrupt;

    cc->dump_state = openrisc_cpu_dump_state;

    cc->set_pc = openrisc_cpu_set_pc;

    cc->gdb_read_register = openrisc_cpu_gdb_read_register;

target-openrisc/cpu.h

+1 −0
Original line number Diff line number Diff line
@@ -348,6 +348,7 @@ OpenRISCCPU *cpu_openrisc_init(const char *cpu_model); 
void cpu_openrisc_list(FILE *f, fprintf_function cpu_fprintf);

int cpu_openrisc_exec(CPUOpenRISCState *s);

void openrisc_cpu_do_interrupt(CPUState *cpu);

bool openrisc_cpu_exec_interrupt(CPUState *cpu, int int_req);

void openrisc_cpu_dump_state(CPUState *cpu, FILE *f,

                             fprintf_function cpu_fprintf, int flags);

hwaddr openrisc_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);

target-openrisc/interrupt.c

+20 −0
Original line number Diff line number Diff line
@@ -63,3 +63,23 @@ void openrisc_cpu_do_interrupt(CPUState *cs) 


    cs->exception_index = -1;

}



bool openrisc_cpu_exec_interrupt(CPUState *cs, int interrupt_request)

{

    OpenRISCCPU *cpu = OPENRISC_CPU(cs);

    CPUOpenRISCState *env = &cpu->env;

    int idx = -1;



    if ((interrupt_request & CPU_INTERRUPT_HARD) && (env->sr & SR_IEE)) {

        idx = EXCP_INT;

    }

    if ((interrupt_request & CPU_INTERRUPT_TIMER) && (env->sr & SR_TEE)) {

        idx = EXCP_TICK;

    }

    if (idx >= 0) {

        cs->exception_index = idx;

        openrisc_cpu_do_interrupt(cs);

        return true;

    }

    return false;

}