diff options
| author | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-05-27 17:35:30 +0000 |
|---|---|---|
| committer | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-05-27 17:35:30 +0000 |
| commit | f2bc7e7fa175b61a20c6f10c324d7c4d68af676f (patch) | |
| tree | 168035093555652dd96abff66662b2c4fee26a06 /cpu-exec.c | |
| parent | 8d96d20941f578e7ed3f4d8f1548116a96cd865a (diff) | |
Move non-op functions from op_helper.c to helper.c and vice versa.
Rearrange interrupt handling to match other targets.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4590 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'cpu-exec.c')
| -rw-r--r-- | cpu-exec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpu-exec.c b/cpu-exec.c index 65af9a6d8..5e64fa43c 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -333,7 +333,7 @@ int cpu_exec(CPUState *env1) #elif defined(TARGET_MIPS) do_interrupt(env); #elif defined(TARGET_SPARC) - do_interrupt(env->exception_index); + do_interrupt(env); #elif defined(TARGET_ARM) do_interrupt(env); #elif defined(TARGET_SH4) @@ -474,7 +474,8 @@ int cpu_exec(CPUState *env1) (pil == 15 || pil > env->psrpil)) || type != TT_EXTINT) { env->interrupt_request &= ~CPU_INTERRUPT_HARD; - do_interrupt(env->interrupt_index); + env->exception_index = env->interrupt_index; + do_interrupt(env); env->interrupt_index = 0; #if !defined(TARGET_SPARC64) && !defined(CONFIG_USER_ONLY) cpu_check_irqs(env); |