| Message ID | 1410626734-3804-18-git-send-email-rth@twiddle.net |
|---|---|
| State | New |
| Headers | show |
Thanks for the effort cleaning up the cpu-exec file. This looks good to me. I'll add it again, in the next TriCore patchset. Reviewed-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de> On 09/13/2014 05:45 PM, Richard Henderson wrote: > It can go back in when it actually does something. > > Cc: Bastian Koppelmann <kbastian@mail.uni-paderborn.de> > Signed-off-by: Richard Henderson <rth@twiddle.net> > --- > cpu-exec.c | 5 ----- > target-tricore/cpu-qom.h | 1 - > target-tricore/cpu.c | 1 - > target-tricore/cpu.h | 2 -- > target-tricore/helper.c | 4 ---- > 5 files changed, 13 deletions(-) > > diff --git a/cpu-exec.c b/cpu-exec.c > index 81441e7..7e9f4cd 100644 > --- a/cpu-exec.c > +++ b/cpu-exec.c > @@ -523,11 +523,6 @@ int cpu_exec(CPUArchState *env) > cc->do_interrupt(cpu); > next_tb = 0; > } > -#elif defined(TARGET_TRICORE) > - if ((interrupt_request & CPU_INTERRUPT_HARD)) { > - cc->do_interrupt(cpu); > - next_tb = 0; > - } > #endif > /* The target hook has 3 exit conditions: > False when the interrupt isn't processed, > diff --git a/target-tricore/cpu-qom.h b/target-tricore/cpu-qom.h > index 470215a..66c9664 100644 > --- a/target-tricore/cpu-qom.h > +++ b/target-tricore/cpu-qom.h > @@ -63,7 +63,6 @@ static inline TriCoreCPU *tricore_env_get_cpu(CPUTriCoreState *env) > #define ENV_OFFSET offsetof(TriCoreCPU, env) > > hwaddr tricore_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); > -void tricore_cpu_do_interrupt(CPUState *cpu); > void tricore_cpu_dump_state(CPUState *cpu, FILE *f, > fprintf_function cpu_fprintf, int flags); > > diff --git a/target-tricore/cpu.c b/target-tricore/cpu.c > index db9f404..7bf041a 100644 > --- a/target-tricore/cpu.c > +++ b/target-tricore/cpu.c > @@ -145,7 +145,6 @@ static void tricore_cpu_class_init(ObjectClass *c, void *data) > cc->class_by_name = tricore_cpu_class_by_name; > cc->has_work = tricore_cpu_has_work; > > - cc->do_interrupt = tricore_cpu_do_interrupt; > cc->dump_state = tricore_cpu_dump_state; > cc->set_pc = tricore_cpu_set_pc; > cc->synchronize_from_tb = tricore_cpu_synchronize_from_tb; > diff --git a/target-tricore/cpu.h b/target-tricore/cpu.h > index b036ff1..7555b70 100644 > --- a/target-tricore/cpu.h > +++ b/target-tricore/cpu.h > @@ -400,6 +400,4 @@ static inline void cpu_pc_from_tb(CPUTriCoreState *env, TranslationBlock *tb) > env->PC = tb->pc; > } > > -void do_interrupt(CPUTriCoreState *env); > - > #endif /*__TRICORE_CPU_H__ */ > diff --git a/target-tricore/helper.c b/target-tricore/helper.c > index e4af6f1..f52504c 100644 > --- a/target-tricore/helper.c > +++ b/target-tricore/helper.c > @@ -82,10 +82,6 @@ int cpu_tricore_handle_mmu_fault(CPUState *cs, target_ulong address, > return ret; > } > > -void tricore_cpu_do_interrupt(CPUState *cs) > -{ > -} > - > TriCoreCPU *cpu_tricore_init(const char *cpu_model) > { > return TRICORE_CPU(cpu_generic_init(TYPE_TRICORE_CPU, cpu_model));
diff --git a/cpu-exec.c b/cpu-exec.c index 81441e7..7e9f4cd 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -523,11 +523,6 @@ int cpu_exec(CPUArchState *env) cc->do_interrupt(cpu); next_tb = 0; } -#elif defined(TARGET_TRICORE) - if ((interrupt_request & CPU_INTERRUPT_HARD)) { - cc->do_interrupt(cpu); - next_tb = 0; - } #endif /* The target hook has 3 exit conditions: False when the interrupt isn't processed, diff --git a/target-tricore/cpu-qom.h b/target-tricore/cpu-qom.h index 470215a..66c9664 100644 --- a/target-tricore/cpu-qom.h +++ b/target-tricore/cpu-qom.h @@ -63,7 +63,6 @@ static inline TriCoreCPU *tricore_env_get_cpu(CPUTriCoreState *env) #define ENV_OFFSET offsetof(TriCoreCPU, env) hwaddr tricore_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); -void tricore_cpu_do_interrupt(CPUState *cpu); void tricore_cpu_dump_state(CPUState *cpu, FILE *f, fprintf_function cpu_fprintf, int flags); diff --git a/target-tricore/cpu.c b/target-tricore/cpu.c index db9f404..7bf041a 100644 --- a/target-tricore/cpu.c +++ b/target-tricore/cpu.c @@ -145,7 +145,6 @@ static void tricore_cpu_class_init(ObjectClass *c, void *data) cc->class_by_name = tricore_cpu_class_by_name; cc->has_work = tricore_cpu_has_work; - cc->do_interrupt = tricore_cpu_do_interrupt; cc->dump_state = tricore_cpu_dump_state; cc->set_pc = tricore_cpu_set_pc; cc->synchronize_from_tb = tricore_cpu_synchronize_from_tb; diff --git a/target-tricore/cpu.h b/target-tricore/cpu.h index b036ff1..7555b70 100644 --- a/target-tricore/cpu.h +++ b/target-tricore/cpu.h @@ -400,6 +400,4 @@ static inline void cpu_pc_from_tb(CPUTriCoreState *env, TranslationBlock *tb) env->PC = tb->pc; } -void do_interrupt(CPUTriCoreState *env); - #endif /*__TRICORE_CPU_H__ */ diff --git a/target-tricore/helper.c b/target-tricore/helper.c index e4af6f1..f52504c 100644 --- a/target-tricore/helper.c +++ b/target-tricore/helper.c @@ -82,10 +82,6 @@ int cpu_tricore_handle_mmu_fault(CPUState *cs, target_ulong address, return ret; } -void tricore_cpu_do_interrupt(CPUState *cs) -{ -} - TriCoreCPU *cpu_tricore_init(const char *cpu_model) { return TRICORE_CPU(cpu_generic_init(TYPE_TRICORE_CPU, cpu_model));
It can go back in when it actually does something. Cc: Bastian Koppelmann <kbastian@mail.uni-paderborn.de> Signed-off-by: Richard Henderson <rth@twiddle.net> --- cpu-exec.c | 5 ----- target-tricore/cpu-qom.h | 1 - target-tricore/cpu.c | 1 - target-tricore/cpu.h | 2 -- target-tricore/helper.c | 4 ---- 5 files changed, 13 deletions(-)