diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-05-11 00:44:05 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2011-06-01 17:08:19 +0200 |
| commit | f645f7d6fd841e39524e5df8c1a7fd8347f92ac1 (patch) | |
| tree | 53964a1f9e70c88630277888904f41c35b217ffd /cpu-exec.c | |
| parent | f0753acaab4309557754ec19d3e839fe6b5e356c (diff) | |
| download | external_qemu-f645f7d6fd841e39524e5df8c1a7fd8347f92ac1.zip external_qemu-f645f7d6fd841e39524e5df8c1a7fd8347f92ac1.tar.gz external_qemu-f645f7d6fd841e39524e5df8c1a7fd8347f92ac1.tar.bz2 | |
cpu_restore_state: remove un-necessary argument.
Change-Id: I01cef0743cc9db9d21c2b7feb9f2a877ac4d2b35
Diffstat (limited to 'cpu-exec.c')
| -rw-r--r-- | cpu-exec.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -390,10 +390,10 @@ int cpu_exec(CPUState *env1) do_interrupt(EXCP12_MCHK, 0, 0, 0, 0); next_tb = 0; } else if ((interrupt_request & CPU_INTERRUPT_HARD) && - (((env->hflags2 & HF2_VINTR_MASK) && + (((env->hflags2 & HF2_VINTR_MASK) && (env->hflags2 & HF2_HIF_MASK)) || - (!(env->hflags2 & HF2_VINTR_MASK) && - (env->eflags & IF_MASK && + (!(env->hflags2 & HF2_VINTR_MASK) && + (env->eflags & IF_MASK && !(env->hflags & HF_INHIBIT_IRQ_MASK))))) { int intno; svm_check_intercept(SVM_EXIT_INTR); @@ -411,7 +411,7 @@ int cpu_exec(CPUState *env1) next_tb = 0; #if !defined(CONFIG_USER_ONLY) } else if ((interrupt_request & CPU_INTERRUPT_VIRQ) && - (env->eflags & IF_MASK) && + (env->eflags & IF_MASK) && !(env->hflags & HF_INHIBIT_IRQ_MASK)) { int intno; /* FIXME: this should respect TPR */ @@ -775,7 +775,7 @@ static inline int handle_cpu_signal(unsigned long pc, unsigned long address, if (tb) { /* the PC is inside the translated code. It means that we have a virtual CPU fault */ - cpu_restore_state(tb, env, pc, puc); + cpu_restore_state(tb, env, pc); } /* we restore the process signal mask as the sigreturn should @@ -1255,7 +1255,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, break; } - return handle_cpu_signal(pc, (unsigned long)info->si_addr, + return handle_cpu_signal(pc, (unsigned long)info->si_addr, is_write, &uc->uc_sigmask, puc); } |