aboutsummaryrefslogtreecommitdiff
path: root/cpu-exec.c
diff options
context:
space:
mode:
authorBlue Swirl <blauwirbel@gmail.com>2011-05-21 07:55:24 +0000
committerBlue Swirl <blauwirbel@gmail.com>2011-06-26 18:25:21 +0000
commit3c688828bcb3afa2744e1f1729a40eef4a575b56 (patch)
tree2b6ea7233dc7dca637734fbe6227056fc9ff1fa0 /cpu-exec.c
parente694d4e289b05d0c9b118850eff961aa9ca33183 (diff)
downloadqemu-3c688828bcb3afa2744e1f1729a40eef4a575b56.zip
qemu-3c688828bcb3afa2744e1f1729a40eef4a575b56.tar.gz
qemu-3c688828bcb3afa2744e1f1729a40eef4a575b56.tar.bz2
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>
Diffstat (limited to 'cpu-exec.c')
-rw-r--r--cpu-exec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpu-exec.c b/cpu-exec.c
index 1f3c4bb..6440f12 100644
--- a/cpu-exec.c
+++ b/cpu-exec.c
@@ -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)