Commit b21bfeea authored by Andreas Färber's avatar Andreas Färber
Browse files

target-cris: Override do_interrupt for pre-v32 CPU cores 



Instead of forwarding from cris_cpu_do_interrupt() to do_interruptv10(),
override CPUClass::do_interrupt with crisv10_cpu_do_interrupt() in the
newly introduced class_init functions.

Acked-by: default avatarEdgar E. Iglesias <edgar.iglesias@gmail.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent a7ddba52

target-cris/cpu-qom.h

+1 −0
Original line number Diff line number Diff line
@@ -74,5 +74,6 @@ static inline CRISCPU *cris_env_get_cpu(CPUCRISState *env) 
#define ENV_OFFSET offsetof(CRISCPU, env)



void cris_cpu_do_interrupt(CPUState *cpu);

void crisv10_cpu_do_interrupt(CPUState *cpu);



#endif

target-cris/cpu.c

+8 −0
Original line number Diff line number Diff line
@@ -169,30 +169,38 @@ static void cris_cpu_initfn(Object *obj) 


static void crisv8_cpu_class_init(ObjectClass *oc, void *data)

{

    CPUClass *cc = CPU_CLASS(oc);

    CRISCPUClass *ccc = CRIS_CPU_CLASS(oc);



    ccc->vr = 8;

    cc->do_interrupt = crisv10_cpu_do_interrupt;

}



static void crisv9_cpu_class_init(ObjectClass *oc, void *data)

{

    CPUClass *cc = CPU_CLASS(oc);

    CRISCPUClass *ccc = CRIS_CPU_CLASS(oc);



    ccc->vr = 9;

    cc->do_interrupt = crisv10_cpu_do_interrupt;

}



static void crisv10_cpu_class_init(ObjectClass *oc, void *data)

{

    CPUClass *cc = CPU_CLASS(oc);

    CRISCPUClass *ccc = CRIS_CPU_CLASS(oc);



    ccc->vr = 10;

    cc->do_interrupt = crisv10_cpu_do_interrupt;

}



static void crisv11_cpu_class_init(ObjectClass *oc, void *data)

{

    CPUClass *cc = CPU_CLASS(oc);

    CRISCPUClass *ccc = CRIS_CPU_CLASS(oc);



    ccc->vr = 11;

    cc->do_interrupt = crisv10_cpu_do_interrupt;

}



static void crisv32_cpu_class_init(ObjectClass *oc, void *data)

target-cris/helper.c

+8 −6
Original line number Diff line number Diff line
@@ -45,6 +45,11 @@ void cris_cpu_do_interrupt(CPUState *cs) 
    env->pregs[PR_ERP] = env->pc;

}



void crisv10_cpu_do_interrupt(CPUState *cs)

{

    cris_cpu_do_interrupt(cs);

}



int cpu_cris_handle_mmu_fault(CPUCRISState * env, target_ulong address, int rw,

                              int mmu_idx)

{
@@ -109,9 +114,10 @@ int cpu_cris_handle_mmu_fault(CPUCRISState *env, target_ulong address, int rw, 
    return r;

}



static void do_interruptv10(CPUCRISState *env)

void crisv10_cpu_do_interrupt(CPUState *cs)

{

    D(CPUState *cs = CPU(cris_env_get_cpu(env)));

    CRISCPU *cpu = CRIS_CPU(cs);

    CPUCRISState *env = &cpu->env;

    int ex_vec = -1;



    D_LOG("exception index=%d interrupt_req=%d\n",
@@ -171,10 +177,6 @@ void cris_cpu_do_interrupt(CPUState *cs) 
    CPUCRISState *env = &cpu->env;

    int ex_vec = -1;



    if (env->pregs[PR_VR] < 32) {

        return do_interruptv10(env);

    }



    D_LOG("exception index=%d interrupt_req=%d\n",

          env->exception_index,

          cs->interrupt_request);