mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2013-02-18 19:59:39 +01:00
parent a7ddba527c
commit b21bfeead2
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target-cris/cpu-qom.h
View File

@ -74,5 +74,6 @@ static inline CRISCPU *cris_env_get_cpu(CPUCRISState *env)
#define ENV_OFFSET offsetof(CRISCPU, env) #define ENV_OFFSET offsetof(CRISCPU, env)
void cris_cpu_do_interrupt(CPUState *cpu); void cris_cpu_do_interrupt(CPUState *cpu);
void crisv10_cpu_do_interrupt(CPUState *cpu);
#endif #endif

8
target-cris/cpu.c
View File

@ -169,30 +169,38 @@ static void cris_cpu_initfn(Object *obj)
static void crisv8_cpu_class_init(ObjectClass *oc, void *data) static void crisv8_cpu_class_init(ObjectClass *oc, void *data)
{ {
CPUClass *cc = CPU_CLASS(oc);
CRISCPUClass *ccc = CRIS_CPU_CLASS(oc); CRISCPUClass *ccc = CRIS_CPU_CLASS(oc);
ccc->vr = 8; ccc->vr = 8;
cc->do_interrupt = crisv10_cpu_do_interrupt;
} }
static void crisv9_cpu_class_init(ObjectClass *oc, void *data) static void crisv9_cpu_class_init(ObjectClass *oc, void *data)
{ {
CPUClass *cc = CPU_CLASS(oc);
CRISCPUClass *ccc = CRIS_CPU_CLASS(oc); CRISCPUClass *ccc = CRIS_CPU_CLASS(oc);
ccc->vr = 9; ccc->vr = 9;
cc->do_interrupt = crisv10_cpu_do_interrupt;
} }
static void crisv10_cpu_class_init(ObjectClass *oc, void *data) static void crisv10_cpu_class_init(ObjectClass *oc, void *data)
{ {
CPUClass *cc = CPU_CLASS(oc);
CRISCPUClass *ccc = CRIS_CPU_CLASS(oc); CRISCPUClass *ccc = CRIS_CPU_CLASS(oc);
ccc->vr = 10; ccc->vr = 10;
cc->do_interrupt = crisv10_cpu_do_interrupt;
} }
static void crisv11_cpu_class_init(ObjectClass *oc, void *data) static void crisv11_cpu_class_init(ObjectClass *oc, void *data)
{ {
CPUClass *cc = CPU_CLASS(oc);
CRISCPUClass *ccc = CRIS_CPU_CLASS(oc); CRISCPUClass *ccc = CRIS_CPU_CLASS(oc);
ccc->vr = 11; ccc->vr = 11;
cc->do_interrupt = crisv10_cpu_do_interrupt;
} }
static void crisv32_cpu_class_init(ObjectClass *oc, void *data) static void crisv32_cpu_class_init(ObjectClass *oc, void *data)

14
target-cris/helper.c
View File

@ -45,6 +45,11 @@ void cris_cpu_do_interrupt(CPUState *cs)
env->pregs[PR_ERP] = env->pc; 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 cpu_cris_handle_mmu_fault(CPUCRISState * env, target_ulong address, int rw,
int mmu_idx) int mmu_idx)
{ {
@ -109,9 +114,10 @@ int cpu_cris_handle_mmu_fault(CPUCRISState *env, target_ulong address, int rw,
return r; 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; int ex_vec = -1;
D_LOG("exception index=%d interrupt_req=%d\n", D_LOG("exception index=%d interrupt_req=%d\n",
@ -171,10 +177,6 @@ void cris_cpu_do_interrupt(CPUState *cs)
CPUCRISState *env = &cpu->env; CPUCRISState *env = &cpu->env;
int ex_vec = -1; int ex_vec = -1;
if (env->pregs[PR_VR] < 32) {
return do_interruptv10(env);
}
D_LOG("exception index=%d interrupt_req=%d\n", D_LOG("exception index=%d interrupt_req=%d\n",
env->exception_index, env->exception_index,
cs->interrupt_request); cs->interrupt_request);