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

target-m68k: Use cpu_exec_interrupt qom hook 



Since do_interrupt_m68k_hardirq is no longer used outside
op_helper.c, make it static.

Signed-off-by: default avatarRichard Henderson <rth@twiddle.net>
Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Message-id: 1410626734-3804-10-git-send-email-rth@twiddle.net
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 02bb9bbf

cpu-exec.c

+0 −13
Original line number Diff line number Diff line
@@ -650,19 +650,6 @@ int cpu_exec(CPUArchState *env) 
                            next_tb = 0;

                        }

                    }

#elif defined(TARGET_M68K)

                    if (interrupt_request & CPU_INTERRUPT_HARD

                        && ((env->sr & SR_I) >> SR_I_SHIFT)

                            < env->pending_level) {

                        /* Real hardware gets the interrupt vector via an

                           IACK cycle at this point.  Current emulated

                           hardware doesn't rely on this, so we

                           provide/save the vector when the interrupt is

                           first signalled.  */

                        cpu->exception_index = env->pending_vector;

                        do_interrupt_m68k_hardirq(env);

                        next_tb = 0;

                    }

#endif

                    /* The target hook has 3 exit conditions:

                       False when the interrupt isn't processed,

target-m68k/cpu-qom.h

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ static inline M68kCPU *m68k_env_get_cpu(CPUM68KState *env) 
#define ENV_OFFSET offsetof(M68kCPU, env)



void m68k_cpu_do_interrupt(CPUState *cpu);

bool m68k_cpu_exec_interrupt(CPUState *cpu, int int_req);

void m68k_cpu_dump_state(CPUState *cpu, FILE *f, fprintf_function cpu_fprintf,

                         int flags);

hwaddr m68k_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);

target-m68k/cpu.c

+1 −0
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ static void m68k_cpu_class_init(ObjectClass *c, void *data) 
    cc->class_by_name = m68k_cpu_class_by_name;

    cc->has_work = m68k_cpu_has_work;

    cc->do_interrupt = m68k_cpu_do_interrupt;

    cc->cpu_exec_interrupt = m68k_cpu_exec_interrupt;

    cc->dump_state = m68k_cpu_dump_state;

    cc->set_pc = m68k_cpu_set_pc;

    cc->gdb_read_register = m68k_cpu_gdb_read_register;

target-m68k/cpu.h

+0 −1
Original line number Diff line number Diff line
@@ -120,7 +120,6 @@ void m68k_tcg_init(void); 
void m68k_cpu_init_gdb(M68kCPU *cpu);

M68kCPU *cpu_m68k_init(const char *cpu_model);

int cpu_m68k_exec(CPUM68KState *s);

void do_interrupt_m68k_hardirq(CPUM68KState *env1);

/* you can call this signal handler from your SIGBUS and SIGSEGV

   signal handlers to inform the virtual CPU of exceptions. non zero

   is returned if the signal was handled by the virtual CPU.  */

target-m68k/op_helper.c

+20 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ void m68k_cpu_do_interrupt(CPUState *cs) 
    cs->exception_index = -1;

}



void do_interrupt_m68k_hardirq(CPUM68KState *env)

static inline void do_interrupt_m68k_hardirq(CPUM68KState *env)

{

}
@@ -141,12 +141,30 @@ void m68k_cpu_do_interrupt(CPUState *cs) 
    do_interrupt_all(env, 0);

}



void do_interrupt_m68k_hardirq(CPUM68KState *env)

static inline void do_interrupt_m68k_hardirq(CPUM68KState *env)

{

    do_interrupt_all(env, 1);

}

#endif



bool m68k_cpu_exec_interrupt(CPUState *cs, int interrupt_request)

{

    M68kCPU *cpu = M68K_CPU(cs);

    CPUM68KState *env = &cpu->env;



    if (interrupt_request & CPU_INTERRUPT_HARD

        && ((env->sr & SR_I) >> SR_I_SHIFT) < env->pending_level) {

        /* Real hardware gets the interrupt vector via an IACK cycle

           at this point.  Current emulated hardware doesn't rely on

           this, so we provide/save the vector when the interrupt is

           first signalled.  */

        cs->exception_index = env->pending_vector;

        do_interrupt_m68k_hardirq(env);

        return true;

    }

    return false;

}



static void raise_exception(CPUM68KState *env, int tt)

{

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