[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 38/43] target-i386: Change do_interrupt_all() argumen
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 38/43] target-i386: Change do_interrupt_all() argument to X86CPU |
Date: |
Wed, 10 Jul 2013 16:34:15 +0200 |
Prepares for log_cpu_state() changing argument to CPUState.
Signed-off-by: Andreas Färber <address@hidden>
---
target-i386/seg_helper.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/target-i386/seg_helper.c b/target-i386/seg_helper.c
index 9c799e1..92caa84 100644
--- a/target-i386/seg_helper.c
+++ b/target-i386/seg_helper.c
@@ -1160,9 +1160,11 @@ static void handle_even_inj(CPUX86State *env, int intno,
int is_int,
* the int instruction. next_eip is the env->eip value AFTER the interrupt
* instruction. It is only relevant if is_int is TRUE.
*/
-static void do_interrupt_all(CPUX86State *env, int intno, int is_int,
+static void do_interrupt_all(X86CPU *cpu, int intno, int is_int,
int error_code, target_ulong next_eip, int is_hw)
{
+ CPUX86State *env = &cpu->env;
+
if (qemu_loglevel_mask(CPU_LOG_INT)) {
if ((env->cr[0] & CR0_PE_MASK)) {
static int count;
@@ -1252,7 +1254,7 @@ void x86_cpu_do_interrupt(CPUState *cs)
/* simulate a real cpu exception. On i386, it can
trigger new exceptions, but we do not handle
double or triple faults yet. */
- do_interrupt_all(env, env->exception_index,
+ do_interrupt_all(cpu, env->exception_index,
env->exception_is_int,
env->error_code,
env->exception_next_eip, 0);
@@ -1263,7 +1265,7 @@ void x86_cpu_do_interrupt(CPUState *cs)
void do_interrupt_x86_hardirq(CPUX86State *env, int intno, int is_hw)
{
- do_interrupt_all(env, intno, 0, 0, 0, is_hw);
+ do_interrupt_all(x86_env_get_cpu(env), intno, 0, 0, 0, is_hw);
}
void helper_enter_level(CPUX86State *env, int level, int data32,
--
1.8.1.4
- [Qemu-devel] [PULL 30/43] target-microblaze: Change gen_intermediate_code_internal() argument types, (continued)
- [Qemu-devel] [PULL 30/43] target-microblaze: Change gen_intermediate_code_internal() argument types, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 31/43] target-mips: Change gen_intermediate_code_internal() argument to MIPSCPU, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 28/43] target-lm32: Change gen_intermediate_code_internal() argument to LM32CPU, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 29/43] target-m68k: Change gen_intermediate_code_internal() argument to M68kCPU, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 19/43] target-cris: gen_intermediate_code_internal() should be inlined, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 32/43] target-ppc: Change gen_intermediate_code_internal() argument to PowerPCCPU, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 24/43] target-alpha: Change gen_intermediate_code_internal() argument to AlphaCPU, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 35/43] target-sparc: Change gen_intermediate_code_internal() argument to SPARCCPU, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 21/43] target-microblaze: gen_intermediate_code_internal() should be inlined, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 37/43] target-xtensa: Change gen_intermediate_code_internal() arg to XtensaCPU, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 38/43] target-i386: Change do_interrupt_all() argument to X86CPU,
Andreas Färber <=
- [Qemu-devel] [PULL 41/43] target-i386: Change LOG_PCALL_STATE() argument to CPUState, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 34/43] target-sh4: Change gen_intermediate_code_internal() argument to SuperHCPU, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 42/43] target-ppc: Change LOG_MMU_STATE() argument to CPUState, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 39/43] target-i386: Change do_smm_enter() argument to X86CPU, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 33/43] target-s390x: Change gen_intermediate_code_internal() argument to S390CPU, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 36/43] target-unicore32: Change gen_intermediate_code_internal() signature, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 43/43] cpu: Move reset logging to CPUState, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 40/43] log: Change log_cpu_state[_mask]() argument to CPUState, Andreas Färber, 2013/07/10
- [Qemu-devel] [PULL 09/43] cpu: Make first_cpu and next_cpu CPUState, Andreas Färber, 2013/07/10