[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/12] target-cris: Override do_interrupt for pre-v3
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 12/12] target-cris: Override do_interrupt for pre-v32 CPU cores |
Date: |
Tue, 16 Apr 2013 02:46:49 +0200 |
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 <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
target-cris/cpu-qom.h | 1 +
target-cris/cpu.c | 8 ++++++++
target-cris/helper.c | 14 ++++++++------
3 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/target-cris/cpu-qom.h b/target-cris/cpu-qom.h
index deea1d8..03829bd 100644
--- a/target-cris/cpu-qom.h
+++ b/target-cris/cpu-qom.h
@@ -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
diff --git a/target-cris/cpu.c b/target-cris/cpu.c
index 95cbf39..67181e5 100644
--- a/target-cris/cpu.c
+++ b/target-cris/cpu.c
@@ -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)
diff --git a/target-cris/helper.c b/target-cris/helper.c
index e1ef7bc..466cc2f 100644
--- a/target-cris/helper.c
+++ b/target-cris/helper.c
@@ -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);
--
1.8.1.4
- [Qemu-devel] [PATCH 01/12] target-i386: Fix including "host" in -cpu ? output, (continued)
- [Qemu-devel] [PATCH 01/12] target-i386: Fix including "host" in -cpu ? output, Andreas Färber, 2013/04/15
- [Qemu-devel] [PATCH 03/12] qdev: Add qdev property for bool type, Andreas Färber, 2013/04/15
- [Qemu-devel] [PATCH 06/12] kvmvapic: Replace FROM_SYSBUS() with QOM type cast, Andreas Färber, 2013/04/15
- [Qemu-devel] [PATCH 04/12] target-i386: Consolidate error propagation in x86_cpu_realizefn(), Andreas Färber, 2013/04/15
- [Qemu-devel] [PATCH 07/12] ioapic: Replace FROM_SYSBUS() with QOM type cast, Andreas Färber, 2013/04/15
- [Qemu-devel] [PATCH 05/12] target-i386: Split APIC creation from initialization in x86_cpu_realizefn(), Andreas Färber, 2013/04/15
- [Qemu-devel] [PATCH 11/12] qdev: Set device's parent before calling realize() down inheritance chain, Andreas Färber, 2013/04/15
- [Qemu-devel] [PATCH 08/12] target-i386/cpu.c: Coding style fixes, Andreas Färber, 2013/04/15
- [Qemu-devel] [PATCH 10/12] cpu: Pass CPUState to *cpu_synchronize_post*(), Andreas Färber, 2013/04/15
- [Qemu-devel] [PATCH 09/12] target-i386: Split out CPU creation and features parsing, Andreas Färber, 2013/04/15
- [Qemu-devel] [PATCH 12/12] target-cris: Override do_interrupt for pre-v32 CPU cores,
Andreas Färber <=