diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-01-17 22:30:20 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-03-12 10:35:55 +0100 |
| commit | d8ed887bdcd29ce2e967f8b15a6a2b6dcaa11cd5 (patch) | |
| tree | 57f8deccddd53e7aab5ca75d1d194da635a35790 /target-mips/op_helper.c | |
| parent | 259186a7d2f7184efc96ae99bc5658e6159f53ad (diff) | |
exec: Pass CPUState to cpu_reset_interrupt()
Move it to qom/cpu.c to avoid build failures depending on include order
of cpu-qom.h and exec/cpu-all.h.
Change opaques of various ..._irq_handler() functions to the
appropriate CPU type to facilitate using cpu_reset_interrupt().
Fix Coding Style issues while at it (missing braces, indentation).
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'target-mips/op_helper.c')
| -rw-r--r-- | target-mips/op_helper.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c index 3ab4356587..d568188703 100644 --- a/target-mips/op_helper.c +++ b/target-mips/op_helper.c @@ -534,12 +534,11 @@ static inline void mips_vpe_wake(CPUMIPSState *c) static inline void mips_vpe_sleep(MIPSCPU *cpu) { CPUState *cs = CPU(cpu); - CPUMIPSState *c = &cpu->env; /* The VPE was shut off, really go to bed. Reset any old _WAKE requests. */ cs->halted = 1; - cpu_reset_interrupt(c, CPU_INTERRUPT_WAKE); + cpu_reset_interrupt(cs, CPU_INTERRUPT_WAKE); } static inline void mips_tc_wake(MIPSCPU *cpu, int tc) @@ -2104,7 +2103,7 @@ void helper_wait(CPUMIPSState *env) CPUState *cs = CPU(mips_env_get_cpu(env)); cs->halted = 1; - cpu_reset_interrupt(env, CPU_INTERRUPT_WAKE); + cpu_reset_interrupt(cs, CPU_INTERRUPT_WAKE); helper_raise_exception(env, EXCP_HLT); } |