diff options
| author | Andreas Färber | 2013-02-02 10:57:51 +0100 |
|---|---|---|
| committer | Andreas Färber | 2013-03-12 10:35:55 +0100 |
| commit | 97a8ea5a3ae7938cb54fd4dc19d3a413024bc6c0 (patch) | |
| tree | 6c9121e0571f75c8f5479e0027589f0d2f0178c7 /target-lm32 | |
| parent | cpu: Pass CPUState to cpu_interrupt() (diff) | |
| download | qemu-97a8ea5a3ae7938cb54fd4dc19d3a413024bc6c0.tar.gz qemu-97a8ea5a3ae7938cb54fd4dc19d3a413024bc6c0.tar.xz qemu-97a8ea5a3ae7938cb54fd4dc19d3a413024bc6c0.zip | |
cpu: Replace do_interrupt() by CPUClass::do_interrupt method
This removes a global per-target function and thus takes us one step
closer to compiling multiple targets into one executable.
It will also allow to override the interrupt handling for certain CPU
families.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'target-lm32')
| -rw-r--r-- | target-lm32/cpu-qom.h | 2 | ||||
| -rw-r--r-- | target-lm32/cpu.c | 2 | ||||
| -rw-r--r-- | target-lm32/cpu.h | 1 | ||||
| -rw-r--r-- | target-lm32/helper.c | 5 |
4 files changed, 8 insertions, 2 deletions
diff --git a/target-lm32/cpu-qom.h b/target-lm32/cpu-qom.h index c0b6ce5897..3ba86b7c88 100644 --- a/target-lm32/cpu-qom.h +++ b/target-lm32/cpu-qom.h @@ -71,4 +71,6 @@ static inline LM32CPU *lm32_env_get_cpu(CPULM32State *env) #define ENV_OFFSET offsetof(LM32CPU, env) +void lm32_cpu_do_interrupt(CPUState *cpu); + #endif diff --git a/target-lm32/cpu.c b/target-lm32/cpu.c index a2badb5701..a4692b7d5f 100644 --- a/target-lm32/cpu.c +++ b/target-lm32/cpu.c @@ -83,6 +83,8 @@ static void lm32_cpu_class_init(ObjectClass *oc, void *data) lcc->parent_reset = cc->reset; cc->reset = lm32_cpu_reset; + + cc->do_interrupt = lm32_cpu_do_interrupt; } static const TypeInfo lm32_cpu_type_info = { diff --git a/target-lm32/cpu.h b/target-lm32/cpu.h index d81f103e66..1be9778400 100644 --- a/target-lm32/cpu.h +++ b/target-lm32/cpu.h @@ -189,7 +189,6 @@ struct CPULM32State { LM32CPU *cpu_lm32_init(const char *cpu_model); void cpu_lm32_list(FILE *f, fprintf_function cpu_fprintf); int cpu_lm32_exec(CPULM32State *s); -void do_interrupt(CPULM32State *env); /* 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. */ diff --git a/target-lm32/helper.c b/target-lm32/helper.c index 47ae7e775a..a0a8399906 100644 --- a/target-lm32/helper.c +++ b/target-lm32/helper.c @@ -42,8 +42,11 @@ hwaddr cpu_get_phys_page_debug(CPULM32State *env, target_ulong addr) return addr & TARGET_PAGE_MASK; } -void do_interrupt(CPULM32State *env) +void lm32_cpu_do_interrupt(CPUState *cs) { + LM32CPU *cpu = LM32_CPU(cs); + CPULM32State *env = &cpu->env; + qemu_log_mask(CPU_LOG_INT, "exception at pc=%x type=%x\n", env->pc, env->exception_index); |