m68k: use caller supplied CPUState for interrupt related stuff

Pass CPUState to do_interrupt(). This is needed by later patches.

It would be cleaner to move the function to helper.c, but there are
a few dependencies between do_interrupt() and other functions.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Blue Swirl 2011-05-21 07:55:24 +00:00
parent e694d4e289
commit 3c688828bc
3 changed files with 30 additions and 6 deletions

View file

@ -294,7 +294,7 @@ int cpu_exec(CPUState *env1)
#elif defined(TARGET_CRIS)
do_interrupt(env);
#elif defined(TARGET_M68K)
do_interrupt(0);
do_interrupt(env);
#elif defined(TARGET_S390X)
do_interrupt(env);
#endif
@ -529,7 +529,7 @@ int cpu_exec(CPUState *env1)
provide/save the vector when the interrupt is
first signalled. */
env->exception_index = env->pending_vector;
do_interrupt(1);
do_interrupt_m68k_hardirq(env);
next_tb = 0;
}
#elif defined(TARGET_S390X) && !defined(CONFIG_USER_ONLY)